You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/01/13 03:51:29 UTC
svn commit: r1230870 - in /geronimo/external/trunk/tomcat-parent-7.0.23: ./
catalina-ha/src/main/java/org/apache/catalina/ha/
catalina/src/main/java/org/apache/catalina/ha/
catalina/src/main/java/org/apache/catalina/startup/
Author: xiaming
Date: Fri Jan 13 02:51:28 2012
New Revision: 1230870
URL: http://svn.apache.org/viewvc?rev=1230870&view=rev
Log:
GERONIMO-6262 Recover the changes of tomcat-parent-7.0.19@1148324, which brought a cycle dependency issue We might merge the catalina and catalina-ha in one module in the future
Added:
geronimo/external/trunk/tomcat-parent-7.0.23/catalina-ha/src/main/java/org/apache/catalina/ha/ClusterRuleSet.java
- copied unchanged from r1230867, geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/java/org/apache/catalina/ha/ClusterRuleSet.java
geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
- copied unchanged from r1148324, geronimo/external/trunk/tomcat-parent-7.0.19/catalina/src/main/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
Removed:
geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/java/org/apache/catalina/ha/
Modified:
geronimo/external/trunk/tomcat-parent-7.0.23/ (props changed)
geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/java/org/apache/catalina/startup/Catalina.java
Propchange: geronimo/external/trunk/tomcat-parent-7.0.23/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 13 02:51:28 2012
@@ -1 +1 @@
-/geronimo/external/trunk/tomcat-parent-7.0.19:1148322
+/geronimo/external/trunk/tomcat-parent-7.0.19:1148322,1148324
Modified: geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/java/org/apache/catalina/startup/Catalina.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/java/org/apache/catalina/startup/Catalina.java?rev=1230870&r1=1230869&r2=1230870&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/java/org/apache/catalina/startup/Catalina.java (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/java/org/apache/catalina/startup/Catalina.java Fri Jan 13 02:51:28 2012
@@ -34,7 +34,6 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Server;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.ha.ClusterRuleSet;
import org.apache.catalina.security.SecurityConfig;
import org.apache.juli.ClassLoaderLogManager;
import org.apache.tomcat.util.ExceptionUtils;
@@ -372,13 +371,15 @@ public class Catalina {
digester.addRuleSet(new EngineRuleSet("Server/Service/"));
digester.addRuleSet(new HostRuleSet("Server/Service/Engine/"));
digester.addRuleSet(new ContextRuleSet("Server/Service/Engine/Host/"));
- digester.addRuleSet(new ClusterRuleSet("Server/Service/Engine/Host/Cluster/"));
+ //digester.addRuleSet(new ClusterRuleSet("Server/Service/Engine/Host/Cluster/"));
+ digester.addRuleSet(ClusterRuleSetFactory.getClusterRuleSet("Server/Service/Engine/Host/Cluster/"));
digester.addRuleSet(new NamingRuleSet("Server/Service/Engine/Host/Context/"));
// When the 'engine' is found, set the parentClassLoader.
digester.addRule("Server/Service/Engine",
new SetParentClassLoaderRule(parentClassLoader));
- digester.addRuleSet(new ClusterRuleSet("Server/Service/Engine/Cluster/"));
+ //digester.addRuleSet(new ClusterRuleSet("Server/Service/Engine/Cluster/"));
+ digester.addRuleSet(ClusterRuleSetFactory.getClusterRuleSet("Server/Service/Engine/Cluster/"));
long t2=System.currentTimeMillis();
if (log.isDebugEnabled()) {