remm 2004/01/25 13:01:03
Modified: catalina/src/share/org/apache/catalina/startup
ContextRuleSet.java EngineRuleSet.java
HostRuleSet.java
Log:
- Remove deprecation with the digester.
- Remove a few imports.
Revision Changes Path
1.6 +7 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
Index: ContextRuleSet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContextRuleSet.java 25 Jan 2004 20:57:18 -0000 1.5
+++ ContextRuleSet.java 25 Jan 2004 21:01:03 -0000 1.6
@@ -150,14 +150,12 @@
digester.addSetProperties(prefix + "Context");
if (!isDefaultContext()) {
digester.addRule(prefix + "Context",
- new CopyParentClassLoaderRule(digester));
+ new CopyParentClassLoaderRule());
digester.addRule(prefix + "Context",
new LifecycleListenerRule
- (digester,
- "org.apache.catalina.startup.ContextConfig",
+ ("org.apache.catalina.startup.ContextConfig",
"configClass"));
- digester.addRule(prefix + "Context",
- new SetDocBaseRule(digester));
+ digester.addRule(prefix + "Context", new SetDocBaseRule());
digester.addSetNext(prefix + "Context",
"addChild",
"org.apache.catalina.Container");
1.3 +5 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/EngineRuleSet.java
Index: EngineRuleSet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/EngineRuleSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EngineRuleSet.java 2 Sep 2003 21:22:00 -0000 1.2
+++ EngineRuleSet.java 25 Jan 2004 21:01:03 -0000 1.3
@@ -140,8 +140,7 @@
digester.addSetProperties(prefix + "Engine");
digester.addRule(prefix + "Engine",
new LifecycleListenerRule
- (digester,
- "org.apache.catalina.startup.EngineConfig",
+ ("org.apache.catalina.startup.EngineConfig",
"engineConfigClass"));
digester.addSetNext(prefix + "Engine",
"setContainer",
1.4 +6 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostRuleSet.java
Index: HostRuleSet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostRuleSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HostRuleSet.java 2 Sep 2003 21:22:00 -0000 1.3
+++ HostRuleSet.java 25 Jan 2004 21:01:03 -0000 1.4
@@ -138,11 +138,10 @@
"className");
digester.addSetProperties(prefix + "Host");
digester.addRule(prefix + "Host",
- new CopyParentClassLoaderRule(digester));
+ new CopyParentClassLoaderRule());
digester.addRule(prefix + "Host",
new LifecycleListenerRule
- (digester,
- "org.apache.catalina.startup.HostConfig",
+ ("org.apache.catalina.startup.HostConfig",
"hostConfigClass"));
digester.addSetNext(prefix + "Host",
"addChild",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
