costin 01/01/31 22:24:35
Modified: src/etc server.xml
src/share/org/apache/tomcat/startup EmbededTomcat.java
Tomcat.java
Log:
Use ServerXmlReader and ContextXmlReader.
Revision Changes Path
1.65 +3 -0 jakarta-tomcat/src/etc/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- server.xml 2001/02/01 06:08:48 1.64
+++ server.xml 2001/02/01 06:24:34 1.65
@@ -37,6 +37,9 @@
-->
<ContextInterceptor
+ className="org.apache.tomcat.modules.config.ContextXmlReader" />
+
+ <ContextInterceptor
className="org.apache.tomcat.modules.config.AutoSetup" />
<!-- Generate includeable Apache configuration files for mod_jserv
1.43 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
Index: EmbededTomcat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- EmbededTomcat.java 2001/02/01 05:27:34 1.42
+++ EmbededTomcat.java 2001/02/01 06:24:34 1.43
@@ -274,7 +274,7 @@
protected String moduleSet2[] = {
"org.apache.tomcat.modules.config.PathSetter",
- "org.apache.tomcat.modules.config.ServerXmlInterceptor",
+ "org.apache.tomcat.modules.config.ServerXmlReader",
};
protected void initDefaultInterceptors() {
1.50 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
Index: Tomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Tomcat.java 2001/02/01 05:27:33 1.49
+++ Tomcat.java 2001/02/01 06:24:34 1.50
@@ -70,7 +70,7 @@
PathSetter pS=new PathSetter();
tcat.addInterceptor( pS );
- ServerXmlInterceptor sxmlConf=new ServerXmlInterceptor();
+ ServerXmlReader sxmlConf=new ServerXmlReader();
sxmlConf.setConfig( configFile );
tcat.addInterceptor( sxmlConf );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
