tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r996114 - in /tomcat/trunk/java/org/apache/catalina/startup: EngineRuleSet.java HostRuleSet.java
Date Sat, 11 Sep 2010 10:17:08 GMT
Author: markt
Date: Sat Sep 11 10:17:07 2010
New Revision: 996114

URL: http://svn.apache.org/viewvc?rev=996114&view=rev
Log:
Revert r996112. At least some of that config is required.

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=996114&r1=996113&r2=996114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Sat Sep 11 10:17:07 2010
@@ -94,6 +94,10 @@ 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=996114&r1=996113&r2=996114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Sat Sep 11 10:17:07 2010
@@ -96,6 +96,10 @@ 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message