amyroh 2004/05/27 19:51:39
Modified: catalina/src/share/org/apache/catalina/core
StandardServer.java
Log:
Persist connector values when saved via introspection. I just tested for default
configuration. Let me know if there're any problems.
Revision Changes Path
1.29 +18 -3
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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- StandardServer.java 26 May 2004 15:41:22 -0000 1.28
+++ StandardServer.java 28 May 2004 02:51:39 -0000 1.29
@@ -79,6 +79,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.modeler.Registry;
+import org.apache.coyote.ProtocolHandler;
+import org.apache.coyote.tomcat5.CoyoteConnector;
@@ -122,6 +124,10 @@
//{ "org.apache.catalina.core.StandardContext", "workDir" },
{ "org.apache.catalina.session.StandardManager", "distributable" },
{ "org.apache.catalina.session.StandardManager", "entropy" },
+ { "org.apache.coyote.http11.Http11Protocol", "port"},
+ { "org.apache.coyote.http11.Http11Protocol", "soTimeout"},
+ { "org.apache.jk.server.JkCoyoteHandler", "name"},
+
};
@@ -176,7 +182,10 @@
"org.apache.coyote.tomcat5.CoyoteConnector",
"org.apache.catalina.core.StandardEngine",
"org.apache.catalina.core.StandardHost",
- "org.apache.catalina.core.StandardContext"
+ "org.apache.catalina.core.StandardContext",
+ "org.apache.coyote.http11.Http11Protocol",
+ "org.apache.jk.server.JkCoyoteHandler"
+
};
@@ -1016,7 +1025,6 @@
// Render the relevant properties of this bean
String className = bean.getClass().getName();
-
// Render a className attribute if requested
if (include) {
for (int i = 0; i < standardImplementations.length; i++) {
@@ -1097,6 +1105,13 @@
}
writer.print("<Connector");
storeAttributes(writer, connector);
+
+ if (connector instanceof CoyoteConnector) {
+ ProtocolHandler protocolHandler =
+ ((CoyoteConnector)connector).getProtocolHandler();
+ storeAttributes(writer, protocolHandler);
+ }
+
writer.println(">");
// Store nested <Factory> element
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
