glenn 01/02/25 19:52:48
Modified: catalina/src/share/org/apache/catalina/startup Catalina.java
Log:
Implement DefaultContext in server.xml config
Revision Changes Path
1.16 +62 -25
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Catalina.java 2001/02/04 00:51:57 1.15
+++ Catalina.java 2001/02/26 03:52:47 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.15 2001/02/04 00:51:57 glenn Exp $
- * $Revision: 1.15 $
- * $Date: 2001/02/04 00:51:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.16 2001/02/26 03:52:47 glenn Exp $
+ * $Revision: 1.16 $
+ * $Date: 2001/02/26 03:52:47 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* </u>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.15 $ $Date: 2001/02/04 00:51:57 $
+ * @version $Revision: 1.16 $ $Date: 2001/02/26 03:52:47 $
*/
public class Catalina {
@@ -327,6 +327,9 @@
("setContainer", "org.apache.catalina.Container"));
createStartMapperContext("Server/Service/Engine/Context", mapper);
+ createStartMapperDefaultContext(
+ "Server/Service/Engine/DefaultContext",
+ mapper);
mapper.addRule("Server/Service/Engine/Host", mapper.objectCreate
("org.apache.catalina.core.StandardHost",
@@ -342,6 +345,9 @@
("addChild", "org.apache.catalina.Container"));
createStartMapperContext("Server/Service/Engine/Host/Context", mapper);
+ createStartMapperDefaultContext(
+ "Server/Service/Engine/Host/DefaultContext",
+ mapper);
mapper.addRule("Server/Service/Engine/Host/Listener",
mapper.objectCreate
@@ -441,7 +447,59 @@
"configClass"));
mapper.addRule(prefix + "", mapper.addChild
("addChild", "org.apache.catalina.Container"));
+ createContextCommon(prefix, mapper);
+ }
+
+
+ /**
+ * Create the mapper rules for a DefaultContext, based on the
+ * specified prefix.
+ *
+ * @param prefix Prefix to rule selectors to be created
+ * @param mapper The mapper we are updating
+ */
+ protected void createStartMapperDefaultContext(String prefix,
+ XmlMapper mapper) {
+
+ mapper.addRule(prefix + "", mapper.objectCreate
+ ("org.apache.catalina.core.DefaultContext",
+ "className"));
+ mapper.addRule(prefix + "", mapper.setProperties());
+ mapper.addRule(prefix + "", mapper.addChild
+ ("addDefaultContext",
"org.apache.catalina.core.DefaultContext"));
+ mapper.addRule(prefix + "/Logger", mapper.objectCreate
+ (null, "className"));
+ mapper.addRule(prefix + "/Logger",
+ mapper.setProperties());
+ mapper.addRule(prefix + "/Logger", mapper.addChild
+ ("setLogger", "org.apache.catalina.Logger"));
+
+ mapper.addRule(prefix + "/Realm", mapper.objectCreate
+ (null, "className"));
+ mapper.addRule(prefix + "/Realm",
+ mapper.setProperties());
+ mapper.addRule(prefix + "/Realm", mapper.addChild
+ ("setRealm", "org.apache.catalina.Realm"));
+
+ mapper.addRule(prefix + "/Valve", mapper.objectCreate
+ (null, "className"));
+ mapper.addRule(prefix + "/Valve",
+ mapper.setProperties());
+ mapper.addRule(prefix + "/Valve", mapper.addChild
+ ("addValve", "org.apache.catalina.Valve"));
+
+ createContextCommon(prefix, mapper);
+ }
+
+ /**
+ * Create the mapper rules for a Context which are common to both
+ * a Context and a DefaultContext, based on the specified prefix.
+ *
+ * @param prefix Prefix to rule selectors to be created
+ * @param mapper The mapper we are updating
+ */
+ protected void createContextCommon(String prefix, XmlMapper mapper) {
mapper.addRule(prefix + "/ResourceParams", mapper.objectCreate
("org.apache.catalina.deploy.ResourceParams"));
mapper.addRule(prefix + "/ResourceParams",
@@ -492,13 +550,6 @@
mapper.addRule(prefix + "/Loader", mapper.addChild
("setLoader", "org.apache.catalina.Loader"));
- mapper.addRule(prefix + "/Logger", mapper.objectCreate
- (null, "className"));
- mapper.addRule(prefix + "/Logger",
- mapper.setProperties());
- mapper.addRule(prefix + "/Logger", mapper.addChild
- ("setLogger", "org.apache.catalina.Logger"));
-
mapper.addRule(prefix + "/Manager",
mapper.objectCreate
("org.apache.catalina.session.StandardManager",
@@ -516,13 +567,6 @@
("addApplicationParameter",
"org.apache.catalina.deploy.ApplicationParameter"));
- mapper.addRule(prefix + "/Realm", mapper.objectCreate
- (null, "className"));
- mapper.addRule(prefix + "/Realm",
- mapper.setProperties());
- mapper.addRule(prefix + "/Realm", mapper.addChild
- ("setRealm", "org.apache.catalina.Realm"));
-
mapper.addRule(prefix + "/Resource",
mapper.objectCreate
("org.apache.catalina.deploy.ContextResource"));
@@ -541,13 +585,6 @@
mapper.setProperties());
mapper.addRule(prefix + "/Resources", mapper.addChild
("setResources", "javax.naming.directory.DirContext"));
-
- mapper.addRule(prefix + "/Valve", mapper.objectCreate
- (null, "className"));
- mapper.addRule(prefix + "/Valve",
- mapper.setProperties());
- mapper.addRule(prefix + "/Valve", mapper.addChild
- ("addValve", "org.apache.catalina.Valve"));
mapper.addRule(prefix + "/WrapperLifecycle",
mapper.methodSetter("addWrapperLifecycle", 0));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
