geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1329534 - in /geronimo/external/trunk/tomcat-parent-7.0.27: ./ 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/
Date Tue, 24 Apr 2012 03:01:59 GMT
Author: xiaming
Date: Tue Apr 24 03:01:58 2012
New Revision: 1329534

URL: http://svn.apache.org/viewvc?rev=1329534&view=rev
Log:
GERONIMO-6334 Merge the changes from revision tomcat-parent-7.0.23@1230870

Added:
    geronimo/external/trunk/tomcat-parent-7.0.27/catalina-ha/src/main/java/org/apache/catalina/ha/ClusterRuleSet.java
      - copied unchanged from r1230870, geronimo/external/trunk/tomcat-parent-7.0.23/catalina-ha/src/main/java/org/apache/catalina/ha/ClusterRuleSet.java
    geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
      - copied unchanged from r1230870, geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
Removed:
    geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/ha/
Modified:
    geronimo/external/trunk/tomcat-parent-7.0.27/   (props changed)
    geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/startup/Catalina.java

Propchange: geronimo/external/trunk/tomcat-parent-7.0.27/
------------------------------------------------------------------------------
  Merged /geronimo/external/trunk/tomcat-parent-7.0.19:r1148324
  Merged /geronimo/external/trunk/tomcat-parent-7.0.23:r1230870

Modified: geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/startup/Catalina.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/startup/Catalina.java?rev=1329534&r1=1329533&r2=1329534&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/startup/Catalina.java
(original)
+++ geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/startup/Catalina.java
Tue Apr 24 03:01:58 2012
@@ -375,13 +375,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/"));
-        addClusterRuleSet(digester, "Server/Service/Engine/Host/Cluster/");
+        //addClusterRuleSet(digester, "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));
-        addClusterRuleSet(digester, "Server/Service/Engine/Cluster/");
+        // addClusterRuleSet(digester, "Server/Service/Engine/Cluster/");
+        digester.addRuleSet(ClusterRuleSetFactory.getClusterRuleSet("Server/Service/Engine/Cluster/"));
 
         long t2=System.currentTimeMillis();
         if (log.isDebugEnabled()) {



Mime
View raw message