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...@locus.apache.org on 2000/02/08 21:25:50 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup Tomcat.java
costin 00/02/08 12:25:50
Modified: src/share/org/apache/tomcat/startup Tomcat.java
Log:
Use XmlMapper instead of XmlHelper ( i.e. no magic and a bit more complex, but
more flexibility and cleaner )
Revision Changes Path
1.6 +25 -42 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Tomcat.java 2000/01/27 01:24:50 1.5
+++ Tomcat.java 2000/02/08 20:25:49 1.6
@@ -8,6 +8,7 @@
import java.util.*;
import java.net.*;
import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.xml.*;
import org.apache.tomcat.core.*;
// Used to stop tomcat
@@ -37,36 +38,26 @@
}
// Set the mappings
- void setHelper( XmlHelper xmlHelper ) {
- xmlHelper.addMap( "module", "org.apache.tomcat.service.startup.Module", true);
- xmlHelper.addMap( "contextManager", "org.apache.tomcat.core.ContextManager");
- xmlHelper.addMap( "context", "org.apache.tomcat.core.Context");
- xmlHelper.addMap( "adapter" , "httpAdapter", "org.apache.tomcat.service.http.HttpAdapter");
- xmlHelper.addMap( "adapter" , "ajp12Adapter", "org.apache.tomcat.service.connector.Ajp12Adapter");
- xmlHelper.addMap( "requestInterceptor" , "mapper", "org.apache.tomcat.request.MapperInterceptor");
- xmlHelper.addMap( "requestInterceptor", "contextMapper", "org.apache.tomcat.request.ContextMapperInterceptor");
- xmlHelper.addMap( "requestInterceptor", "session", "org.apache.tomcat.request.SessionInterceptor");
- xmlHelper.addMap( "requestInterceptor", "simpleMapper", "org.apache.tomcat.request.SimpleMapper");
+ void setHelper( XmlMapper xh ) {
+ xh.addRule( "ContextManager", xh.objectCreate("org.apache.tomcat.core.ContextManager") );
+ xh.addRule( "ContextManager", xh.setProperties() );
+ // xh.addRule( "ContextManager", xh.setParent( "setServer" ) );
+ xh.addRule( "ContextManager", xh.addChild( "setContextManager", null) );
+
+ xh.addRule( "ContextManager/Context", xh.objectCreate("org.apache.tomcat.core.Context"));
+ xh.addRule( "ContextManager/Context", xh.setParent( "setContextManager") );
+ xh.addRule( "ContextManager/Context", xh.setProperties() );
+ xh.addRule( "ContextManager/Context", xh.addChild( "addContext", null ) );
+
+ xh.addRule( "ContextManager/Connector", xh.objectCreate(null, "className"));
+ xh.addRule( "ContextManager/Connector", xh.setParent( "setContextManager") );
+ xh.addRule( "ContextManager/Connector", xh.addChild( "addServerConnector", "org.apache.tomcat.core.ServerConnector") );
+
+ xh.addRule( "ContextManager/Connector/Parameter", xh.methodSetter("setProperty",2) );
+ xh.addRule( "ContextManager/Connector/Parameter", xh.methodParam(0, "name") );
+ xh.addRule( "ContextManager/Connector/Parameter", xh.methodParam(1, "value") );
}
- // Set the mappings
- void setHelperOld( XmlHelper xmlHelper ) {
- xmlHelper.addMap( "Server", "org.apache.tomcat.server.HttpServer");
- xmlHelper.addMap( "ContextManager", "org.apache.tomcat.core.ContextManager");
- xmlHelper.addMap( "Context", "org.apache.tomcat.core.Context");
- xmlHelper.addMap( "Connector", "org.apache.tomcat.core.Context");
-
- // special treatement - use name attribute as a property name in parent
- xmlHelper.addPropertyTag( "Parameter" );
-
- xmlHelper.addAttributeMap( "org.apache.tomcat.server.HttpServer",
- "ContextManager",
- "contextManager");
- xmlHelper.addAttributeMap( "org.apache.tomcat.core.Context",
- "ContextManager",
- "contextManager");
- }
-
public void execute(String args[] ) throws Exception {
if( ! processArgs( args ) ) {
System.out.println("Wrong arguments");
@@ -76,26 +67,18 @@
File f=new File(configFile);
- XmlHelper xmlHelper=new XmlHelper();
- xmlHelper.setDebug( 0 );
+ XmlMapper xh=new XmlMapper();
+ xh.setDebug( 0 );
ContextManager cm=null;
- if( configFile.indexOf("server.xml") <0 ) {
- // new config format
- setHelper( xmlHelper );
- cm=(ContextManager)xmlHelper.readXml(f);
- } else {
- // old config format
- setHelperOld( xmlHelper );
- org.apache.tomcat.server.HttpServer server=(org.apache.tomcat.server.HttpServer)xmlHelper.readXml(f);
- // XXX use invocation to do start!
- cm=server.getContextManager();
- }
+ setHelper( xh );
+ org.apache.tomcat.server.HttpServer server=new org.apache.tomcat.server.HttpServer();
+ xh.readXml(f,server);
+ cm=server.getContextManager();
if( doStop ) {
stopTomcat(cm);
return;
}
-
cm.start();
}