Author: fhanik Date: Sat Feb 25 15:43:51 2006 New Revision: 381026 URL: http://svn.apache.org/viewcvs?rev=381026&view=rev Log: Refactored new module name
Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/CatalinaCluster.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterDeployer.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterListener.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterMessage.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterMessageBase.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterRuleSet.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/deploy/FileMessage.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/DeltaManager.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SendMessageData.java tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/CatalinaCluster.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/CatalinaCluster.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/CatalinaCluster.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/CatalinaCluster.java Sat Feb 25 15:43:51 2006 @@ -23,10 +23,10 @@ import org.apache.catalina.Manager; import org.apache.catalina.Valve; import org.apache.commons.logging.Log; -import org.apache.catalina.groups.io.ReplicationStream; +import org.apache.catalina.tribes.io.ReplicationStream; import java.io.IOException; -import org.apache.catalina.groups.Channel; -import org.apache.catalina.groups.Member; +import org.apache.catalina.tribes.Channel; +import org.apache.catalina.tribes.Member; Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterDeployer.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterDeployer.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterDeployer.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterDeployer.java Sat Feb 25 15:43:51 2006 @@ -26,7 +26,7 @@ import org.apache.catalina.LifecycleException; import java.io.IOException; import java.net.URL; -import org.apache.catalina.groups.MessageListener; +import org.apache.catalina.tribes.MessageListener; public interface ClusterDeployer extends MessageListener { /** Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterListener.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterListener.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterListener.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterListener.java Sat Feb 25 15:43:51 2006 @@ -20,8 +20,8 @@ import org.apache.catalina.util.StringManager; -import org.apache.catalina.groups.MessageListener; -import org.apache.catalina.groups.ChannelMessage; +import org.apache.catalina.tribes.MessageListener; +import org.apache.catalina.tribes.ChannelMessage; /** Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterMessage.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterMessage.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterMessage.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterMessage.java Sat Feb 25 15:43:51 2006 @@ -16,7 +16,7 @@ package org.apache.catalina.cluster; import java.io.Serializable; -import org.apache.catalina.groups.Member; +import org.apache.catalina.tribes.Member; /** Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterMessageBase.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterMessageBase.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterMessageBase.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterMessageBase.java Sat Feb 25 15:43:51 2006 @@ -1,6 +1,6 @@ package org.apache.catalina.cluster; -import org.apache.catalina.groups.Member; +import org.apache.catalina.tribes.Member; /** Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterRuleSet.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterRuleSet.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterRuleSet.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/ClusterRuleSet.java Sat Feb 25 15:43:51 2006 @@ -92,7 +92,7 @@ digester.addSetProperties(prefix + "Channel"); digester.addSetNext(prefix + "Channel", "setChannel", - "org.apache.catalina.groups.Channel"); + "org.apache.catalina.tribes.Channel"); String channelPrefix = prefix + "Channel/"; @@ -103,7 +103,7 @@ digester.addSetProperties(channelPrefix + "Membership"); digester.addSetNext(channelPrefix + "Membership", "setMembershipService", - "org.apache.catalina.groups.MembershipService"); + "org.apache.catalina.tribes.MembershipService"); digester.addObjectCreate(channelPrefix + "Sender", null, // MUST be specified in the element @@ -111,7 +111,7 @@ digester.addSetProperties(channelPrefix + "Sender"); digester.addSetNext(channelPrefix + "Sender", "setChannelSender", - "org.apache.catalina.groups.ChannelSender"); + "org.apache.catalina.tribes.ChannelSender"); digester.addObjectCreate(channelPrefix + "Receiver", null, // MUST be specified in the element @@ -119,7 +119,7 @@ digester.addSetProperties(channelPrefix + "Receiver"); digester.addSetNext(channelPrefix + "Receiver", "setChannelReceiver", - "org.apache.catalina.groups.ChannelReceiver"); + "org.apache.catalina.tribes.ChannelReceiver"); digester.addObjectCreate(channelPrefix + "Interceptor", null, // MUST be specified in the element @@ -127,7 +127,7 @@ digester.addSetProperties(channelPrefix + "Interceptor"); digester.addSetNext(channelPrefix + "Interceptor", "addInterceptor", - "org.apache.catalina.groups.ChannelInterceptor"); + "org.apache.catalina.tribes.ChannelInterceptor"); } digester.addObjectCreate(prefix + "Valve", Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java Sat Feb 25 15:43:51 2006 @@ -32,7 +32,7 @@ import org.apache.catalina.cluster.CatalinaCluster; import org.apache.catalina.cluster.ClusterDeployer; import org.apache.catalina.cluster.ClusterMessage; -import org.apache.catalina.groups.Member; +import org.apache.catalina.tribes.Member; import org.apache.commons.modeler.Registry; import org.apache.catalina.cluster.ClusterListener; Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/deploy/FileMessage.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/deploy/FileMessage.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/deploy/FileMessage.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/deploy/FileMessage.java Sat Feb 25 15:43:51 2006 @@ -19,7 +19,7 @@ import java.io.Serializable; import org.apache.catalina.cluster.ClusterMessage; -import org.apache.catalina.groups.Member; +import org.apache.catalina.tribes.Member; import org.apache.catalina.cluster.ClusterMessageBase; /** Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/ClusterManagerBase.java Sat Feb 25 15:43:51 2006 @@ -23,7 +23,7 @@ import org.apache.catalina.Loader; import java.io.ByteArrayInputStream; import java.io.IOException; -import org.apache.catalina.groups.io.ReplicationStream; +import org.apache.catalina.tribes.io.ReplicationStream; /** * Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/DeltaManager.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/DeltaManager.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/DeltaManager.java Sat Feb 25 15:43:51 2006 @@ -43,13 +43,13 @@ import org.apache.catalina.cluster.CatalinaCluster; import org.apache.catalina.cluster.ClusterManager; import org.apache.catalina.cluster.ClusterMessage; -import org.apache.catalina.groups.Member; +import org.apache.catalina.tribes.Member; import org.apache.catalina.session.ManagerBase; import org.apache.catalina.cluster.tcp.ReplicationValve; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; import org.apache.catalina.core.StandardContext; -import org.apache.catalina.groups.io.ReplicationStream; +import org.apache.catalina.tribes.io.ReplicationStream; /** * The DeltaManager manages replicated sessions by only replicating the deltas Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java Sat Feb 25 15:43:51 2006 @@ -17,7 +17,7 @@ import org.apache.catalina.cluster.ClusterMessage; -import org.apache.catalina.groups.Member; +import org.apache.catalina.tribes.Member; import org.apache.catalina.cluster.ClusterMessageBase; /** Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java Sat Feb 25 15:43:51 2006 @@ -22,10 +22,10 @@ import org.apache.catalina.cluster.CatalinaCluster; import org.apache.catalina.cluster.ClusterManager; import org.apache.catalina.cluster.ClusterMessage; -import org.apache.catalina.groups.Member; +import org.apache.catalina.tribes.Member; import org.apache.catalina.realm.GenericPrincipal; import org.apache.catalina.session.StandardManager; -import org.apache.catalina.groups.io.ReplicationStream; +import org.apache.catalina.tribes.io.ReplicationStream; import java.io.ByteArrayInputStream; import org.apache.catalina.Loader; Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SendMessageData.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SendMessageData.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SendMessageData.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SendMessageData.java Sat Feb 25 15:43:51 2006 @@ -16,7 +16,7 @@ package org.apache.catalina.cluster.tcp; -import org.apache.catalina.groups.Member; +import org.apache.catalina.tribes.Member; /** * @author Peter Rossbach Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java?rev=381026&r1=381025&r2=381026&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java (original) +++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java Sat Feb 25 15:43:51 2006 @@ -37,15 +37,15 @@ import org.apache.catalina.Manager; import org.apache.catalina.Valve; import org.apache.catalina.cluster.CatalinaCluster; -import org.apache.catalina.groups.Channel; -import org.apache.catalina.groups.ChannelListener; +import org.apache.catalina.tribes.Channel; +import org.apache.catalina.tribes.ChannelListener; import org.apache.catalina.cluster.ClusterListener; import org.apache.catalina.cluster.ClusterManager; import org.apache.catalina.cluster.ClusterMessage; import org.apache.catalina.cluster.ClusterValve; -import org.apache.catalina.groups.Member; -import org.apache.catalina.groups.MembershipListener; -import org.apache.catalina.groups.group.GroupChannel; +import org.apache.catalina.tribes.Member; +import org.apache.catalina.tribes.MembershipListener; +import org.apache.catalina.tribes.group.GroupChannel; import org.apache.catalina.cluster.session.DeltaManager; import org.apache.catalina.cluster.util.IDynamicProperty; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]