tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r380925 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina: cluster/ groups/ groups/demos/ groups/group/ groups/group/interceptors/ groups/io/ groups/mcast/ groups/tcp/ groups/util/
Date Sat, 25 Feb 2006 12:11:41 GMT
Author: fhanik
Date: Sat Feb 25 04:11:35 2006
New Revision: 380925

URL: http://svn.apache.org/viewcvs?rev=380925&view=rev
Log:
Refactored messaging package

Added:
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/
      - copied from r380924, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/cluster/
Removed:
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/cluster/
Modified:
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Channel.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelException.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelInterceptor.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelListener.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelMessage.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelReceiver.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Constants.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/InterceptorPayload.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Member.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MembershipListener.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MembershipService.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MessageListener.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/demos/Draw.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/ChannelCoordinator.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/ChannelInterceptorBase.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/GroupChannel.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/interceptors/FragmentationInterceptor.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/interceptors/GzipInterceptor.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ListenCallback.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ObjectReader.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ReplicationStream.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/SocketObjectReader.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/XByteBuffer.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/Constants.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastMember.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastMembership.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastService.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastServiceImpl.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/AsyncSocketSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/Constants.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/DataSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/FastAsyncSocketSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/IDataSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/IDataSenderFactory.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/PooledSocketSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ReplicationListener.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ReplicationTransmitter.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/SenderState.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/SocketSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/TcpReplicationThread.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ThreadPool.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/WorkerThread.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/FastQueue.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/IDynamicProperty.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/IQueue.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/LinkObject.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/SingleRemoveSynchronizedAddLock.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/SmartQueue.java

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Channel.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Channel.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Channel.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Channel.java Sat Feb 25 04:11:35 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 import java.io.Serializable;
 
@@ -77,8 +77,8 @@
     public ChannelMessage[] send(Member[] destination, Serializable msg, int options) throws ChannelException;
 
     
-    public void setClusterSender(ChannelSender sender);
-    public void setClusterReceiver(ChannelReceiver receiver);
+    public void setChannelSender(ChannelSender sender);
+    public void setChannelReceiver(ChannelReceiver receiver);
     public void setMembershipService(MembershipService service);
     
     /**

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelException.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelException.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelException.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelException.java Sat Feb 25 04:11:35 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 /**
  * Channel Exception 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelInterceptor.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelInterceptor.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelInterceptor.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelInterceptor.java Sat Feb 25 04:11:35 2006
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
-import org.apache.catalina.cluster.ChannelMessage;
-import org.apache.catalina.cluster.Member;
-import org.apache.catalina.cluster.MembershipListener;
-import org.apache.catalina.cluster.MessageListener;
+import org.apache.catalina.groups.ChannelMessage;
+import org.apache.catalina.groups.Member;
+import org.apache.catalina.groups.MembershipListener;
+import org.apache.catalina.groups.MessageListener;
 import java.io.IOException;
-import org.apache.catalina.cluster.io.ClusterData;
+import org.apache.catalina.groups.io.ClusterData;
 
 /**
  * Abstract class for the interceptor base class.

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelListener.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelListener.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelListener.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelListener.java Sat Feb 25 04:11:35 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 import java.io.Serializable;
 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelMessage.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelMessage.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelMessage.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelMessage.java Sat Feb 25 04:11:35 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 import java.io.Serializable;
 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelReceiver.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelReceiver.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelReceiver.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelReceiver.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 
 /**

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelSender.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/ChannelSender.java Sat Feb 25 04:11:35 2006
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
-import org.apache.catalina.cluster.io.ClusterData;
+import org.apache.catalina.groups.io.ClusterData;
 
 /**
  * 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Constants.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Constants.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Constants.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Constants.java Sat Feb 25 04:11:35 2006
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 /**
  * Manifest constants for the <code>org.apache.catalina.cluster</code>

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/InterceptorPayload.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/InterceptorPayload.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/InterceptorPayload.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/InterceptorPayload.java Sat Feb 25 04:11:35 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 /**
  * <p>Title: </p>

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Member.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Member.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Member.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/Member.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 /**
  * The Member interface, defines a member in the Cluster.

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MembershipListener.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MembershipListener.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MembershipListener.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MembershipListener.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 /**
  * The MembershipListener interface is used as a callback to the

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MembershipService.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MembershipService.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MembershipService.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MembershipService.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 
 /**

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MessageListener.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MessageListener.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MessageListener.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/MessageListener.java Sat Feb 25 04:11:35 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster;
+package org.apache.catalina.groups;
 
 import java.io.Serializable;
 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/demos/Draw.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/demos/Draw.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/demos/Draw.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/demos/Draw.java Sat Feb 25 04:11:35 2006
@@ -1,4 +1,4 @@
-package org.apache.catalina.cluster.demos;
+package org.apache.catalina.groups.demos;
 
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectOutputStream;
@@ -21,15 +21,15 @@
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
-import org.apache.catalina.cluster.ChannelMessage;
-import org.apache.catalina.cluster.Member;
-import org.apache.catalina.cluster.group.ChannelInterceptorBase;
-import org.apache.catalina.cluster.group.GroupChannel;
-import org.apache.catalina.cluster.mcast.McastService;
-import org.apache.catalina.cluster.tcp.ReplicationListener;
-import org.apache.catalina.cluster.tcp.ReplicationTransmitter;
+import org.apache.catalina.groups.ChannelMessage;
+import org.apache.catalina.groups.Member;
+import org.apache.catalina.groups.group.ChannelInterceptorBase;
+import org.apache.catalina.groups.group.GroupChannel;
+import org.apache.catalina.groups.mcast.McastService;
+import org.apache.catalina.groups.tcp.ReplicationListener;
+import org.apache.catalina.groups.tcp.ReplicationTransmitter;
 import org.apache.commons.logging.impl.LogFactoryImpl;
-import org.apache.catalina.cluster.Channel;
+import org.apache.catalina.groups.Channel;
 /**
  * Shared whiteboard, each new instance joins the same group. Each instance chooses a random color,
  * mouse moves are broadcast to all group members, which then apply them to their canvas<p>
@@ -82,8 +82,8 @@
         service.setMcastPort(45565);
 
         channel = new GroupChannel();
-        channel.setClusterReceiver(rl);
-        channel.setClusterSender(ps);
+        channel.setChannelReceiver(rl);
+        channel.setChannelSender(ps);
         channel.setMembershipService(service);
         channel.start(channel.DEFAULT);
         

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/ChannelCoordinator.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/ChannelCoordinator.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/ChannelCoordinator.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/ChannelCoordinator.java Sat Feb 25 04:11:35 2006
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster.group;
+package org.apache.catalina.groups.group;
 
-import org.apache.catalina.cluster.MembershipService;
-import org.apache.catalina.cluster.Member;
-import org.apache.catalina.cluster.ChannelMessage;
-import org.apache.catalina.cluster.ChannelException;
-import org.apache.catalina.cluster.ChannelSender;
-import org.apache.catalina.cluster.ChannelReceiver;
-import org.apache.catalina.cluster.Channel;
+import org.apache.catalina.groups.MembershipService;
+import org.apache.catalina.groups.Member;
+import org.apache.catalina.groups.ChannelMessage;
+import org.apache.catalina.groups.ChannelException;
+import org.apache.catalina.groups.ChannelSender;
+import org.apache.catalina.groups.ChannelReceiver;
+import org.apache.catalina.groups.Channel;
 import java.io.IOException;
-import org.apache.catalina.cluster.InterceptorPayload;
-import org.apache.catalina.cluster.io.ClusterData;
-import org.apache.catalina.cluster.MessageListener;
+import org.apache.catalina.groups.InterceptorPayload;
+import org.apache.catalina.groups.io.ClusterData;
+import org.apache.catalina.groups.MessageListener;
 
 
 /**

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/ChannelInterceptorBase.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/ChannelInterceptorBase.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/ChannelInterceptorBase.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/ChannelInterceptorBase.java Sat Feb 25 04:11:35 2006
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster.group;
+package org.apache.catalina.groups.group;
 
-import org.apache.catalina.cluster.ChannelMessage;
-import org.apache.catalina.cluster.Member;
-import org.apache.catalina.cluster.MembershipListener;
-import org.apache.catalina.cluster.MessageListener;
+import org.apache.catalina.groups.ChannelMessage;
+import org.apache.catalina.groups.Member;
+import org.apache.catalina.groups.MembershipListener;
+import org.apache.catalina.groups.MessageListener;
 import java.io.IOException;
-import org.apache.catalina.cluster.ChannelInterceptor;
-import org.apache.catalina.cluster.InterceptorPayload;
-import org.apache.catalina.cluster.io.ClusterData;
+import org.apache.catalina.groups.ChannelInterceptor;
+import org.apache.catalina.groups.InterceptorPayload;
+import org.apache.catalina.groups.io.ClusterData;
 
 /**
  * Abstract class for the interceptor base class.

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/GroupChannel.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/GroupChannel.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/GroupChannel.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/GroupChannel.java Sat Feb 25 04:11:35 2006
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster.group;
+package org.apache.catalina.groups.group;
 
 
-import org.apache.catalina.cluster.ChannelException;
-import org.apache.catalina.cluster.ChannelInterceptor;
-import org.apache.catalina.cluster.Channel;
-import org.apache.catalina.cluster.ChannelMessage;
-import org.apache.catalina.cluster.ChannelReceiver;
-import org.apache.catalina.cluster.ChannelSender;
-import org.apache.catalina.cluster.Member;
-import org.apache.catalina.cluster.MembershipListener;
-import org.apache.catalina.cluster.MembershipService;
-import org.apache.catalina.cluster.MessageListener;
-import org.apache.catalina.cluster.io.ClusterData;
-import org.apache.catalina.cluster.io.XByteBuffer;
+import org.apache.catalina.groups.ChannelException;
+import org.apache.catalina.groups.ChannelInterceptor;
+import org.apache.catalina.groups.Channel;
+import org.apache.catalina.groups.ChannelMessage;
+import org.apache.catalina.groups.ChannelReceiver;
+import org.apache.catalina.groups.ChannelSender;
+import org.apache.catalina.groups.Member;
+import org.apache.catalina.groups.MembershipListener;
+import org.apache.catalina.groups.MembershipService;
+import org.apache.catalina.groups.MessageListener;
+import org.apache.catalina.groups.io.ClusterData;
+import org.apache.catalina.groups.io.XByteBuffer;
 import java.io.Serializable;
-import org.apache.catalina.cluster.ChannelListener;
+import org.apache.catalina.groups.ChannelListener;
 
 /**
  * The GroupChannel manages the replication channel. It coordinates
@@ -163,11 +163,11 @@
         return coordinator.getMembershipService();
     }
 
-    public void setClusterReceiver(ChannelReceiver clusterReceiver) {
+    public void setChannelReceiver(ChannelReceiver clusterReceiver) {
         coordinator.setClusterReceiver(clusterReceiver);
     }
 
-    public void setClusterSender(ChannelSender clusterSender) {
+    public void setChannelSender(ChannelSender clusterSender) {
         coordinator.setClusterSender(clusterSender);
     }
 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/interceptors/FragmentationInterceptor.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/interceptors/FragmentationInterceptor.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/interceptors/FragmentationInterceptor.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/interceptors/FragmentationInterceptor.java Sat Feb 25 04:11:35 2006
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  */
 
-package org.apache.catalina.cluster.group.interceptors;
+package org.apache.catalina.groups.group.interceptors;
 
-import org.apache.catalina.cluster.group.ChannelInterceptorBase;
+import org.apache.catalina.groups.group.ChannelInterceptorBase;
 
 /**
  *

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/interceptors/GzipInterceptor.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/interceptors/GzipInterceptor.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/interceptors/GzipInterceptor.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/group/interceptors/GzipInterceptor.java Sat Feb 25 04:11:35 2006
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  */
 
-package org.apache.catalina.cluster.group.interceptors;
+package org.apache.catalina.groups.group.interceptors;
 
-import org.apache.catalina.cluster.group.ChannelInterceptorBase;
-import org.apache.catalina.cluster.InterceptorPayload;
-import org.apache.catalina.cluster.Member;
+import org.apache.catalina.groups.group.ChannelInterceptorBase;
+import org.apache.catalina.groups.InterceptorPayload;
+import org.apache.catalina.groups.Member;
 import java.io.IOException;
-import org.apache.catalina.cluster.ChannelMessage;
-import org.apache.catalina.cluster.io.ClusterData;
+import org.apache.catalina.groups.ChannelMessage;
+import org.apache.catalina.groups.io.ClusterData;
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
 import java.util.zip.GZIPInputStream;

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ListenCallback.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ListenCallback.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ListenCallback.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ListenCallback.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.io;
+package org.apache.catalina.groups.io;
 
 
 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ObjectReader.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ObjectReader.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ObjectReader.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ObjectReader.java Sat Feb 25 04:11:35 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.cluster.io;
+package org.apache.catalina.groups.io;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.Selector;

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ReplicationStream.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ReplicationStream.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ReplicationStream.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/ReplicationStream.java Sat Feb 25 04:11:35 2006
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.catalina.cluster.io;
+package org.apache.catalina.groups.io;
 
 import java.io.InputStream;
 import java.io.IOException;

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/SocketObjectReader.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/SocketObjectReader.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/SocketObjectReader.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/SocketObjectReader.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.io;
+package org.apache.catalina.groups.io;
 
 
 import java.net.Socket;

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/XByteBuffer.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/XByteBuffer.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/XByteBuffer.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/io/XByteBuffer.java Sat Feb 25 04:11:35 2006
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.io;
+package org.apache.catalina.groups.io;
 
-import org.apache.catalina.cluster.ChannelMessage;
+import org.apache.catalina.groups.ChannelMessage;
 
 import java.io.ObjectOutputStream;
 import java.util.zip.GZIPOutputStream;
@@ -25,9 +25,9 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.zip.GZIPInputStream;
-import org.apache.catalina.cluster.io.ReplicationStream;
+import org.apache.catalina.groups.io.ReplicationStream;
 import java.io.Serializable;
-import org.apache.catalina.cluster.Member;
+import org.apache.catalina.groups.Member;
 import java.util.UUID;
 
 /**

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/Constants.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/Constants.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/Constants.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/Constants.java Sat Feb 25 04:11:35 2006
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.catalina.cluster.mcast;
+package org.apache.catalina.groups.mcast;
 
 /**
  * Manifest constants for the <code>org.apache.catalina.cluster.mcast</code>

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastMember.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastMember.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastMember.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastMember.java Sat Feb 25 04:11:35 2006
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.mcast;
+package org.apache.catalina.groups.mcast;
 
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.apache.catalina.cluster.Member;
-import org.apache.catalina.cluster.io.XByteBuffer;
+import org.apache.catalina.groups.Member;
+import org.apache.catalina.groups.io.XByteBuffer;
 
 /**
  * A <b>membership</b> implementation using simple multicast.

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastMembership.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastMembership.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastMembership.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastMembership.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.mcast;
+package org.apache.catalina.groups.mcast;
 
 
 import java.util.HashMap;

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastService.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastService.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastService.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastService.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.mcast;
+package org.apache.catalina.groups.mcast;
 
 import java.util.Properties;
 
@@ -23,9 +23,9 @@
 
 import org.apache.catalina.Cluster;
 import org.apache.catalina.Container;
-import org.apache.catalina.cluster.Member;
-import org.apache.catalina.cluster.MembershipListener;
-import org.apache.catalina.cluster.MembershipService;
+import org.apache.catalina.groups.Member;
+import org.apache.catalina.groups.MembershipListener;
+import org.apache.catalina.groups.MembershipService;
 import org.apache.catalina.core.StandardHost;
 import org.apache.catalina.util.StringManager;
 import org.apache.commons.modeler.Registry;

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastServiceImpl.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastServiceImpl.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastServiceImpl.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/mcast/McastServiceImpl.java Sat Feb 25 04:11:35 2006
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.mcast;
+package org.apache.catalina.groups.mcast;
 
 
 import java.net.MulticastSocket;
 import java.io.IOException;
 import java.net.InetAddress ;
 import java.net.DatagramPacket;
-import org.apache.catalina.cluster.MembershipListener;
+import org.apache.catalina.groups.MembershipListener;
 
 /**
  * A <b>membership</b> implementation using simple multicast.

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/AsyncSocketSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/AsyncSocketSender.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/AsyncSocketSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/AsyncSocketSender.java Sat Feb 25 04:11:35 2006
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 import java.net.InetAddress;
 
-import org.apache.catalina.cluster.util.SmartQueue;
-import org.apache.catalina.cluster.io.*;
+import org.apache.catalina.groups.util.SmartQueue;
+import org.apache.catalina.groups.io.*;
 
 /**
  * Send cluster messages from a Message queue with only one socket. Ack and keep

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/Constants.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/Constants.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/Constants.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/Constants.java Sat Feb 25 04:11:35 2006
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 /**
  * Manifest constants for the <code>org.apache.catalina.cluster.tcp</code>

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/DataSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/DataSender.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/DataSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/DataSender.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -22,10 +22,10 @@
 import java.net.Socket;
 import java.net.SocketException;
 
-import org.apache.catalina.cluster.ChannelMessage;
-import org.apache.catalina.cluster.io.XByteBuffer;
+import org.apache.catalina.groups.ChannelMessage;
+import org.apache.catalina.groups.io.XByteBuffer;
 import org.apache.catalina.util.StringManager;
-import org.apache.catalina.cluster.io.*;
+import org.apache.catalina.groups.io.*;
 
 /**
  * Send cluster messages with only one socket. Ack and keep Alive Handling is

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/FastAsyncSocketSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/FastAsyncSocketSender.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/FastAsyncSocketSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/FastAsyncSocketSender.java Sat Feb 25 04:11:35 2006
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 import java.net.InetAddress;
 
-import org.apache.catalina.cluster.io.ClusterData;
-import org.apache.catalina.cluster.util.FastQueue;
-import org.apache.catalina.cluster.util.IQueue;
-import org.apache.catalina.cluster.util.LinkObject;
+import org.apache.catalina.groups.io.ClusterData;
+import org.apache.catalina.groups.util.FastQueue;
+import org.apache.catalina.groups.util.IQueue;
+import org.apache.catalina.groups.util.LinkObject;
 
 /**
  * Send cluster messages from a Message queue with only one socket. Ack and keep

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/IDataSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/IDataSender.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/IDataSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/IDataSender.java Sat Feb 25 04:11:35 2006
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
-import org.apache.catalina.cluster.io.*;
+import org.apache.catalina.groups.io.*;
 
 /**
  * @author Peter Rossbach

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/IDataSenderFactory.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/IDataSenderFactory.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/IDataSenderFactory.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/IDataSenderFactory.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,7 +23,7 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.apache.catalina.cluster.Member;
+import org.apache.catalina.groups.Member;
 import org.apache.catalina.util.StringManager;
 
 /**

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/PooledSocketSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/PooledSocketSender.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/PooledSocketSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/PooledSocketSender.java Sat Feb 25 04:11:35 2006
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.LinkedList;
-import org.apache.catalina.cluster.io.*;
+import org.apache.catalina.groups.io.*;
 
 /**
  * Send cluster messages with a pool of sockets (25).
@@ -34,7 +34,7 @@
 public class PooledSocketSender extends DataSender {
 
     private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory
-            .getLog(org.apache.catalina.cluster.tcp.PooledSocketSender.class);
+            .getLog(org.apache.catalina.groups.tcp.PooledSocketSender.class);
 
     /**
      * The descriptive information about this implementation.

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ReplicationListener.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ReplicationListener.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ReplicationListener.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ReplicationListener.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -26,13 +26,13 @@
 import java.nio.channels.SocketChannel;
 import java.util.Iterator;
 
-import org.apache.catalina.cluster.ChannelMessage;
-import org.apache.catalina.cluster.ChannelReceiver;
-import org.apache.catalina.cluster.MessageListener;
-import org.apache.catalina.cluster.io.ClusterData;
-import org.apache.catalina.cluster.io.ListenCallback;
-import org.apache.catalina.cluster.io.ObjectReader;
-import org.apache.catalina.cluster.io.XByteBuffer;
+import org.apache.catalina.groups.ChannelMessage;
+import org.apache.catalina.groups.ChannelReceiver;
+import org.apache.catalina.groups.MessageListener;
+import org.apache.catalina.groups.io.ClusterData;
+import org.apache.catalina.groups.io.ListenCallback;
+import org.apache.catalina.groups.io.ObjectReader;
+import org.apache.catalina.groups.io.XByteBuffer;
 import org.apache.catalina.util.StringManager;
 import java.io.Serializable;
 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ReplicationTransmitter.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ReplicationTransmitter.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ReplicationTransmitter.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ReplicationTransmitter.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,15 +28,15 @@
 import javax.management.ObjectName;
 
 import org.apache.catalina.Container;
-import org.apache.catalina.cluster.ChannelMessage;
-import org.apache.catalina.cluster.ChannelSender;
-import org.apache.catalina.cluster.Member;
-import org.apache.catalina.cluster.util.IDynamicProperty;
+import org.apache.catalina.groups.ChannelMessage;
+import org.apache.catalina.groups.ChannelSender;
+import org.apache.catalina.groups.Member;
+import org.apache.catalina.groups.util.IDynamicProperty;
 import org.apache.catalina.core.StandardHost;
 import org.apache.catalina.util.StringManager;
 import org.apache.tomcat.util.IntrospectionUtils;
-import org.apache.catalina.cluster.io.XByteBuffer;
-import org.apache.catalina.cluster.io.*;
+import org.apache.catalina.groups.io.XByteBuffer;
+import org.apache.catalina.groups.io.*;
 
 /**
  * Transmit message to other cluster members

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/SenderState.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/SenderState.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/SenderState.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/SenderState.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 
 /**

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/SocketSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/SocketSender.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/SocketSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/SocketSender.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 import java.net.InetAddress;
 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/TcpReplicationThread.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/TcpReplicationThread.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/TcpReplicationThread.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/TcpReplicationThread.java Sat Feb 25 04:11:35 2006
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 
-import org.apache.catalina.cluster.io.ObjectReader;
+import org.apache.catalina.groups.io.ObjectReader;
 
 /**
  * A worker thread class which can drain channels and echo-back the input. Each

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ThreadPool.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ThreadPool.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ThreadPool.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/ThreadPool.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 import java.util.List;
 import java.util.LinkedList;
 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/WorkerThread.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/WorkerThread.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/WorkerThread.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/tcp/WorkerThread.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.tcp;
+package org.apache.catalina.groups.tcp;
 
 
 /**

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/FastQueue.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/FastQueue.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/FastQueue.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/FastQueue.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.util;
+package org.apache.catalina.groups.util;
 
 /**
  * A fast queue that remover thread lock the adder thread. <br/>Limit the queue

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/IDynamicProperty.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/IDynamicProperty.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/IDynamicProperty.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/IDynamicProperty.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.util;
+package org.apache.catalina.groups.util;
 
 import java.util.Iterator;
 

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/IQueue.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/IQueue.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/IQueue.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/IQueue.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.util;
+package org.apache.catalina.groups.util;
 
 /**
  * A queue interface<BR>

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/LinkObject.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/LinkObject.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/LinkObject.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/LinkObject.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.util;
+package org.apache.catalina.groups.util;
 
 /**
  * The class <b>LinkObject</b> implements an element

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/SingleRemoveSynchronizedAddLock.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/SingleRemoveSynchronizedAddLock.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/SingleRemoveSynchronizedAddLock.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/SingleRemoveSynchronizedAddLock.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.util;
+package org.apache.catalina.groups.util;
 
 /**
  * The class <b>SingleRemoveSynchronizedAddLock</b> implement locking for accessing the queue

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/SmartQueue.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/SmartQueue.java?rev=380925&r1=380924&r2=380925&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/SmartQueue.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/groups/util/SmartQueue.java Sat Feb 25 04:11:35 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.catalina.cluster.util;
+package org.apache.catalina.groups.util;
 
 /**
  * A smart queue, used for async replication <BR>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message