You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2006/03/28 23:23:12 UTC
svn commit: r389605 - in /tomcat/container/tc5.5.x/modules: groupcom/etc/
groupcom/src/share/org/apache/catalina/tribes/group/
groupcom/src/share/org/apache/catalina/tribes/group/interceptors/
groupcom/src/share/org/apache/catalina/tribes/io/ groupcom/...
Author: fhanik
Date: Tue Mar 28 13:23:07 2006
New Revision: 389605
URL: http://svn.apache.org/viewcvs?rev=389605&view=rev
Log:
Refactored mcast into membership, since membership can be all kinds of protocols
Refactored tcp into transport, since transport can be all kinds of protocols
Structure makes more sense now
Added:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/
- copied from r389161, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java
- copied, changed from r389574, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastService.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java
- copied, changed from r389588, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/MemberImpl.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/
- copied from r389604, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/
Removed:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/
Modified:
tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ClusterData.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ListenCallback.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ObjectReader.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Constants.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastMembership.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/Response.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/RpcCallback.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/RpcChannel.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/Streamable.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/Constants.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/DataSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/MultiPointSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/PooledSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/SenderState.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ThreadPool.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/WorkerThread.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/LinkObject.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/demos/ChannelCreator.java
tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/test/AckProtocol.java
tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/test/TestNioSender.java
tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml
Modified: tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml Tue Mar 28 13:23:07 2006
@@ -288,14 +288,14 @@
<Channel className="org.apache.catalina.tribes.group.GroupChannel">
<Membership
- className="org.apache.catalina.tribes.mcast.McastService"
+ className="org.apache.catalina.tribes.membership.McastService"
mcastAddr="228.0.0.4"
mcastPort="45564"
mcastFrequency="500"
mcastDropTime="3000"/>
<Receiver
- className="org.apache.catalina.tribes.tcp.nio.NioReceiver"
+ className="org.apache.catalina.tribes.transport.nio.NioReceiver"
tcpListenAddress="auto"
tcpListenPort="4001"
minThreads="6"
@@ -305,8 +305,8 @@
autoBind="10"/>
<Sender
- className="org.apache.catalina.tribes.tcp.ReplicationTransmitter">
- <Transport className="org.apache.catalina.tribes.tcp.nio.PooledParallelSender"
+ className="org.apache.catalina.tribes.transport.ReplicationTransmitter">
+ <Transport className="org.apache.catalina.tribes.transport.nio.PooledParallelSender"
rxBufSize="43800"
txBufSize="25188"/>
</Sender>
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java Tue Mar 28 13:23:07 2006
@@ -23,10 +23,10 @@
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipService;
import org.apache.catalina.tribes.MessageListener;
-import org.apache.catalina.tribes.tcp.SenderState;
-import org.apache.catalina.tribes.tcp.ReplicationTransmitter;
-import org.apache.catalina.tribes.mcast.McastService;
-import org.apache.catalina.tribes.tcp.nio.NioReceiver;
+import org.apache.catalina.tribes.transport.SenderState;
+import org.apache.catalina.tribes.transport.ReplicationTransmitter;
+import org.apache.catalina.tribes.membership.McastService;
+import org.apache.catalina.tribes.transport.nio.NioReceiver;
/**
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java Tue Mar 28 13:23:07 2006
@@ -27,7 +27,7 @@
import java.util.Collection;
import java.util.ArrayList;
import java.util.Set;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
/**
*
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java Tue Mar 28 13:23:07 2006
@@ -27,7 +27,7 @@
import java.util.zip.GZIPOutputStream;
import java.util.Arrays;
import org.apache.catalina.tribes.ChannelException;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java Tue Mar 28 13:23:07 2006
@@ -23,8 +23,8 @@
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
import org.apache.catalina.tribes.group.InterceptorPayload;
-import org.apache.catalina.tribes.tcp.bio.util.FastQueue;
-import org.apache.catalina.tribes.tcp.bio.util.LinkObject;
+import org.apache.catalina.tribes.transport.bio.util.FastQueue;
+import org.apache.catalina.tribes.transport.bio.util.LinkObject;
/**
*
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ClusterData.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ClusterData.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ClusterData.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ClusterData.java Tue Mar 28 13:23:07 2006
@@ -19,7 +19,7 @@
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.Member;
-import org.apache.catalina.tribes.mcast.MemberImpl;
+import org.apache.catalina.tribes.membership.MemberImpl;
import org.apache.catalina.tribes.util.UUIDGenerator;
import org.apache.catalina.tribes.Channel;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java Tue Mar 28 13:23:07 2006
@@ -18,7 +18,7 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
/**
* Byte array output stream that exposes the byte array directly
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ListenCallback.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ListenCallback.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ListenCallback.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ListenCallback.java Tue Mar 28 13:23:07 2006
@@ -17,7 +17,7 @@
package org.apache.catalina.tribes.io;
import org.apache.catalina.tribes.ChannelMessage;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ObjectReader.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ObjectReader.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ObjectReader.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ObjectReader.java Tue Mar 28 13:23:07 2006
@@ -89,7 +89,7 @@
* Send buffer to cluster listener (callback).
* Is message complete receiver send message to callback?
*
- * @see org.apache.catalina.tribes.tcp.ClusterReceiverBase#messageDataReceived(ChannelMessage)
+ * @see org.apache.catalina.tribes.transport.ClusterReceiverBase#messageDataReceived(ChannelMessage)
* @see XByteBuffer#doesPackageExist()
* @see XByteBuffer#extractPackage(boolean)
*
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Constants.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Constants.java?rev=389605&r1=389161&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Constants.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Constants.java Tue Mar 28 13:23:07 2006
@@ -15,12 +15,11 @@
*/
-package org.apache.catalina.tribes.mcast;
+package org.apache.catalina.tribes.membership;
-import org.apache.catalina.tribes.tcp.*;
/**
- * Manifest constants for the <code>org.apache.catalina.tribes.mcast</code>
+ * Manifest constants for the <code>org.apache.catalina.tribes.membership</code>
* package.
*
* @author Peter Rossbach
@@ -29,6 +28,6 @@
public class Constants {
- public static final String Package = "org.apache.catalina.tribes.mcast";
+ public static final String Package = "org.apache.catalina.tribes.membership";
}
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastMembership.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastMembership.java?rev=389605&r1=389161&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastMembership.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastMembership.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.mcast;
+package org.apache.catalina.tribes.membership;
import java.util.HashMap;
@@ -23,7 +23,7 @@
import java.util.Arrays;
import java.util.Iterator;
import org.apache.catalina.tribes.Member;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
/**
* A <b>membership</b> implementation using simple multicast.
Copied: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java (from r389574, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastService.java)
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastService.java&r1=389574&r2=389605&rev=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/McastService.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.mcast;
+package org.apache.catalina.tribes.membership;
import java.util.Properties;
import javax.management.ObjectName;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=389605&r1=389161&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.mcast;
+package org.apache.catalina.tribes.membership;
import java.net.MulticastSocket;
@@ -22,7 +22,7 @@
import java.net.InetAddress ;
import java.net.DatagramPacket;
import org.apache.catalina.tribes.MembershipListener;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
/**
* A <b>membership</b> implementation using simple multicast.
Copied: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java (from r389588, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/MemberImpl.java)
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/MemberImpl.java&r1=389588&r2=389605&rev=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/mcast/MemberImpl.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.mcast;
+package org.apache.catalina.tribes.membership;
import java.io.IOException;
import java.io.ObjectInput;
@@ -23,7 +23,7 @@
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.io.XByteBuffer;
-import org.apache.catalina.tribes.tcp.SenderState;
+import org.apache.catalina.tribes.transport.SenderState;
/**
* A <b>membership</b> implementation using simple multicast.
@@ -311,7 +311,7 @@
* String representation of this object
*/
public String toString() {
- StringBuffer buf = new StringBuffer("org.apache.catalina.tribes.mcast.MemberImpl[");
+ StringBuffer buf = new StringBuffer("org.apache.catalina.tribes.membership.MemberImpl[");
buf.append(getName()).append(",");
buf.append(getDomain()).append(",");
buf.append(getHostname()).append(",");
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Tue Mar 28 13:23:07 2006
@@ -34,7 +34,7 @@
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
import org.apache.catalina.tribes.io.XByteBuffer;
-import org.apache.catalina.tribes.mcast.MemberImpl;
+import org.apache.catalina.tribes.membership.MemberImpl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/Response.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/Response.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/Response.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/Response.java Tue Mar 28 13:23:07 2006
@@ -18,7 +18,7 @@
import java.io.Serializable;
import org.apache.catalina.tribes.Member;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
/**
* A response object holds a message from a responding partner.
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/RpcCallback.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/RpcCallback.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/RpcCallback.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/RpcCallback.java Tue Mar 28 13:23:07 2006
@@ -17,7 +17,7 @@
import java.io.Serializable;
import org.apache.catalina.tribes.Member;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
/**
* The RpcCallback interface is an interface for the Tribes channel to request a
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/RpcChannel.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/RpcChannel.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/RpcChannel.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/RpcChannel.java Tue Mar 28 13:23:07 2006
@@ -29,7 +29,7 @@
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.util.UUIDGenerator;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
/**
* A channel to handle RPC messaging
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/Streamable.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/Streamable.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/Streamable.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/Streamable.java Tue Mar 28 13:23:07 2006
@@ -16,7 +16,7 @@
package org.apache.catalina.tribes.tipis;
import java.io.IOException;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
/**
* Example usage:
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.transport;
import java.io.IOException;
import java.net.InetAddress;
@@ -70,14 +70,14 @@
* connect
*
* @throws IOException
- * @todo Implement this org.apache.catalina.tribes.tcp.DataSender method
+ * @todo Implement this org.apache.catalina.tribes.transport.DataSender method
*/
public abstract void connect() throws IOException;
/**
* disconnect
*
- * @todo Implement this org.apache.catalina.tribes.tcp.DataSender method
+ * @todo Implement this org.apache.catalina.tribes.transport.DataSender method
*/
public abstract void disconnect();
@@ -85,7 +85,7 @@
* keepalive
*
* @return boolean
- * @todo Implement this org.apache.catalina.tribes.tcp.DataSender method
+ * @todo Implement this org.apache.catalina.tribes.transport.DataSender method
*/
public boolean keepalive() {
boolean disconnect = false;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/Constants.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/Constants.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/Constants.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/Constants.java Tue Mar 28 13:23:07 2006
@@ -15,12 +15,12 @@
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.transport;
import org.apache.catalina.tribes.io.XByteBuffer;
/**
- * Manifest constants for the <code>org.apache.catalina.tribes.tcp</code>
+ * Manifest constants for the <code>org.apache.catalina.tribes.transport</code>
* package.
*
* @author Peter Rossbach
@@ -29,7 +29,7 @@
public class Constants {
- public static final String Package = "org.apache.catalina.tribes.tcp";
+ public static final String Package = "org.apache.catalina.tribes.transport";
public static final byte[] ACK_DATA = new byte[] {6, 2, 3};
public static final byte[] ACK_COMMAND = XByteBuffer.createDataPackage(ACK_DATA);
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/DataSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/DataSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/DataSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/DataSender.java Tue Mar 28 13:23:07 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.transport;
import java.io.IOException;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/MultiPointSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/MultiPointSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/MultiPointSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/MultiPointSender.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.transport;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.Member;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/PooledSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/PooledSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/PooledSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/PooledSender.java Tue Mar 28 13:23:07 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.transport;
import java.io.IOException;
import java.util.List;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReceiverBase.java Tue Mar 28 13:23:07 2006
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.transport;
import java.io.IOException;
import java.net.InetAddress;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java Tue Mar 28 13:23:07 2006
@@ -14,14 +14,14 @@
* the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.transport;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.ChannelSender;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.util.StringManager;
-import org.apache.catalina.tribes.tcp.nio.PooledParallelSender;
+import org.apache.catalina.tribes.transport.nio.PooledParallelSender;
/**
* Transmit message to other cluster members
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/SenderState.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/SenderState.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/SenderState.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/SenderState.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.transport;
import org.apache.catalina.tribes.Member;
import java.util.HashMap;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ThreadPool.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ThreadPool.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ThreadPool.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ThreadPool.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.transport;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/WorkerThread.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/WorkerThread.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/WorkerThread.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/WorkerThread.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp;
+package org.apache.catalina.tribes.transport;
import org.apache.catalina.tribes.io.ListenCallback;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReceiver.java Tue Mar 28 13:23:07 2006
@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.catalina.tribes.tcp.bio;
+package org.apache.catalina.tribes.transport.bio;
import java.io.IOException;
import java.net.ServerSocket;
@@ -22,9 +22,9 @@
import org.apache.catalina.tribes.ChannelReceiver;
import org.apache.catalina.tribes.io.ListenCallback;
import org.apache.catalina.tribes.io.ObjectReader;
-import org.apache.catalina.tribes.tcp.ReceiverBase;
-import org.apache.catalina.tribes.tcp.ThreadPool;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.ReceiverBase;
+import org.apache.catalina.tribes.transport.ThreadPool;
+import org.apache.catalina.tribes.transport.*;
/**
* <p>Title: </p>
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java Tue Mar 28 13:23:07 2006
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp.bio;
+package org.apache.catalina.tribes.transport.bio;
import java.io.IOException;
import org.apache.catalina.tribes.io.ObjectReader;
-import org.apache.catalina.tribes.tcp.Constants;
-import org.apache.catalina.tribes.tcp.WorkerThread;
+import org.apache.catalina.tribes.transport.Constants;
+import org.apache.catalina.tribes.transport.WorkerThread;
import java.net.Socket;
import java.io.InputStream;
-import org.apache.catalina.tribes.tcp.ReceiverBase;
+import org.apache.catalina.tribes.transport.ReceiverBase;
import java.io.OutputStream;
import org.apache.catalina.tribes.io.ListenCallback;
import org.apache.catalina.tribes.ChannelMessage;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* the License.
*/
-package org.apache.catalina.tribes.tcp.bio;
+package org.apache.catalina.tribes.transport.bio;
import java.io.IOException;
import java.io.InputStream;
@@ -27,11 +27,11 @@
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.io.XByteBuffer;
-import org.apache.catalina.tribes.tcp.Constants;
-import org.apache.catalina.tribes.tcp.DataSender;
-import org.apache.catalina.tribes.tcp.SenderState;
+import org.apache.catalina.tribes.transport.Constants;
+import org.apache.catalina.tribes.transport.DataSender;
+import org.apache.catalina.tribes.transport.SenderState;
import org.apache.catalina.util.StringManager;
-import org.apache.catalina.tribes.tcp.AbstractSender;
+import org.apache.catalina.tribes.transport.AbstractSender;
/**
* Send cluster messages with only one socket. Ack and keep Alive Handling is
@@ -96,7 +96,7 @@
/**
* Connect other cluster member receiver
- * @see org.apache.catalina.tribes.tcp.IDataSender#connect()
+ * @see org.apache.catalina.tribes.transport.IDataSender#connect()
*/
public void connect() throws IOException {
openSocket();
@@ -121,7 +121,7 @@
/**
* Send message
*
- * @see org.apache.catalina.tribes.tcp.IDataSender#sendMessage(,
+ * @see org.apache.catalina.tribes.transport.IDataSender#sendMessage(,
* ChannelMessage)
*/
public void sendMessage(byte[] data, boolean waitForAck) throws IOException {
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java Tue Mar 28 13:23:07 2006
@@ -1,4 +1,4 @@
-package org.apache.catalina.tribes.tcp.bio;
+package org.apache.catalina.tribes.transport.bio;
import java.io.IOException;
import java.util.HashMap;
@@ -9,8 +9,8 @@
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.io.ClusterData;
import org.apache.catalina.tribes.io.XByteBuffer;
-import org.apache.catalina.tribes.tcp.MultiPointSender;
-import org.apache.catalina.tribes.tcp.AbstractSender;
+import org.apache.catalina.tribes.transport.MultiPointSender;
+import org.apache.catalina.tribes.transport.AbstractSender;
import org.apache.catalina.tribes.Channel;
/**
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java Tue Mar 28 13:23:07 2006
@@ -1,10 +1,10 @@
-package org.apache.catalina.tribes.tcp.bio;
+package org.apache.catalina.tribes.transport.bio;
-import org.apache.catalina.tribes.tcp.DataSender;
-import org.apache.catalina.tribes.tcp.PooledSender;
+import org.apache.catalina.tribes.transport.DataSender;
+import org.apache.catalina.tribes.transport.PooledSender;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.ChannelException;
-import org.apache.catalina.tribes.tcp.MultiPointSender;
+import org.apache.catalina.tribes.transport.MultiPointSender;
import org.apache.catalina.tribes.ChannelMessage;
/**
@@ -46,7 +46,7 @@
* getNewDataSender
*
* @return DataSender
- * @todo Implement this org.apache.catalina.tribes.tcp.PooledSender
+ * @todo Implement this org.apache.catalina.tribes.transport.PooledSender
* method
*/
public DataSender getNewDataSender() {
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/FastQueue.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/FastQueue.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp.bio.util;
+package org.apache.catalina.tribes.transport.bio.util;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.ErrorHandler;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/LinkObject.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/LinkObject.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/LinkObject.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/LinkObject.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp.bio.util;
+package org.apache.catalina.tribes.transport.bio.util;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.ErrorHandler;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp.bio.util;
+package org.apache.catalina.tribes.transport.bio.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/tribes/transport/nio/NioReceiver.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp.nio;
+package org.apache.catalina.tribes.transport.nio;
import java.io.IOException;
import java.net.ServerSocket;
@@ -28,10 +28,10 @@
import org.apache.catalina.tribes.ChannelReceiver;
import org.apache.catalina.tribes.io.ListenCallback;
import org.apache.catalina.tribes.io.ObjectReader;
-import org.apache.catalina.tribes.tcp.Constants;
-import org.apache.catalina.tribes.tcp.ReceiverBase;
-import org.apache.catalina.tribes.tcp.ThreadPool;
-import org.apache.catalina.tribes.tcp.WorkerThread;
+import org.apache.catalina.tribes.transport.Constants;
+import org.apache.catalina.tribes.transport.ReceiverBase;
+import org.apache.catalina.tribes.transport.ThreadPool;
+import org.apache.catalina.tribes.transport.WorkerThread;
import org.apache.catalina.util.StringManager;
/**
@@ -206,7 +206,7 @@
/**
* Close Selector.
*
- * @see org.apache.catalina.tribes.tcp.ClusterReceiverBase#stopListening()
+ * @see org.apache.catalina.tribes.transport.ClusterReceiverBase#stopListening()
*/
protected void stopListening() {
// Bugzilla 37529: http://issues.apache.org/bugzilla/show_bug.cgi?id=37529
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java Tue Mar 28 13:23:07 2006
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp.nio;
+package org.apache.catalina.tribes.transport.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
import org.apache.catalina.tribes.io.ObjectReader;
-import org.apache.catalina.tribes.tcp.Constants;
-import org.apache.catalina.tribes.tcp.WorkerThread;
+import org.apache.catalina.tribes.transport.Constants;
+import org.apache.catalina.tribes.transport.WorkerThread;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.io.ListenCallback;
import org.apache.catalina.tribes.io.ClusterData;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioSender.java Tue Mar 28 13:23:07 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp.nio;
+package org.apache.catalina.tribes.transport.nio;
import java.io.IOException;
import java.net.InetAddress;
@@ -28,8 +28,8 @@
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.io.XByteBuffer;
-import org.apache.catalina.tribes.tcp.DataSender;
-import org.apache.catalina.tribes.tcp.AbstractSender;
+import org.apache.catalina.tribes.transport.DataSender;
+import org.apache.catalina.tribes.transport.AbstractSender;
import java.net.UnknownHostException;
/**
@@ -153,7 +153,7 @@
ackbuf.append(readbuf,read);
readbuf.clear();
if (ackbuf.doesPackageExist() ) {
- boolean result = Arrays.equals(ackbuf.extractDataPackage(true),org.apache.catalina.tribes.tcp.Constants.ACK_DATA);
+ boolean result = Arrays.equals(ackbuf.extractDataPackage(true),org.apache.catalina.tribes.transport.Constants.ACK_DATA);
return result;
} else {
return false;
@@ -190,7 +190,7 @@
* connect - blocking in this operation
*
* @throws IOException
- * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+ * @todo Implement this org.apache.catalina.tribes.transport.IDataSender method
*/
public synchronized void connect() throws IOException {
if ( connecting ) return;
@@ -219,7 +219,7 @@
/**
* disconnect
*
- * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+ * @todo Implement this org.apache.catalina.tribes.transport.IDataSender method
*/
public void disconnect() {
try {
@@ -278,7 +278,7 @@
*
* @param data ChannelMessage
* @throws IOException
- * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+ * @todo Implement this org.apache.catalina.tribes.transport.IDataSender method
*/
public synchronized void setMessage(byte[] data) throws IOException {
setMessage(data,0,data.length);
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java Tue Mar 28 13:23:07 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp.nio;
+package org.apache.catalina.tribes.transport.nio;
import java.io.IOException;
@@ -28,9 +28,9 @@
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.io.ClusterData;
import org.apache.catalina.tribes.io.XByteBuffer;
-import org.apache.catalina.tribes.tcp.MultiPointSender;
-import org.apache.catalina.tribes.tcp.SenderState;
-import org.apache.catalina.tribes.tcp.AbstractSender;
+import org.apache.catalina.tribes.transport.MultiPointSender;
+import org.apache.catalina.tribes.transport.SenderState;
+import org.apache.catalina.tribes.transport.AbstractSender;
import java.net.UnknownHostException;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.tipis.RpcChannel;
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java Tue Mar 28 13:23:07 2006
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.tcp.nio;
+package org.apache.catalina.tribes.transport.nio;
import java.io.IOException;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.Member;
-import org.apache.catalina.tribes.tcp.DataSender;
-import org.apache.catalina.tribes.tcp.MultiPointSender;
-import org.apache.catalina.tribes.tcp.PooledSender;
+import org.apache.catalina.tribes.transport.DataSender;
+import org.apache.catalina.tribes.transport.MultiPointSender;
+import org.apache.catalina.tribes.transport.PooledSender;
/**
* <p>Title: </p>
Modified: tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/demos/ChannelCreator.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/demos/ChannelCreator.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/demos/ChannelCreator.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/demos/ChannelCreator.java Tue Mar 28 13:23:07 2006
@@ -24,12 +24,12 @@
import org.apache.catalina.tribes.group.interceptors.FragmentationInterceptor;
import org.apache.catalina.tribes.group.interceptors.GzipInterceptor;
import org.apache.catalina.tribes.group.interceptors.OrderInterceptor;
-import org.apache.catalina.tribes.mcast.McastService;
-import org.apache.catalina.tribes.tcp.MultiPointSender;
-import org.apache.catalina.tribes.tcp.ReceiverBase;
-import org.apache.catalina.tribes.tcp.ReplicationTransmitter;
+import org.apache.catalina.tribes.membership.McastService;
+import org.apache.catalina.tribes.transport.MultiPointSender;
+import org.apache.catalina.tribes.transport.ReceiverBase;
+import org.apache.catalina.tribes.transport.ReplicationTransmitter;
import org.apache.tomcat.util.IntrospectionUtils;
-import org.apache.catalina.tribes.tcp.*;
+import org.apache.catalina.tribes.transport.*;
import org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor;
/**
@@ -53,8 +53,8 @@
.append("\n\t\t[-port tcplistenport]")
.append("\n\t\t[-autobind tcpbindtryrange]")
.append("\n\t\t[-ackto acktimeout]")
- .append("\n\t\t[-receiver org.apache.catalina.tribes.tcp.nio.NioReceiver|org.apache.catalina.tribes.tcp.bio.BioReceiver|]")
- .append("\n\t\t[-transport org.apache.catalina.tribes.tcp.nio.PooledParallelSender|org.apache.catalina.tribes.tcp.bio.PooledMultiSender]")
+ .append("\n\t\t[-receiver org.apache.catalina.tribes.transport.nio.NioReceiver|org.apache.catalina.tribes.transport.bio.BioReceiver|]")
+ .append("\n\t\t[-transport org.apache.catalina.tribes.transport.nio.PooledParallelSender|org.apache.catalina.tribes.transport.bio.PooledMultiSender]")
.append("\n\t\t[-transport.xxx transport specific property]")
.append("\n\t\t[-maddr multicastaddr]")
.append("\n\t\t[-mport multicastport]")
@@ -90,8 +90,8 @@
int fragsize = 1024;
int autoBind = 10;
Properties transportProperties = new Properties();
- String transport = "org.apache.catalina.tribes.tcp.nio.PooledParallelSender";
- String receiver = "org.apache.catalina.tribes.tcp.nio.NioReceiver";
+ String transport = "org.apache.catalina.tribes.transport.nio.PooledParallelSender";
+ String receiver = "org.apache.catalina.tribes.transport.nio.NioReceiver";
boolean async = false;
int asyncsize = 1024*1024*50; //50MB
Modified: tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/test/AckProtocol.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/test/AckProtocol.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/test/AckProtocol.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/test/AckProtocol.java Tue Mar 28 13:23:07 2006
@@ -6,7 +6,7 @@
public byte[] processInput(XByteBuffer buf, int counter) throws Exception {
ClusterData data = buf.extractPackage(true);
System.out.println("Received:\n\tThread:"+Thread.currentThread().getName()+"\n\tCount:"+counter+"\n\tData:"+new String(data.getMessage().getBytes()));
- return org.apache.catalina.tribes.tcp.Constants.ACK_COMMAND;
+ return org.apache.catalina.tribes.transport.Constants.ACK_COMMAND;
}
}
Modified: tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/test/TestNioSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/test/TestNioSender.java?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/test/TestNioSender.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/test/TestNioSender.java Tue Mar 28 13:23:07 2006
@@ -4,8 +4,8 @@
import java.nio.channels.SelectionKey;
import java.util.Iterator;
import java.nio.channels.Selector;
-import org.apache.catalina.tribes.tcp.nio.NioSender;
-import org.apache.catalina.tribes.mcast.MemberImpl;
+import org.apache.catalina.tribes.transport.nio.NioSender;
+import org.apache.catalina.tribes.membership.MemberImpl;
import org.apache.catalina.tribes.io.ClusterData;
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.Member;
Modified: tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml?rev=389605&r1=389604&r2=389605&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml (original)
+++ tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml Tue Mar 28 13:23:07 2006
@@ -288,14 +288,14 @@
<Channel className="org.apache.catalina.tribes.group.GroupChannel">
<Membership
- className="org.apache.catalina.tribes.mcast.McastService"
+ className="org.apache.catalina.tribes.membership.McastService"
mcastAddr="228.0.0.4"
mcastPort="45564"
mcastFrequency="500"
mcastDropTime="3000"/>
<Receiver
- className="org.apache.catalina.tribes.tcp.nio.NioReceiver"
+ className="org.apache.catalina.tribes.transport.nio.NioReceiver"
tcpListenAddress="auto"
tcpListenPort="4001"
minThreads="6"
@@ -305,8 +305,8 @@
autoBind="10"/>
<Sender
- className="org.apache.catalina.tribes.tcp.ReplicationTransmitter">
- <Transport className="org.apache.catalina.tribes.tcp.nio.PooledParallelSender"
+ className="org.apache.catalina.tribes.transport.ReplicationTransmitter">
+ <Transport className="org.apache.catalina.tribes.transport.nio.PooledParallelSender"
rxBufSize="43800"
txBufSize="25188"/>
</Sender>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org