You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2001/02/01 06:27:37 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup Tomcat.java EmbededTomcat.java
costin 01/01/31 21:27:36
Modified: src/share/org/apache/tomcat/startup Tomcat.java
EmbededTomcat.java
Log:
Added the path-fixer module before the server.xml reader.
Revision Changes Path
1.49 +4 -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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Tomcat.java 2000/12/29 21:24:35 1.48
+++ Tomcat.java 2001/02/01 05:27:33 1.49
@@ -52,7 +52,7 @@
StopTomcat task=
new StopTomcat();
- task.setConfig( configFile );
+ // task.setConfig( configFile );
task.execute();
}
catch (TomcatException te) {
@@ -67,6 +67,9 @@
public void start() throws Exception {
EmbededTomcat tcat=new EmbededTomcat();
+ PathSetter pS=new PathSetter();
+ tcat.addInterceptor( pS );
+
ServerXmlInterceptor sxmlConf=new ServerXmlInterceptor();
sxmlConf.setConfig( configFile );
tcat.addInterceptor( sxmlConf );
1.42 +6 -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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- EmbededTomcat.java 2001/01/01 02:07:24 1.41
+++ EmbededTomcat.java 2001/02/01 05:27:34 1.42
@@ -218,6 +218,8 @@
contextM.start();
}
+ /** Stop contextM - will not exit the VM.
+ */
public void stop() throws TomcatException {
contextM.stop();
}
@@ -251,7 +253,7 @@
// no AutoSetup !
protected String moduleSet1[] = {
- "org.apache.tomcat.modules.config.DefaultCMSetter",
+ "org.apache.tomcat.modules.config.PathSetter",
"org.apache.tomcat.facade.WebXmlReader",
"org.apache.tomcat.modules.config.PolicyInterceptor",
"org.apache.tomcat.modules.config.LoaderInterceptor12",
@@ -271,6 +273,7 @@
};
protected String moduleSet2[] = {
+ "org.apache.tomcat.modules.config.PathSetter",
"org.apache.tomcat.modules.config.ServerXmlInterceptor",
};
@@ -301,5 +304,7 @@
return null;
}
}
+
+
}