[jboss-cvs] JBoss Messaging SVN: r4461 - in trunk: src/main/org/jboss/messaging/core/remoting and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 13 05:51:13 EDT 2008
Author: ataylor
Date: 2008-06-13 05:51:12 -0400 (Fri, 13 Jun 2008)
New Revision: 4461
Added:
trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/RemotingSession.java
Modified:
trunk/src/main/org/jboss/messaging/core/ping/impl/PingerImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java
trunk/src/main/org/jboss/messaging/core/remoting/RemotingService.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/ping/impl/PingerImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectorRegistryImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java
Log:
renamed NIOSession and NIOConnector
Modified: trunk/src/main/org/jboss/messaging/core/ping/impl/PingerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/ping/impl/PingerImpl.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/src/main/org/jboss/messaging/core/ping/impl/PingerImpl.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -28,7 +28,7 @@
private final PacketDispatcher dispatcher;
- private final NIOSession session;
+ private final RemotingSession session;
private final ResponseHandler pongHandler;
@@ -37,7 +37,7 @@
private CleanUpNotifier failureHandler;
- public PingerImpl(final PacketDispatcher dispatcher, final NIOSession session, final long pongTimeout,
+ public PingerImpl(final PacketDispatcher dispatcher, final RemotingSession session, final long pongTimeout,
final ResponseHandler pongHandler, final CleanUpNotifier failureHandler)
{
this.dispatcher = dispatcher;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -17,7 +17,7 @@
* <p/>
* When a {@link org.jboss.messaging.core.remoting.impl.RemotingServiceImpl} is started, it register its {@link Configuration}.
* <p/>
- * When a client is created, it gets its {@link NIOConnector} from the
+ * When a client is created, it gets its {@link RemotingConnector} from the
* ConnectorRegistry using the {@link Configuration} corresponding to the server
* it wants to connect to. If the ConnectionRegistry contains this Configuration, it
* implies that the Client is in the same VM than the server. In that case, we
@@ -42,7 +42,7 @@
*/
boolean unregister(Location location);
- NIOConnector getConnector(Location location, ConnectionParams connectionParams);
+ RemotingConnector getConnector(Location location, ConnectionParams connectionParams);
/**
* Decrement the number of references on the NIOConnector corresponding to
@@ -56,7 +56,7 @@
* <code>null</code>
* @throws IllegalStateException if no NIOConnector were created for the given Configuration
*/
- NIOConnector removeConnector(Location location);
+ RemotingConnector removeConnector(Location location);
int getRegisteredConfigurationSize();
Copied: trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnector.java (from rev 4459, trunk/src/main/org/jboss/messaging/core/remoting/NIOConnector.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnector.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnector.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting;
+
+import org.jboss.messaging.core.client.RemotingSessionListener;
+
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ */
+public interface RemotingConnector
+{
+ RemotingSession connect() throws IOException;
+
+ boolean disconnect();
+
+ void addSessionListener(RemotingSessionListener listener);
+
+ void removeSessionListener(RemotingSessionListener listener);
+
+ String getServerURI();
+
+ PacketDispatcher getDispatcher();
+}
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/core/remoting/RemotingService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/RemotingService.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/src/main/org/jboss/messaging/core/remoting/RemotingService.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -35,7 +35,7 @@
void removeRemotingSessionListener(RemotingSessionListener listener);
- void registerPinger(NIOSession session);
+ void registerPinger(RemotingSession session);
void unregisterPinger(Long id);
Copied: trunk/src/main/org/jboss/messaging/core/remoting/RemotingSession.java (from rev 4459, trunk/src/main/org/jboss/messaging/core/remoting/NIOSession.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/RemotingSession.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/RemotingSession.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting;
+
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ */
+public interface RemotingSession
+{
+ long getID();
+
+ void write(Packet packet) throws Exception;
+
+ boolean isConnected();
+}
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -10,8 +10,8 @@
import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.ConnectorRegistry;
-import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.RemotingConnector;
import org.jboss.messaging.core.remoting.TransportType;
import static org.jboss.messaging.core.remoting.TransportType.INVM;
import static org.jboss.messaging.core.remoting.TransportType.TCP;
@@ -81,7 +81,7 @@
return (dispatcher != null);
}
- public synchronized NIOConnector getConnector(Location location, ConnectionParams connectionParams)
+ public synchronized RemotingConnector getConnector(Location location, ConnectionParams connectionParams)
{
assert location != null;
String key = location.getLocation();
@@ -90,7 +90,7 @@
{
NIOConnectorHolder holder = connectors.get(key);
holder.increment();
- NIOConnector connector = holder.getConnector();
+ RemotingConnector connector = holder.getConnector();
if (log.isDebugEnabled())
log.debug("Reuse " + connector + " to connect to "
@@ -116,7 +116,7 @@
// return connector;
// }
- NIOConnector connector = null;
+ RemotingConnector connector = null;
TransportType transport = location.getTransport();
@@ -157,7 +157,7 @@
* <code>null</code>
* @throws IllegalStateException if no NIOConnector were created for the given Configuration
*/
- public synchronized NIOConnector removeConnector(Location location)
+ public synchronized RemotingConnector removeConnector(Location location)
{
assert location != null;
String key = location.getLocation();
@@ -222,10 +222,10 @@
static class NIOConnectorHolder
{
- private final NIOConnector connector;
+ private final RemotingConnector connector;
private int count;
- public NIOConnectorHolder(NIOConnector connector)
+ public NIOConnectorHolder(RemotingConnector connector)
{
assert connector != null;
@@ -252,7 +252,7 @@
return count;
}
- public NIOConnector getConnector()
+ public RemotingConnector getConnector()
{
return connector;
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -50,9 +50,9 @@
private final ConnectionParams connectionParams;
- private NIOConnector connector;
+ private RemotingConnector connector;
- private NIOSession session;
+ private RemotingSession session;
private RemotingSessionListener listener;
@@ -100,7 +100,7 @@
{
if (listener != null)
connector.removeSessionListener(listener);
- NIOConnector connectorFromRegistry = ConnectorRegistryFactory.getRegistry().removeConnector(location);
+ RemotingConnector connectorFromRegistry = ConnectorRegistryFactory.getRegistry().removeConnector(location);
if (connectorFromRegistry != null)
connectorFromRegistry.disconnect();
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -155,7 +155,7 @@
}
- public void registerPinger(NIOSession session)
+ public void registerPinger(RemotingSession session)
{
ResponseHandler pongHandler = new ResponseHandlerImpl(dispatcher.generateID());
Pinger pinger = new PingerImpl(getDispatcher(), session, config.getKeepAliveTimeout(), pongHandler, RemotingServiceImpl.this);
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMConnector.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMConnector.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -6,22 +6,21 @@
*/
package org.jboss.messaging.core.remoting.impl.invm;
+import org.jboss.messaging.core.client.RemotingSessionListener;
+import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.RemotingConnector;
+import org.jboss.messaging.core.remoting.RemotingSession;
import static org.jboss.messaging.core.remoting.TransportType.INVM;
import java.io.IOException;
-import org.jboss.messaging.core.client.RemotingSessionListener;
-import org.jboss.messaging.core.remoting.NIOConnector;
-import org.jboss.messaging.core.remoting.NIOSession;
-import org.jboss.messaging.core.remoting.PacketDispatcher;
-
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
*
* @version <tt>$Revision$</tt>
*
*/
-public class INVMConnector implements NIOConnector
+public class INVMConnector implements RemotingConnector
{
// Constants -----------------------------------------------------
@@ -49,7 +48,7 @@
// NIOConnector implementation -----------------------------------
- public NIOSession connect()
+ public RemotingSession connect()
throws IOException
{
this.session = new INVMSession(id, clientDispatcher, serverDispatcher);
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -6,22 +6,22 @@
*/
package org.jboss.messaging.core.remoting.impl.invm;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketReturner;
+import org.jboss.messaging.core.remoting.RemotingSession;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
*
* @version <tt>$Revision$</tt>
*
*/
-public class INVMSession implements NIOSession
+public class INVMSession implements RemotingSession
{
// Constants -----------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -34,7 +34,7 @@
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
* @version <tt>$Revision$</tt>
*/
-public class MinaConnector implements NIOConnector, CleanUpNotifier
+public class MinaConnector implements RemotingConnector, CleanUpNotifier
{
// Constants -----------------------------------------------------
@@ -126,7 +126,7 @@
// NIOConnector implementation -----------------------------------
- public NIOSession connect() throws IOException
+ public RemotingSession connect() throws IOException
{
if (session != null && session.isConnected())
{
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -7,10 +7,9 @@
package org.jboss.messaging.core.remoting.impl.mina;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteFuture;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.Packet;
+import org.jboss.messaging.core.remoting.RemotingSession;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -18,7 +17,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class MinaSession implements NIOSession
+public class MinaSession implements RemotingSession
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -13,10 +13,10 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketReturner;
+import org.jboss.messaging.core.remoting.RemotingSession;
import static org.jboss.messaging.core.remoting.TransportType.TCP;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
@@ -114,7 +114,7 @@
LocationImpl location = new LocationImpl(TCP, "localhost", TestSupport.PORT);
MinaConnector connector = new MinaConnector(location, connectionParams, new PacketDispatcherImpl(null));
- NIOSession session = connector.connect();
+ RemotingSession session = connector.connect();
connector.getDispatcher().register(new NotRespondingPacketHandler());
long clientSessionID = session.getID();
@@ -169,7 +169,7 @@
MinaConnector connector = new MinaConnector(location, connectionParams,
new PacketDispatcherImpl(null));
- NIOSession session = connector.connect();
+ RemotingSession session = connector.connect();
connector.getDispatcher().register(tooLongRespondHandler);
long clientSessionID = session.getID();
@@ -229,12 +229,12 @@
MinaConnector connectorNotResponding = new MinaConnector(location, new PacketDispatcherImpl(null));
MinaConnector connectorResponding = new MinaConnector(location, new PacketDispatcherImpl(null));
- NIOSession sessionNotResponding = connectorNotResponding.connect();
+ RemotingSession sessionNotResponding = connectorNotResponding.connect();
connectorNotResponding.getDispatcher().register(notRespondingPacketHandler);
long clientSessionIDNotResponding = sessionNotResponding.getID();
- NIOSession sessionResponding = connectorResponding.connect();
+ RemotingSession sessionResponding = connectorResponding.connect();
long clientSessionIDResponding = sessionResponding.getID();
boolean firedKeepAliveNotification = latch.await(TestSupport.KEEP_ALIVE_INTERVAL
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -3,9 +3,9 @@
import junit.framework.TestCase;
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.remoting.NIOConnector;
-import org.jboss.messaging.core.remoting.NIOSession;
+import org.jboss.messaging.core.remoting.RemotingConnector;
import org.jboss.messaging.core.remoting.RemotingService;
+import org.jboss.messaging.core.remoting.RemotingSession;
import static org.jboss.messaging.core.remoting.TransportType.INVM;
import static org.jboss.messaging.core.remoting.TransportType.TCP;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
@@ -31,8 +31,8 @@
public void testINVMConnector_OK() throws Exception
{
- NIOConnector connector = new INVMConnector(1, new PacketDispatcherImpl(null), invmService.getDispatcher());
- NIOSession session = connector.connect();
+ RemotingConnector connector = new INVMConnector(1, new PacketDispatcherImpl(null), invmService.getDispatcher());
+ RemotingSession session = connector.connect();
assertTrue(session.isConnected());
assertTrue(connector.disconnect());
@@ -42,7 +42,7 @@
// disabled test since INVM transport is disabled for JBM2 alpha: JBMESSAGING-1348
public void _testMinaConnector_Failure() throws Exception
{
- NIOConnector connector = new MinaConnector(new LocationImpl(
+ RemotingConnector connector = new MinaConnector(new LocationImpl(
TCP, "localhost", 9000), new PacketDispatcherImpl(null));
try
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -8,8 +8,8 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.RemotingConnector;
import static org.jboss.messaging.core.remoting.TransportType.TCP;
import org.jboss.messaging.core.remoting.impl.RemotingServiceImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
@@ -38,7 +38,7 @@
// ClientTestBase overrides --------------------------------------
@Override
- protected NIOConnector createNIOConnector(PacketDispatcher dispatcher)
+ protected RemotingConnector createNIOConnector(PacketDispatcher dispatcher)
{
return new MinaConnector(new LocationImpl(TCP, "localhost", TestSupport.PORT), dispatcher);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -10,9 +10,9 @@
import org.jboss.messaging.core.client.RemotingSessionListener;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketReturner;
+import org.jboss.messaging.core.remoting.RemotingSession;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.RemotingServiceImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
@@ -84,7 +84,7 @@
};
connector.addSessionListener(listener);
- NIOSession session = connector.connect();
+ RemotingSession session = connector.connect();
boolean firedKeepAliveNotification = latch.await(TestSupport.KEEP_ALIVE_INTERVAL
+ TestSupport.KEEP_ALIVE_TIMEOUT + 2000, MILLISECONDS);
assertTrue(firedKeepAliveNotification);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/ping/impl/PingerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/ping/impl/PingerImplTest.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/ping/impl/PingerImplTest.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -38,7 +38,7 @@
{
long timeout = 500;
- NIOSession session = createMock(NIOSession.class);
+ RemotingSession session = createMock(RemotingSession.class);
ResponseHandler pongHandler = createMock(ResponseHandler.class);
long handlerID = randomLong();
@@ -64,7 +64,7 @@
long timeout = 500;
long sessionID = randomLong();
- NIOSession session = createMock(NIOSession.class);
+ RemotingSession session = createMock(RemotingSession.class);
expect(session.getID()).andStubReturn(sessionID);
Ping ping = new Ping(sessionID);
@@ -98,7 +98,7 @@
long timeout = 500;
long sessionID = randomLong();
- NIOSession session = createMock(NIOSession.class);
+ RemotingSession session = createMock(RemotingSession.class);
expect(session.getID()).andStubReturn(sessionID);
Ping ping = new Ping(sessionID);
@@ -136,7 +136,7 @@
long timeout = 500;
long sessionID = randomLong();
- NIOSession session = createMock(NIOSession.class);
+ RemotingSession session = createMock(RemotingSession.class);
expect(session.getID()).andStubReturn(sessionID);
session.write((Packet) anyObject());
@@ -169,7 +169,7 @@
long timeout = 500;
long sessionID = randomLong();
- NIOSession session = createMock(NIOSession.class);
+ RemotingSession session = createMock(RemotingSession.class);
expect(session.getID()).andStubReturn(sessionID);
Ping ping = new Ping(sessionID);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectorRegistryImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectorRegistryImplTest.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectorRegistryImplTest.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -12,8 +12,8 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.remoting.ConnectorRegistry;
-import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.RemotingConnector;
import org.jboss.messaging.core.remoting.TransportType;
import static org.jboss.messaging.core.remoting.TransportType.INVM;
import org.jboss.messaging.core.remoting.impl.ConnectorRegistryImpl;
@@ -90,7 +90,7 @@
// config is registered -> client and server are in the same vm
assertTrue(registry.register(config.getLocation(), dispatcher));
- NIOConnector connector = registry.getConnector(config.getLocation(), new ConnectionParamsImpl());
+ RemotingConnector connector = registry.getConnector(config.getLocation(), new ConnectionParamsImpl());
assertTrue(connector.getServerURI().startsWith(INVM.toString()));
@@ -105,7 +105,7 @@
Configuration config = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
// config is not registered -> client and server are not in the same vm
- NIOConnector connector = registry.getConnector(config.getLocation(), config.getConnectionParams());
+ RemotingConnector connector = registry.getConnector(config.getLocation(), config.getConnectionParams());
assertNotNull(connector);
assertEquals(config.getURI(), connector.getServerURI());
@@ -118,10 +118,10 @@
Configuration config = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
assertEquals(0, registry.getConnectorCount(config.getLocation()));
- NIOConnector connector1 = registry.getConnector(config.getLocation(), new ConnectionParamsImpl());
+ RemotingConnector connector1 = registry.getConnector(config.getLocation(), new ConnectionParamsImpl());
assertEquals(1, registry.getConnectorCount(config.getLocation()));
- NIOConnector connector2 = registry.getConnector(config.getLocation(), new ConnectionParamsImpl());
+ RemotingConnector connector2 = registry.getConnector(config.getLocation(), new ConnectionParamsImpl());
assertEquals(2, registry.getConnectorCount(config.getLocation()));
assertSame(connector1, connector2);
@@ -129,7 +129,7 @@
assertNull(registry.removeConnector(config.getLocation()));
assertEquals(1, registry.getConnectorCount(config.getLocation()));
- NIOConnector connector3 = registry.getConnector(config.getLocation(), new ConnectionParamsImpl());
+ RemotingConnector connector3 = registry.getConnector(config.getLocation(), new ConnectionParamsImpl());
assertEquals(2, registry.getConnectorCount(config.getLocation()));
assertSame(connector1, connector3);
@@ -149,10 +149,10 @@
assertEquals(0, registry.getConnectorCount(config1.getLocation()));
assertEquals(0, registry.getConnectorCount(config2.getLocation()));
- NIOConnector connector1 = registry.getConnector(config1.getLocation(), new ConnectionParamsImpl());
+ RemotingConnector connector1 = registry.getConnector(config1.getLocation(), new ConnectionParamsImpl());
assertEquals(1, registry.getConnectorCount(config1.getLocation()));
- NIOConnector connector2 = registry.getConnector(config2.getLocation(), new ConnectionParamsImpl());
+ RemotingConnector connector2 = registry.getConnector(config2.getLocation(), new ConnectionParamsImpl());
assertEquals(1, registry.getConnectorCount(config2.getLocation()));
assertNotSame(connector1, connector2);
@@ -171,10 +171,10 @@
assertEquals(0, registry.getConnectorCount(config1.getLocation()));
assertEquals(0, registry.getConnectorCount(config2.getLocation()));
- NIOConnector connector1 = registry.getConnector(config1.getLocation(), new ConnectionParamsImpl());
+ RemotingConnector connector1 = registry.getConnector(config1.getLocation(), new ConnectionParamsImpl());
assertEquals(1, registry.getConnectorCount(config1.getLocation()));
- NIOConnector connector2 = registry.getConnector(config2.getLocation(), new ConnectionParamsImpl());
+ RemotingConnector connector2 = registry.getConnector(config2.getLocation(), new ConnectionParamsImpl());
assertEquals(1, registry.getConnectorCount(config2.getLocation()));
assertNotSame(connector1, connector2);
@@ -199,10 +199,10 @@
assertNotSame(config1, config2);
- NIOConnector connector1 = registry.getConnector(config1.getLocation(), new ConnectionParamsImpl());
+ RemotingConnector connector1 = registry.getConnector(config1.getLocation(), new ConnectionParamsImpl());
assertEquals(1, registry.getConnectorCount(config1.getLocation()));
- NIOConnector connector2 = registry.getConnector(config2.getLocation(), new ConnectionParamsImpl());
+ RemotingConnector connector2 = registry.getConnector(config2.getLocation(), new ConnectionParamsImpl());
assertEquals(2, registry.getConnectorCount(config2.getLocation()));
assertSame(connector1, connector2);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionTest.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionTest.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -45,7 +45,7 @@
public void testConnectionStarted() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -55,11 +55,11 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = EasyMock.createNiceMock(ConnectionParams.class);
- NIOSession nioSession = EasyMock.createStrictMock(NIOSession.class);
+ RemotingSession remotingSession = EasyMock.createStrictMock(RemotingSession.class);
EasyMock.expect(connectorRegistry.getConnector(location, connectionParams)).andReturn(connector);
EasyMock.replay(connectorRegistry);
- EasyMock.expect(connector.connect()).andReturn(nioSession);
+ EasyMock.expect(connector.connect()).andReturn(remotingSession);
EasyMock.replay(connector);
RemotingConnectionImpl remotingConnection = new RemotingConnectionImpl(location, connectionParams);
@@ -71,7 +71,7 @@
public void testConnectionStartedAndStopped() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -81,12 +81,12 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = EasyMock.createNiceMock(ConnectionParams.class);
- NIOSession nioSession = EasyMock.createStrictMock(NIOSession.class);
+ RemotingSession remotingSession = EasyMock.createStrictMock(RemotingSession.class);
EasyMock.expect(connectorRegistry.getConnector(location, connectionParams)).andReturn(connector);
EasyMock.expect(connectorRegistry.removeConnector(location)).andReturn(connector);
EasyMock.replay(connectorRegistry);
- EasyMock.expect(connector.connect()).andReturn(nioSession);
+ EasyMock.expect(connector.connect()).andReturn(remotingSession);
EasyMock.expect(connector.disconnect()).andReturn(true);
EasyMock.replay(connector);
@@ -102,7 +102,7 @@
public void testConnectionGetSessionId() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -112,15 +112,15 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = EasyMock.createNiceMock(ConnectionParams.class);
- NIOSession nioSession = EasyMock.createStrictMock(NIOSession.class);
+ RemotingSession remotingSession = EasyMock.createStrictMock(RemotingSession.class);
EasyMock.expect(connectorRegistry.getConnector(location, connectionParams)).andReturn(connector);
EasyMock.replay(connectorRegistry);
- EasyMock.expect(connector.connect()).andReturn(nioSession);
+ EasyMock.expect(connector.connect()).andReturn(remotingSession);
EasyMock.replay(connector);
- EasyMock.expect(nioSession.isConnected()).andReturn(true);
- EasyMock.expect(nioSession.getID()).andReturn((123l));
- EasyMock.replay(nioSession);
+ EasyMock.expect(remotingSession.isConnected()).andReturn(true);
+ EasyMock.expect(remotingSession.getID()).andReturn((123l));
+ EasyMock.replay(remotingSession);
RemotingConnectionImpl remotingConnection = new RemotingConnectionImpl(location, connectionParams);
remotingConnection.start();
@@ -128,13 +128,13 @@
EasyMock.verify(connector);
EasyMock.verify(connectorRegistry);
- EasyMock.verify(nioSession);
+ EasyMock.verify(remotingSession);
}
public void testConnectionGetSessionIdDisconnected() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -144,15 +144,15 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = EasyMock.createNiceMock(ConnectionParams.class);
- NIOSession nioSession = EasyMock.createStrictMock(NIOSession.class);
+ RemotingSession remotingSession = EasyMock.createStrictMock(RemotingSession.class);
EasyMock.expect(connectorRegistry.getConnector(location, connectionParams)).andReturn(connector);
EasyMock.replay(connectorRegistry);
- EasyMock.expect(connector.connect()).andReturn(nioSession);
+ EasyMock.expect(connector.connect()).andReturn(remotingSession);
EasyMock.replay(connector);
- EasyMock.expect(nioSession.isConnected()).andReturn(false);
+ EasyMock.expect(remotingSession.isConnected()).andReturn(false);
//EasyMock.expect(nioSession.getID()).andReturn((123l));
- EasyMock.replay(nioSession);
+ EasyMock.replay(remotingSession);
RemotingConnectionImpl remotingConnection = new RemotingConnectionImpl(location, connectionParams);
remotingConnection.start();
@@ -160,13 +160,13 @@
EasyMock.verify(connector);
EasyMock.verify(connectorRegistry);
- EasyMock.verify(nioSession);
+ EasyMock.verify(remotingSession);
}
public void testConnectionGetSessionIdStopped() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -176,15 +176,15 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = EasyMock.createNiceMock(ConnectionParams.class);
- NIOSession nioSession = EasyMock.createStrictMock(NIOSession.class);
+ RemotingSession remotingSession = EasyMock.createStrictMock(RemotingSession.class);
EasyMock.expect(connectorRegistry.getConnector(location, connectionParams)).andReturn(connector);
EasyMock.replay(connectorRegistry);
- EasyMock.expect(connector.connect()).andReturn(nioSession);
+ EasyMock.expect(connector.connect()).andReturn(remotingSession);
EasyMock.replay(connector);
- EasyMock.expect(nioSession.isConnected()).andReturn(true);
- EasyMock.expect(nioSession.getID()).andReturn((123l));
- EasyMock.replay(nioSession);
+ EasyMock.expect(remotingSession.isConnected()).andReturn(true);
+ EasyMock.expect(remotingSession.getID()).andReturn((123l));
+ EasyMock.replay(remotingSession);
RemotingConnectionImpl remotingConnection = new RemotingConnectionImpl(location, connectionParams);
remotingConnection.start();
@@ -193,13 +193,13 @@
EasyMock.verify(connector);
EasyMock.verify(connectorRegistry);
- EasyMock.verify(nioSession);
+ EasyMock.verify(remotingSession);
}
public void testConnectionSendBlocking() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -241,7 +241,7 @@
public void testConnectionSendBlockingWithTimeout() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -290,7 +290,7 @@
public void testConnectionSendBlockingErrorOnWrite() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -340,7 +340,7 @@
public void testConnectionSendOneWay() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -378,7 +378,7 @@
public void testConnectionSendOneWayErrorOnWrite() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -424,7 +424,7 @@
public void testConnectionSetListener() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -434,12 +434,12 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = EasyMock.createNiceMock(ConnectionParams.class);
- NIOSession nioSession = EasyMock.createStrictMock(NIOSession.class);
+ RemotingSession remotingSession = EasyMock.createStrictMock(RemotingSession.class);
RemotingSessionListener listener = EasyMock.createNiceMock(RemotingSessionListener.class);
EasyMock.expect(connectorRegistry.getConnector(location, connectionParams)).andReturn(connector);
EasyMock.replay(connectorRegistry);
- EasyMock.expect(connector.connect()).andReturn(nioSession);
+ EasyMock.expect(connector.connect()).andReturn(remotingSession);
connector.addSessionListener(listener);
EasyMock.replay(connector);
@@ -453,7 +453,7 @@
public void testConnectionReSetListener() throws Throwable
{
final ConnectorRegistry connectorRegistry = EasyMock.createStrictMock(ConnectorRegistry.class);
- NIOConnector connector = EasyMock.createStrictMock(NIOConnector.class);
+ RemotingConnector connector = EasyMock.createStrictMock(RemotingConnector.class);
ConnectorRegistryFactory.setRegisteryLocator(new ConnectorRegistryLocator()
{
public ConnectorRegistry locate()
@@ -463,12 +463,12 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = EasyMock.createNiceMock(ConnectionParams.class);
- NIOSession nioSession = EasyMock.createStrictMock(NIOSession.class);
+ RemotingSession remotingSession = EasyMock.createStrictMock(RemotingSession.class);
RemotingSessionListener listener = EasyMock.createNiceMock(RemotingSessionListener.class);
RemotingSessionListener listener2 = EasyMock.createNiceMock(RemotingSessionListener.class);
EasyMock.expect(connectorRegistry.getConnector(location, connectionParams)).andReturn(connector);
EasyMock.replay(connectorRegistry);
- EasyMock.expect(connector.connect()).andReturn(nioSession);
+ EasyMock.expect(connector.connect()).andReturn(remotingSession);
connector.addSessionListener(listener);
connector.removeSessionListener(listener);
connector.addSessionListener(listener2);
@@ -528,7 +528,7 @@
}
}
- class DummySession implements NIOSession
+ class DummySession implements RemotingSession
{
PacketDispatcher dispatcher;
Packet packetDispatched = null;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingServiceImplTest.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingServiceImplTest.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -401,7 +401,7 @@
EasyMock.verify(listener, listener2, listener3);
}
- class DummySession implements NIOSession
+ class DummySession implements RemotingSession
{
PacketDispatcher dispatcher;
int count = 0;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -6,28 +6,21 @@
*/
package org.jboss.messaging.tests.unit.core.remoting.impl;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jboss.messaging.tests.integration.core.remoting.mina.TestSupport.MANY_MESSAGES;
-import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
-
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-
import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.NIOConnector;
-import org.jboss.messaging.core.remoting.NIOSession;
-import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketReturner;
+import org.jboss.messaging.core.remoting.*;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.tests.integration.core.remoting.mina.Handler;
+import static org.jboss.messaging.tests.integration.core.remoting.mina.TestSupport.MANY_MESSAGES;
import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
+import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
+import java.util.List;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
*
@@ -46,9 +39,9 @@
protected PacketDispatcher serverDispatcher;
protected PacketDispatcher clientDispatcher;
- protected NIOConnector connector;
+ protected RemotingConnector connector;
- protected NIOSession session;
+ protected RemotingSession session;
// Static --------------------------------------------------------
@@ -58,8 +51,8 @@
public void testConnected() throws Exception
{
- NIOConnector connector = createNIOConnector(new PacketDispatcherImpl(null));
- NIOSession session = connector.connect();
+ RemotingConnector connector = createNIOConnector(new PacketDispatcherImpl(null));
+ RemotingSession session = connector.connect();
assertTrue(session.isConnected());
@@ -172,7 +165,7 @@
protected abstract Configuration createRemotingConfiguration();
- protected abstract NIOConnector createNIOConnector(PacketDispatcher dispatcher);
+ protected abstract RemotingConnector createNIOConnector(PacketDispatcher dispatcher);
protected abstract PacketDispatcher startServer() throws Exception;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java 2008-06-13 09:36:16 UTC (rev 4460)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java 2008-06-13 09:51:12 UTC (rev 4461)
@@ -6,12 +6,11 @@
*/
package org.jboss.messaging.tests.unit.core.remoting.impl.invm;
-import static org.jboss.messaging.core.remoting.TransportType.INVM;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.RemotingConnector;
+import static org.jboss.messaging.core.remoting.TransportType.INVM;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.invm.INVMConnector;
import org.jboss.messaging.tests.unit.core.remoting.impl.SessionTestBase;
@@ -39,7 +38,7 @@
// ClientTestBase overrides --------------------------------------
@Override
- protected NIOConnector createNIOConnector(PacketDispatcher dispatcher)
+ protected RemotingConnector createNIOConnector(PacketDispatcher dispatcher)
{
return new INVMConnector(1, dispatcher, serverDispatcher);
}
More information about the jboss-cvs-commits
mailing list