Author: rmannibucau
Date: Fri Dec 7 20:57:56 2012
New Revision: 1418471
URL: http://svn.apache.org/viewvc?rev=1418471&view=rev
Log:
TOMEE-609 reworking our custom cluster listener + making default session
clustering working as in tomcat
Added:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/SimpleTomEETcpCluster.java
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/TomEEClusterListener.java
Added:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/SimpleTomEETcpCluster.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/SimpleTomEETcpCluster.java?rev=1418471&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/SimpleTomEETcpCluster.java
(added)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/SimpleTomEETcpCluster.java
Fri Dec 7 20:57:56 2012
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.catalina;
+
+import org.apache.catalina.Valve;
+import org.apache.catalina.ha.ClusterListener;
+import org.apache.catalina.ha.tcp.SimpleTcpCluster;
+import org.apache.tomee.catalina.cluster.TomEEClusterListener;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+public class SimpleTomEETcpCluster extends SimpleTcpCluster {
+ public SimpleTomEETcpCluster(final SimpleTcpCluster from) {
+ clusterListeners = new
ArrayList<ClusterListener>(Arrays.asList(from.findClusterListeners()));
+
+ setClusterName(from.getClusterName());
+ setContainer(from.getContainer());
+
setNotifyLifecycleListenerOnFailure(from.isNotifyLifecycleListenerOnFailure());
+
+ setChannelSendOptions(from.getChannelSendOptions());
+ setChannelStartOptions(from.getChannelStartOptions());
+ setHeartbeatBackgroundEnabled(from.isHeartbeatBackgroundEnabled());
+ setChannel(from.getChannel());
+ getManagers().putAll(from.getManagers());
+ setManagerTemplate(from.getManagerTemplate());
+ setClusterDeployer(from.getClusterDeployer());
+
+ for (Valve valve : from.getValves()) {
+ addValve(valve);
+ }
+
+ final Iterator<String> propertyNames = from.getPropertyNames();
+ while (propertyNames.hasNext()) {
+ String next = propertyNames.next();
+ setProperty(next, from.getProperty(next));
+ }
+ }
+
+ @Override
+ protected void checkDefaults() {
+ final List<ClusterListener> currentListeners = clusterListeners;
+ if (currentListeners.size() == 1 && currentListeners.iterator().next()
== TomEEClusterListener.INSTANCE) {
+ currentListeners.clear();
+ }
+ super.checkDefaults();
+ addClusterListener(TomEEClusterListener.INSTANCE);
+ }
+}
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1418471&r1=1418470&r2=1418471&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Fri Dec 7 20:57:56 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/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/TomEEClusterListener.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/TomEEClusterListener.java?rev=1418471&r1=1418470&r2=1418471&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/TomEEClusterListener.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cluster/TomEEClusterListener.java
Fri Dec 7 20:57:56 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();
