[jboss-remoting-commits] JBoss Remoting SVN: r5564 - in remoting3/trunk/samples/src: test/java/org/jboss/remoting3/samples/protocol/basic and 1 other directory.
Author: david.lloyd(a)jboss.com
Date: 2009-10-22 18:15:13 -0400 (Thu, 22 Oct 2009)
New Revision: 5564
Modified:
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/MultiplexServerExample.java
remoting3/trunk/samples/src/test/java/org/jboss/remoting3/samples/protocol/basic/BasicTestCase.java
Log:
XNIO options class moved
Modified:
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/MultiplexServerExample.java
===================================================================
---
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/MultiplexServerExample.java 2009-10-22
17:16:09 UTC (rev 5563)
+++
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/MultiplexServerExample.java 2009-10-22
22:15:13 UTC (rev 5564)
@@ -33,6 +33,7 @@
import org.jboss.xnio.CloseableExecutor;
import org.jboss.xnio.Xnio;
import org.jboss.xnio.TcpServer;
+import org.jboss.xnio.OptionMap;
import org.jboss.xnio.channels.Channels;
import java.io.IOException;
@@ -66,10 +67,10 @@
final SimpleCloseable handle = endpoint.registerService(config);
try {
// now create the server...
- final MultiplexConnectionProviderFactory
multiplexConnectionProviderFactory = new
MultiplexConnectionProviderFactory(xnio.createTcpConnector().create());
+ final MultiplexConnectionProviderFactory
multiplexConnectionProviderFactory = new
MultiplexConnectionProviderFactory(xnio.createTcpConnector(OptionMap.EMPTY));
final
ConnectionProviderRegistration<MultiplexServerFactory> cpHandle =
endpoint.addConnectionProvider("multiplex",
multiplexConnectionProviderFactory);
try {
- final TcpServer tcpServer =
xnio.createTcpServer(Channels.convertStreamToAllocatedMessage(cpHandle.getProviderInterface().getHandlerFactory(),
0x1000, 0x1000)).create();
+ final TcpServer tcpServer =
xnio.createTcpServer(Channels.createAllocatedMessageChannel(cpHandle.getProviderInterface().getServerListener(),
OptionMap.EMPTY)).create();
try {
// now just wait for 15 seconds, and then shut it all
down
Thread.sleep(15000L);
Modified:
remoting3/trunk/samples/src/test/java/org/jboss/remoting3/samples/protocol/basic/BasicTestCase.java
===================================================================
---
remoting3/trunk/samples/src/test/java/org/jboss/remoting3/samples/protocol/basic/BasicTestCase.java 2009-10-22
17:16:09 UTC (rev 5563)
+++
remoting3/trunk/samples/src/test/java/org/jboss/remoting3/samples/protocol/basic/BasicTestCase.java 2009-10-22
22:15:13 UTC (rev 5564)
@@ -25,7 +25,6 @@
import junit.framework.TestCase;
import org.jboss.xnio.Xnio;
import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.IoHandler;
import org.jboss.xnio.ChannelSource;
import org.jboss.xnio.IoFuture;
import org.jboss.xnio.nio.NioXnio;