Author: fhanik Date: Thu Feb 16 06:42:35 2006 New Revision: 378258 URL: http://svn.apache.org/viewcvs?rev=378258&view=rev Log: Refactored: Moved ClusterListener to the correct place. As it is not related to sessions.
Added: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/ClusterListener.java - copied, changed from r378249, tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/ClusterListener.java Removed: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/ClusterListener.java Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ClusterRuleSet.java tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ClusterRuleSet.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ClusterRuleSet.java?rev=378258&r1=378257&r2=378258&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ClusterRuleSet.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ClusterRuleSet.java Thu Feb 16 06:42:35 2006 @@ -139,7 +139,7 @@ digester.addSetProperties(prefix + "ClusterListener"); digester.addSetNext(prefix + "ClusterListener", "addClusterListener", - "org.apache.catalina.cluster.session.ClusterListener"); + "org.apache.catalina.cluster.ClusterListener"); //Cluster configuration end } Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java?rev=378258&r1=378257&r2=378258&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java Thu Feb 16 06:42:35 2006 @@ -23,7 +23,7 @@ import org.apache.catalina.Manager; import org.apache.catalina.Valve; import org.apache.commons.logging.Log; -import org.apache.catalina.cluster.session.ClusterListener; + /** * A <b>CatalinaCluster</b> interface allows to plug in and out the Copied: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/ClusterListener.java (from r378249, tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/ClusterListener.java) URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/ClusterListener.java?p2=tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/ClusterListener.java&p1=tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/ClusterListener.java&r1=378249&r2=378258&rev=378258&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/ClusterListener.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/ClusterListener.java Thu Feb 16 06:42:35 2006 @@ -14,18 +14,20 @@ * limitations under the License. */ -package org.apache.catalina.cluster.session; +package org.apache.catalina.cluster; + + + -import org.apache.catalina.cluster.CatalinaCluster; -import org.apache.catalina.cluster.ClusterMessage; -import org.apache.catalina.cluster.MessageListener; import org.apache.catalina.util.StringManager; + /** * Receive SessionID cluster change from other backup node after primary session * node is failed. * * @author Peter Rossbach + * @author Filip Hanik * @version $Revision$ $Date$ */ public abstract class ClusterListener implements MessageListener { @@ -56,11 +58,9 @@ public void setCluster(CatalinaCluster cluster) { if (log.isDebugEnabled()) { if (cluster != null) - log.debug("add ClusterListener " + this.toString() - + " to cluster" + cluster); + log.debug("add ClusterListener " + this.toString() + " to cluster" + cluster); else - log.debug("remove ClusterListener " + this.toString() - + " from cluster"); + log.debug("remove ClusterListener " + this.toString() + " from cluster"); } this.cluster = cluster; } Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java?rev=378258&r1=378257&r2=378258&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java Thu Feb 16 06:42:35 2006 @@ -34,7 +34,7 @@ import org.apache.catalina.cluster.ClusterMessage; import org.apache.catalina.cluster.Member; import org.apache.commons.modeler.Registry; -import org.apache.catalina.cluster.session.ClusterListener; +import org.apache.catalina.cluster.ClusterListener; /** * <p> Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java?rev=378258&r1=378257&r2=378258&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java Thu Feb 16 06:42:35 2006 @@ -20,10 +20,11 @@ import org.apache.catalina.cluster.ClusterManager; import org.apache.catalina.cluster.ClusterMessage; +import org.apache.catalina.cluster.*; /** * Receive replicated SessionMessage form other cluster node. - * + * @author Filip Hanik * @author Peter Rossbach * @version $Revision$ $Date$ */ Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java?rev=378258&r1=378257&r2=378258&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java Thu Feb 16 06:42:35 2006 @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.commons.modeler.ManagedBean; import org.apache.commons.modeler.Registry; +import org.apache.catalina.cluster.*; /** * Register new JvmRouteSessionIDBinderListener to receive Session ID changes. Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java?rev=378258&r1=378257&r2=378258&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java Thu Feb 16 06:42:35 2006 @@ -25,6 +25,7 @@ import org.apache.catalina.Session; import org.apache.catalina.cluster.ClusterMessage; import org.apache.catalina.core.StandardEngine; +import org.apache.catalina.cluster.*; /** * Receive SessionID cluster change from other backup node after primary session Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java?rev=378258&r1=378257&r2=378258&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java Thu Feb 16 06:42:35 2006 @@ -50,7 +50,7 @@ import org.apache.catalina.cluster.Member; import org.apache.catalina.cluster.MembershipListener; import org.apache.catalina.cluster.MembershipService; -import org.apache.catalina.cluster.session.ClusterListener; +import org.apache.catalina.cluster.ClusterListener; import org.apache.catalina.cluster.mcast.McastService; import org.apache.catalina.cluster.session.ClusterSessionListener; import org.apache.catalina.cluster.session.DeltaManager; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]