Remove unnecessary digester configuration

hostConfigClass and engineConfigClass were removed before 6.0.x

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@996112 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/EngineRuleSet.java b/java/org/apache/catalina/startup/EngineRuleSet.java
index c73a6d6..a7bfdbd 100644 (file)
--- a/java/org/apache/catalina/startup/EngineRuleSet.java
+++ b/java/org/apache/catalina/startup/EngineRuleSet.java
@@ -94,10 +94,6 @@ public class EngineRuleSet extends RuleSetBase {
                                  "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");

diff --git a/java/org/apache/catalina/startup/HostRuleSet.java b/java/org/apache/catalina/startup/HostRuleSet.java
index 714193e..c8d4968 100644 (file)
--- a/java/org/apache/catalina/startup/HostRuleSet.java
+++ b/java/org/apache/catalina/startup/HostRuleSet.java
@@ -96,10 +96,6 @@ public class HostRuleSet extends RuleSetBase {
         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");