Author: fhanik Date: Mon Mar 13 13:54:46 2006 New Revision: 385667 URL: http://svn.apache.org/viewcvs?rev=385667&view=rev Log: The blocking multipoint sender is working
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/tcp/bio/MultipointBioSender.java tomcat/container/tc5.5.x/modules/groupcom/test/org/apache/catalina/tribes/demos/ChannelCreator.java 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=385667&r1=385666&r2=385667&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 Mon Mar 13 13:54:46 2006 @@ -294,7 +294,7 @@ mcastDropTime="3000"/> <Receiver - className="org.apache.catalina.tribes.tcp.ReplicationListener" + className="org.apache.catalina.tribes.tcp.nio.NioReceiver" tcpListenAddress="auto" tcpListenPort="4001" tcpSelectorTimeout="100" @@ -316,7 +316,7 @@ autoConnect="true" poolSize="25"/> <!-- - <transport className="org.apache.catalina.tribes.tcp.bio.PooledBioSender" + <transport className="org.apache.catalina.tribes.tcp.bio.MultipointBioSender" maxRetryAttempts="2" timeout="15000" waitForAck="true" Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultipointBioSender.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultipointBioSender.java?rev=385667&r1=385666&r2=385667&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultipointBioSender.java (original) +++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultipointBioSender.java Mon Mar 13 13:54:46 2006 @@ -1,20 +1,17 @@ package org.apache.catalina.tribes.tcp.bio; +import java.net.InetAddress; +import java.util.HashMap; +import java.util.Map; + import org.apache.catalina.tribes.ChannelException; import org.apache.catalina.tribes.ChannelMessage; import org.apache.catalina.tribes.Member; -import org.apache.catalina.tribes.tcp.MultiPointSender; -import org.apache.catalina.tribes.io.XByteBuffer; -import java.nio.channels.Selector; -import java.io.IOException; -import java.nio.channels.SelectionKey; -import java.util.Map; -import java.util.HashMap; -import org.apache.catalina.tribes.tcp.nio.NioSender; -import java.util.Iterator; import org.apache.catalina.tribes.io.ClusterData; -import java.net.InetAddress; +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.nio.NioSender; /** * <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=385667&r1=385666&r2=385667&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 Mon Mar 13 13:54:46 2006 @@ -15,20 +15,20 @@ */ package org.apache.catalina.tribes.demos; +import java.util.Iterator; +import java.util.Properties; + import org.apache.catalina.tribes.Channel; -import org.apache.catalina.tribes.tcp.ReplicationListener; -import org.apache.catalina.tribes.tcp.ReplicationTransmitter; import org.apache.catalina.tribes.ManagedChannel; import org.apache.catalina.tribes.group.GroupChannel; -import org.apache.catalina.tribes.mcast.McastService; +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.group.interceptors.FragmentationInterceptor; -import java.util.Properties; -import java.util.Iterator; +import org.apache.catalina.tribes.mcast.McastService; import org.apache.catalina.tribes.tcp.MultiPointSender; +import org.apache.catalina.tribes.tcp.ReplicationTransmitter; +import org.apache.catalina.tribes.tcp.nio.NioReceiver; import org.apache.tomcat.util.IntrospectionUtils; -import org.apache.catalina.tribes.tcp.nio.PooledParallelSender; /** * <p>Title: </p> @@ -139,7 +139,7 @@ } } - ReplicationListener rl = new ReplicationListener(); + NioReceiver rl = new NioReceiver(); rl.setTcpListenAddress(bind); rl.setTcpListenPort(port); rl.setTcpSelectorTimeout(tcpseltimeout); @@ -150,6 +150,7 @@ ReplicationTransmitter ps = new ReplicationTransmitter(); + System.out.println("Creating transport class="+transport); MultiPointSender sender = (MultiPointSender)Class.forName(transport,true,ChannelCreator.class.getClassLoader()).newInstance(); sender.setTimeout(acktimeout); sender.setAutoConnect(autoconnect); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]