svn commit: r996112 - in /tomcat/trunk/java/org/apache/catalina/startup: EngineRuleSet.java HostRuleSet.java

[markt]

Author: markt
Date: Sat Sep 11 09:48:32 2010
New Revision: 996112

URL: http://svn.apache.org/viewvc?rev=996112&view=rev
Log:
Remove unnecessary digester configuration
hostConfigClass and engineConfigClass were removed before 6.0.x

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=996112&r1=996111&r2=996112&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Sat Sep 11 
09:48:32 2010
@@ -94,10 +94,6 @@ public class EngineRuleSet extends RuleS
                                  "org.apache.catalina.core.StandardEngine",
                                  "className");
         digester.addSetProperties(prefix + "Engine");
-        digester.addRule(prefix + "Engine",
-                         new LifecycleListenerRule
-                         ("org.apache.catalina.startup.EngineConfig",
-                          "engineConfigClass"));
         digester.addSetNext(prefix + "Engine",
                             "setContainer",
                             "org.apache.catalina.Container");

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=996112&r1=996111&r2=996112&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Sat Sep 11 
09:48:32 2010
@@ -96,10 +96,6 @@ public class HostRuleSet extends RuleSet
         digester.addSetProperties(prefix + "Host");
         digester.addRule(prefix + "Host",
                          new CopyParentClassLoaderRule());
-        digester.addRule(prefix + "Host",
-                         new LifecycleListenerRule
-                         ("org.apache.catalina.startup.HostConfig",
-                          "hostConfigClass"));
         digester.addSetNext(prefix + "Host",
                             "addChild",
                             "org.apache.catalina.Container");



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org