remm 2003/08/30 11:19:39
Modified: catalina/src/share/org/apache/catalina/core
StandardServer.java
Log:
- Don't print the className if it's one of the standard implementations.
- Add some fields to the exception list.
Revision Changes Path
1.20 +37 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- StandardServer.java 29 Aug 2003 21:21:29 -0000 1.19
+++ StandardServer.java 30 Aug 2003 18:19:38 -0000 1.20
@@ -160,14 +160,20 @@
* be persisted because they are automatically calculated.
*/
private static String exceptions[][] = {
+ { "org.apache.catalina.core.StandardEngine", "domain" },
+ { "org.apache.catalina.core.StandardHost", "domain" },
{ "org.apache.catalina.core.StandardContext", "available" },
{ "org.apache.catalina.core.StandardContext", "configured" },
{ "org.apache.catalina.core.StandardContext", "distributable" },
+ { "org.apache.catalina.core.StandardContext", "domain" },
+ { "org.apache.catalina.core.StandardContext", "engineName" },
{ "org.apache.catalina.core.StandardContext", "name" },
{ "org.apache.catalina.core.StandardContext", "override" },
{ "org.apache.catalina.core.StandardContext", "publicId" },
{ "org.apache.catalina.core.StandardContext", "replaceWelcomeFiles" },
{ "org.apache.catalina.core.StandardContext", "sessionTimeout" },
+ { "org.apache.catalina.core.StandardContext", "startupTime" },
+ { "org.apache.catalina.core.StandardContext", "tldScanTime" },
{ "org.apache.catalina.core.StandardContext", "workDir" },
{ "org.apache.catalina.session.StandardManager", "distributable" },
{ "org.apache.catalina.session.StandardManager", "entropy" },
@@ -216,6 +222,20 @@
/**
+ * The set of class names that are the standard implementations of
+ * components, and hence should not be persisted.
+ */
+ private static String standardImplementations[] = {
+ "org.apache.catalina.core.StandardServer",
+ "org.apache.catalina.core.StandardService",
+ "org.apache.coyote.tomcat5.CoyoteConnector",
+ "org.apache.catalina.core.StandardEngine",
+ "org.apache.catalina.core.StandardHost",
+ "org.apache.catalina.core.StandardContext"
+ };
+
+
+ /**
* ServerLifecycleListener classname.
*/
private static String SERVER_LISTENER_CLASS_NAME =
@@ -1048,11 +1068,21 @@
private void storeAttributes(PrintWriter writer, boolean include,
Object bean) throws Exception {
+ // Render the relevant properties of this bean
+ String className = bean.getClass().getName();
+
// Render a className attribute if requested
if (include) {
- writer.print(" className=\"");
- writer.print(bean.getClass().getName());
- writer.print("\"");
+ for (int i = 0; i < standardImplementations.length; i++) {
+ if (className.equals(standardImplementations[i])) {
+ include = false;
+ }
+ }
+ if (include) {
+ writer.print(" className=\"");
+ writer.print(bean.getClass().getName());
+ writer.print("\"");
+ }
}
// Acquire the list of properties for this bean
@@ -1062,8 +1092,6 @@
descriptors = new PropertyDescriptor[0];
}
- // Render the relevant properties of this bean
- String className = bean.getClass().getName();
// Create blank instance
Object bean2 = bean.getClass().newInstance();
for (int i = 0; i < descriptors.length; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
