Author: fhanik Date: Mon Mar 13 11:19:56 2006 New Revision: 385624 URL: http://svn.apache.org/viewcvs?rev=385624&view=rev Log: Moved to the correct location
Added: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java - copied, changed from r385621, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ThreadPool.java - copied, changed from r385622, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/WorkerThread.java - copied, changed from r385622, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/WorkerThread.java Removed: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/WorkerThread.java Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml?rev=385624&r1=385623&r2=385624&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml Mon Mar 13 11:19:56 2006 @@ -87,7 +87,7 @@ </mbean> <mbean name="ClusterReceiverBase" - description="Tcp Cluster ReplicationListener implementation" + description="Tcp Cluster NioReceiver implementation" domain="Catalina" group="Cluster" type="org.apache.catalina.cluster.tcp.ClusterReceiverBase"> Copied: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java (from r385621, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java) URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java&r1=385621&r2=385624&rev=385624&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ReplicationListener.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java Mon Mar 13 11:19:56 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.catalina.tribes.tcp; +package org.apache.catalina.tribes.tcp.nio; import java.io.IOException; import java.net.InetSocketAddress; @@ -31,15 +31,14 @@ import org.apache.catalina.tribes.MessageListener; import org.apache.catalina.tribes.io.ListenCallback; import org.apache.catalina.tribes.io.ObjectReader; -import org.apache.catalina.tribes.tcp.nio.TcpReplicationThread; +import org.apache.catalina.tribes.tcp.Constants; import org.apache.catalina.util.StringManager; /** * @author Filip Hanik - * @author Peter Rossbach * @version $Revision: 379904 $ $Date: 2006-02-22 15:16:25 -0600 (Wed, 22 Feb 2006) $ */ -public class ReplicationListener implements Runnable, ChannelReceiver, ListenCallback { +public class NioReceiver implements Runnable, ChannelReceiver, ListenCallback { /** * @todo make this configurable */ @@ -49,7 +48,7 @@ */ protected int txBufSize = 25188; - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(ReplicationListener.class); + protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(NioReceiver.class); /** * The string manager for this package. @@ -59,7 +58,7 @@ /** * The descriptive information about this implementation. */ - private static final String info = "ReplicationListener/1.3"; + private static final String info = "NioReceiver/1.0"; private ThreadPool pool = null; private int tcpThreadCount; @@ -78,7 +77,7 @@ private MessageListener listener = null; private boolean sync; private boolean direct; - public ReplicationListener() { + public NioReceiver() { } /** @@ -136,7 +135,7 @@ } try { getBind(); - Thread t = new Thread(this, "ReplicationListener"); + Thread t = new Thread(this, "NioReceiver"); t.setDaemon(true); t.start(); } catch (Exception x) { @@ -225,7 +224,7 @@ log.warn( "Replication client disconnected, error when polling key. Ignoring client."); } catch (Exception x) { - log.error("Unable to process request in ReplicationListener", x); + log.error("Unable to process request in NioReceiver", x); } } Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java?rev=385624&r1=385623&r2=385624&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java Mon Mar 13 11:19:56 2006 @@ -21,6 +21,7 @@ import java.nio.channels.Selector; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import org.apache.catalina.tribes.ChannelException; import org.apache.catalina.tribes.ChannelMessage; @@ -28,7 +29,6 @@ import org.apache.catalina.tribes.io.ClusterData; import org.apache.catalina.tribes.io.XByteBuffer; import org.apache.catalina.tribes.tcp.MultiPointSender; -import java.util.Map; /** * <p>Title: </p> Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java?rev=385624&r1=385623&r2=385624&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/TcpReplicationThread.java Mon Mar 13 11:19:56 2006 @@ -21,7 +21,7 @@ import java.nio.channels.SocketChannel; import org.apache.catalina.tribes.io.ObjectReader; -import org.apache.catalina.tribes.tcp.*; +import org.apache.catalina.tribes.tcp.Constants; /** * A worker thread class which can drain channels and echo-back the input. Each Copied: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ThreadPool.java (from r385622, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java) URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ThreadPool.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ThreadPool.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java&r1=385622&r2=385624&rev=385624&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ThreadPool.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ThreadPool.java Mon Mar 13 11:19:56 2006 @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.apache.catalina.tribes.tcp; -import java.util.List; +package org.apache.catalina.tribes.tcp.nio; import java.util.LinkedList; +import java.util.List; /** * @author not attributable Copied: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/WorkerThread.java (from r385622, tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/WorkerThread.java) URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/WorkerThread.java?p2=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/WorkerThread.java&p1=tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/WorkerThread.java&r1=385622&r2=385624&rev=385624&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/WorkerThread.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/WorkerThread.java Mon Mar 13 11:19:56 2006 @@ -14,7 +14,10 @@ * limitations under the License. */ -package org.apache.catalina.tribes.tcp; +package org.apache.catalina.tribes.tcp.nio; + + + /** --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]