svn commit: r1418472 - in /openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina: TomcatWebAppBuilder.java cluster/TomEEClusterListener.java

[rmannibucau]

Author: rmannibucau
Date: Fri Dec  7 20:58:42 2012
New Revision: 1418472

URL: http://svn.apache.org/viewvc?rev=1418472&view=rev
Log:
TOMEE-609 reworking our custom cluster listener + making default session 
clustering working as in tomcat - merge in branch

Modified:
    
openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
    
openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/TomEEClusterListener.java

Modified: 
openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1418472&r1=1418471&r2=1418472&view=diff
==============================================================================
--- 
openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Fri Dec  7 20:58:42 2012
@@ -44,6 +44,7 @@ import org.apache.catalina.deploy.Contex
 import org.apache.catalina.deploy.NamingResources;
 import org.apache.catalina.deploy.ResourceBase;
 import org.apache.catalina.ha.CatalinaCluster;
+import org.apache.catalina.ha.tcp.SimpleTcpCluster;
 import org.apache.catalina.loader.WebappClassLoader;
 import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.session.StandardManager;
@@ -271,9 +272,16 @@ public class TomcatWebAppBuilder impleme
             return;
         }
 
-        if (cluster instanceof CatalinaCluster) {
-            final CatalinaCluster haCluster = (CatalinaCluster) cluster;
-            haCluster.addClusterListener(new TomEEClusterListener());
+        Cluster current = cluster;
+        if (cluster instanceof SimpleTcpCluster) {
+            final Container container = cluster.getContainer();
+            current = new SimpleTomEETcpCluster((SimpleTcpCluster) cluster);
+            container.setCluster(current);
+        }
+
+        if (current instanceof CatalinaCluster) {
+            final CatalinaCluster haCluster = (CatalinaCluster) current;
+            haCluster.addClusterListener(TomEEClusterListener.INSTANCE); // 
better to be a singleton
             clusters.add(haCluster);
         }
     }

Modified: 
openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/TomEEClusterListener.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/TomEEClusterListener.java?rev=1418472&r1=1418471&r2=1418472&view=diff
==============================================================================
--- 
openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/TomEEClusterListener.java
 (original)
+++ 
openejb/branches/openejb-4.5.1-b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/TomEEClusterListener.java
 Fri Dec  7 20:58:42 2012
@@ -40,6 +40,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 public class TomEEClusterListener extends ClusterListener {
+    public static final TomEEClusterListener INSTANCE = new 
TomEEClusterListener();
+
     private static final Logger LOGGER = 
Logger.getInstance(LogCategory.OPENEJB, TomEEClusterListener.class);
     private static final Properties IC_PROPS = new Properties();