Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3B7B3F022 for ; Wed, 17 Apr 2013 02:40:59 +0000 (UTC) Received: (qmail 62986 invoked by uid 500); 17 Apr 2013 02:40:59 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 62940 invoked by uid 500); 17 Apr 2013 02:40:59 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 62933 invoked by uid 99); 17 Apr 2013 02:40:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Apr 2013 02:40:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Apr 2013 02:40:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5A49423888E7; Wed, 17 Apr 2013 02:40:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1468724 - in /geronimo/external/trunk/tomcat-parent-7.0.39: ./ 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: Wed, 17 Apr 2013 02:40:35 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130417024035.5A49423888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xiaming Date: Wed Apr 17 02:40:34 2013 New Revision: 1468724 URL: http://svn.apache.org/r1468724 Log: GERONIMO-6447 Tomcat clustering relocation, merged the changes from revision tomcat-parent-7.0.27@1329534 Added: geronimo/external/trunk/tomcat-parent-7.0.39/catalina-ha/src/main/java/org/apache/catalina/ha/ClusterRuleSet.java - copied unchanged from r1329534, geronimo/external/trunk/tomcat-parent-7.0.27/catalina-ha/src/main/java/org/apache/catalina/ha/ClusterRuleSet.java geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/startup/ClusterRuleSetFactory.java - copied unchanged from r1329534, geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/startup/ClusterRuleSetFactory.java Removed: geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/ha/ Modified: geronimo/external/trunk/tomcat-parent-7.0.39/ (props changed) geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/startup/Catalina.java Propchange: geronimo/external/trunk/tomcat-parent-7.0.39/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Apr 17 02:40:34 2013 @@ -0,0 +1,3 @@ +/geronimo/external/trunk/tomcat-parent-7.0.19:1148324 +/geronimo/external/trunk/tomcat-parent-7.0.23:1230870 +/geronimo/external/trunk/tomcat-parent-7.0.27:1329534 Modified: geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/startup/Catalina.java URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/startup/Catalina.java?rev=1468724&r1=1468723&r2=1468724&view=diff ============================================================================== --- geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/startup/Catalina.java (original) +++ geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/startup/Catalina.java Wed Apr 17 02:40:34 2013 @@ -384,13 +384,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()) {