geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r562257 - /geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Date Thu, 02 Aug 2007 21:22:27 GMT
Author: dwoods
Date: Thu Aug  2 14:22:26 2007
New Revision: 562257

URL: http://svn.apache.org/viewvc?view=rev&rev=562257
Log:
GERONIMO-3362 Enable Tomcat context level cluster.  Applied patch from Yun Feng Ma.

Modified:
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?view=diff&rev=562257&r1=562256&r2=562257
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Thu Aug  2 14:22:26 2007
@@ -63,6 +63,7 @@
 import org.apache.geronimo.naming.deployment.GBeanResourceEnvironmentBuilder;
 import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
+import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
 import org.apache.geronimo.tomcat.LifecycleListenerGBean;
 import org.apache.geronimo.tomcat.ManagerGBean;
 import org.apache.geronimo.tomcat.RealmGBean;
@@ -348,11 +349,11 @@
                 webModuleData.setReferencePattern("LifecycleListenerChain", listenerName);
             }
 
-//            if (tomcatWebApp.isSetCluster()) {
-//                String cluster = tomcatWebApp.getCluster().trim();
-//                AbstractName clusterName = earContext.getNaming().createChildName(moduleName,
cluster, CatalinaClusterGBean.J2EE_TYPE);
-//                webModuleData.setReferencePattern("Cluster", clusterName);
-//            }
+            if (tomcatWebApp.isSetCluster()) {
+                String cluster = tomcatWebApp.getCluster().trim();
+                AbstractName clusterName = earContext.getNaming().createChildName(moduleName,
cluster, CatalinaClusterGBean.J2EE_TYPE);
+                webModuleData.setReferencePattern("Cluster", clusterName);
+            }
 
             if (tomcatWebApp.isSetManager()) {
                 String manager = tomcatWebApp.getManager().trim();



Mime
View raw message