[jboss-cvs] JBoss Messaging SVN: r4457 - in trunk: src/main/org/jboss/messaging/core/remoting and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 12 18:19:55 EDT 2008
Author: ataylor
Date: 2008-06-12 18:19:55 -0400 (Thu, 12 Jun 2008)
New Revision: 4457
Added:
trunk/src/main/org/jboss/messaging/core/remoting/CleanUpNotifier.java
Removed:
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/CleanUpNotifier.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/ClientKeepAliveFactory.java
Modified:
trunk/src/main/org/jboss/messaging/core/ping/impl/PingerImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/Acceptor.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMAcceptor.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/ping/impl/PingerImplTest.java
Log:
moved cleanupnotifier and removed clientside ping factory
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-12 22:08:49 UTC (rev 4456)
+++ trunk/src/main/org/jboss/messaging/core/ping/impl/PingerImpl.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -10,7 +10,6 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.ping.Pinger;
import org.jboss.messaging.core.remoting.*;
-import org.jboss.messaging.core.remoting.impl.mina.CleanUpNotifier;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/Acceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/Acceptor.java 2008-06-12 22:08:49 UTC (rev 4456)
+++ trunk/src/main/org/jboss/messaging/core/remoting/Acceptor.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -1,7 +1,5 @@
package org.jboss.messaging.core.remoting;
-import org.jboss.messaging.core.remoting.impl.mina.CleanUpNotifier;
-
/**
* An Acceptor is used tby the Remoting Service to allow clients to connect. It should take care of dispatchin client requests
* to the Remoting Service's Dispatcher.
Copied: trunk/src/main/org/jboss/messaging/core/remoting/CleanUpNotifier.java (from rev 4450, trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/CleanUpNotifier.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/CleanUpNotifier.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/CleanUpNotifier.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -0,0 +1,22 @@
+/*
+ * 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.exception.MessagingException;
+
+
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ */
+public interface CleanUpNotifier
+{
+ void fireCleanup(long sessionID, MessagingException e);
+}
\ No newline at end of file
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-12 22:08:49 UTC (rev 4456)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -16,7 +16,6 @@
import org.jboss.messaging.core.ping.impl.PingerImpl;
import org.jboss.messaging.core.remoting.*;
import static org.jboss.messaging.core.remoting.impl.RemotingConfigurationValidator.validate;
-import org.jboss.messaging.core.remoting.impl.mina.CleanUpNotifier;
import org.jboss.messaging.core.remoting.impl.mina.ServerKeepAliveFactory;
import java.util.ArrayList;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMAcceptor.java 2008-06-12 22:08:49 UTC (rev 4456)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMAcceptor.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -23,9 +23,9 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Acceptor;
+import org.jboss.messaging.core.remoting.CleanUpNotifier;
import org.jboss.messaging.core.remoting.ConnectorRegistryFactory;
import org.jboss.messaging.core.remoting.RemotingService;
-import org.jboss.messaging.core.remoting.impl.mina.CleanUpNotifier;
/**
* An INVM Acceptor. This will allow connections from within the same VM via the ConnectorRegistry
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/CleanUpNotifier.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/CleanUpNotifier.java 2008-06-12 22:08:49 UTC (rev 4456)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/CleanUpNotifier.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -1,22 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.impl.mina;
-
-import org.jboss.messaging.core.exception.MessagingException;
-
-
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public interface CleanUpNotifier
-{
- void fireCleanup(long sessionID, MessagingException e);
-}
\ No newline at end of file
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/ClientKeepAliveFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/ClientKeepAliveFactory.java 2008-06-12 22:08:49 UTC (rev 4456)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/ClientKeepAliveFactory.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.impl.mina;
-
-import org.jboss.messaging.core.remoting.KeepAliveFactory;
-import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
-import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * @version <tt>$Revision$</tt>
- */
-public class ClientKeepAliveFactory implements KeepAliveFactory
-{
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // KeepAliveFactory implementation -------------------------------
- private boolean isAlive = true;
-
- public Pong pong(long sessionID, Ping ping)
- {
- Pong pong = new Pong(sessionID, !isAlive());
- pong.setTargetID(ping.getResponseTargetID());
- return pong;
- }
-
- public boolean isAlive()
- {
- return isAlive;
- }
-
- public void setAlive(boolean alive)
- {
- isAlive = alive;
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java 2008-06-12 22:08:49 UTC (rev 4456)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -24,6 +24,7 @@
import org.apache.mina.common.*;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.jboss.messaging.core.remoting.Acceptor;
+import org.jboss.messaging.core.remoting.CleanUpNotifier;
import org.jboss.messaging.core.remoting.RemotingService;
import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addCodecFilter;
import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addSSLFilter;
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-12 22:08:49 UTC (rev 4456)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -6,26 +6,7 @@
*/
package org.jboss.messaging.core.remoting.impl.mina;
-import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addCodecFilter;
-import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addSSLFilter;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.mina.common.CloseFuture;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoServiceListener;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.*;
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.jboss.messaging.core.client.ConnectionParams;
@@ -36,18 +17,19 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.ping.Pinger;
import org.jboss.messaging.core.ping.impl.PingerImpl;
-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.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.ResponseHandler;
-import org.jboss.messaging.core.remoting.TransportType;
+import org.jboss.messaging.core.remoting.*;
import org.jboss.messaging.core.remoting.impl.ResponseHandlerImpl;
+import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addCodecFilter;
+import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addSSLFilter;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.*;
+
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
* @version <tt>$Revision$</tt>
@@ -79,10 +61,10 @@
private MinaHandler handler;
- ClientKeepAliveFactory keepAliveFactory;
-
private ScheduledExecutorService scheduledExecutor;
+ private boolean alive = true;
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -91,32 +73,18 @@
public MinaConnector(Location location, PacketDispatcher dispatcher)
{
- this(location, new ConnectionParamsImpl(), dispatcher, new ClientKeepAliveFactory());
+ this(location, new ConnectionParamsImpl(), dispatcher);
}
public MinaConnector(Location location, ConnectionParams connectionParams, PacketDispatcher dispatcher)
{
- this(location, connectionParams, dispatcher, new ClientKeepAliveFactory());
- }
-
- public MinaConnector(Location location, PacketDispatcher dispatcher,
- ClientKeepAliveFactory keepAliveFactory)
- {
- this(location, new ConnectionParamsImpl(), dispatcher, keepAliveFactory);
- }
-
- public MinaConnector(Location location, ConnectionParams connectionParams, PacketDispatcher dispatcher,
- ClientKeepAliveFactory keepAliveFactory)
- {
assert location != null;
assert dispatcher != null;
- assert keepAliveFactory != null;
assert connectionParams != null;
this.location = location;
this.connectionParams = connectionParams;
this.dispatcher = dispatcher;
- this.keepAliveFactory = keepAliveFactory;
this.connector = new NioSocketConnector();
DefaultIoFilterChainBuilder filterChain = connector.getFilterChain();
@@ -195,18 +163,16 @@
public void handle(Packet packet, PacketReturner sender)
{
Ping decodedPing = (Ping) packet;
- Pong pong = keepAliveFactory.pong(decodedPing.getSessionID(), decodedPing);
- if (pong != null)
+ Pong pong = new Pong(decodedPing.getSessionID(), !alive);
+ pong.setTargetID(decodedPing.getResponseTargetID());
+ try
{
- try
- {
- sender.send(pong);
- }
- catch (Exception e)
- {
- log.warn("unable to pong server");
- }
+ sender.send(pong);
}
+ catch (Exception e)
+ {
+ log.warn("unable to pong server");
+ }
}
});
/**
@@ -227,7 +193,7 @@
{
return false;
}
- keepAliveFactory.setAlive(false);
+ alive = false;
scheduledExecutor.shutdownNow();
CloseFuture closeFuture = session.close().awaitUninterruptibly();
boolean closed = closeFuture.isClosed();
@@ -300,7 +266,7 @@
public synchronized void fireCleanup(long sessionID, MessagingException me)
{
scheduledExecutor.shutdownNow();
- keepAliveFactory.setAlive(false);
+ alive = false;
for (RemotingSessionListener listener : listeners)
{
listener.sessionDestroyed(sessionID, me);
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java 2008-06-12 22:08:49 UTC (rev 4456)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -10,10 +10,7 @@
import org.apache.mina.common.IoSession;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketHandlerRegistrationListener;
-import org.jboss.messaging.core.remoting.PacketReturner;
+import org.jboss.messaging.core.remoting.*;
import org.jboss.messaging.util.OrderedExecutorFactory;
import java.util.concurrent.ConcurrentHashMap;
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-12 22:08:49 UTC (rev 4456)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -14,11 +14,12 @@
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 static org.jboss.messaging.core.remoting.TransportType.TCP;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
-import org.jboss.messaging.core.remoting.impl.mina.ClientKeepAliveFactory;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
-import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
@@ -65,13 +66,6 @@
public void testKeepAliveWithClientOK() throws Exception
{
- ClientKeepAliveFactory factory = new ClientKeepAliveFactory();
-
- // client never send ping
- //expect(factory.pong(0, isA(Ping.class))).andStubReturn(new Pong());
-
- ///replay(factory);
-
final CountDownLatch latch = new CountDownLatch(1);
RemotingSessionListener listener = new RemotingSessionListener()
@@ -85,7 +79,7 @@
ConnectionParams connectionParams = new ConnectionParamsImpl();
connectionParams.setKeepAliveInterval(TestSupport.KEEP_ALIVE_INTERVAL);
connectionParams.setKeepAliveTimeout(TestSupport.KEEP_ALIVE_TIMEOUT);
- MinaConnector connector = new MinaConnector(new LocationImpl(TCP, "localhost", TestSupport.PORT), connectionParams, new PacketDispatcherImpl(null), factory);
+ MinaConnector connector = new MinaConnector(new LocationImpl(TCP, "localhost", TestSupport.PORT), connectionParams, new PacketDispatcherImpl(null));
connector.connect();
boolean firedKeepAliveNotification = latch.await(TestSupport.KEEP_ALIVE_INTERVAL
@@ -100,7 +94,6 @@
public void testKeepAliveWithClientNotResponding() throws Throwable
{
- final ClientKeepAliveFactory factory = new ClientKeepAliveFactoryNotResponding();
final long[] clientSessionIDNotResponding = new long[1];
final CountDownLatch latch = new CountDownLatch(1);
@@ -119,9 +112,10 @@
connectionParams.setKeepAliveTimeout(TestSupport.KEEP_ALIVE_TIMEOUT);
LocationImpl location = new LocationImpl(TCP, "localhost", TestSupport.PORT);
- MinaConnector connector = new MinaConnector(location, connectionParams, new PacketDispatcherImpl(null), factory);
+ MinaConnector connector = new MinaConnector(location, connectionParams, new PacketDispatcherImpl(null));
NIOSession session = connector.connect();
+ connector.getDispatcher().register(new NotRespondingPacketHandler());
long clientSessionID = session.getID();
boolean firedKeepAliveNotification = latch.await(TestSupport.KEEP_ALIVE_INTERVAL
@@ -136,10 +130,14 @@
public void testKeepAliveWithClientTooLongToRespond() throws Throwable
{
- ClientKeepAliveFactory factory = new ClientKeepAliveFactory()
+ PacketHandler tooLongRespondHandler = new PacketHandler()
{
+ public long getID()
+ {
+ return 0;
+ }
- public Pong pong(long sessionID, Ping ping)
+ public void handle(Packet packet, PacketReturner sender)
{
try
{
@@ -152,10 +150,16 @@
{
e.printStackTrace();
}
- return new Pong(randomLong(), false);
+ try
+ {
+ sender.send(new Pong(randomLong(), false));
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
}
};
-
try
{
ConnectionParams connectionParams = new ConnectionParamsImpl();
@@ -163,9 +167,10 @@
connectionParams.setKeepAliveTimeout(TestSupport.KEEP_ALIVE_TIMEOUT);
LocationImpl location = new LocationImpl(TCP, "localhost", TestSupport.PORT);
MinaConnector connector = new MinaConnector(location, connectionParams,
- new PacketDispatcherImpl(null), factory);
+ new PacketDispatcherImpl(null));
NIOSession session = connector.connect();
+ connector.getDispatcher().register(tooLongRespondHandler);
long clientSessionID = session.getID();
final AtomicLong clientSessionIDNotResponding = new AtomicLong(-1);
@@ -193,9 +198,9 @@
finally
{
// test is done: wake up the factory
- synchronized (factory)
+ synchronized (tooLongRespondHandler)
{
- factory.notify();
+ tooLongRespondHandler.notify();
}
}
}
@@ -203,9 +208,6 @@
public void testKeepAliveWithClientRespondingAndClientNotResponding()
throws Throwable
{
- ClientKeepAliveFactory notRespondingfactory = new ClientKeepAliveFactoryNotResponding();
- ClientKeepAliveFactory respondingfactory = new ClientKeepAliveFactory();
-
final AtomicLong sessionIDNotResponding = new AtomicLong(-1);
final CountDownLatch latch = new CountDownLatch(1);
@@ -217,15 +219,18 @@
latch.countDown();
}
};
+ //assign this after we have connected to replace the pong handler
+ PacketHandler notRespondingPacketHandler = new NotRespondingPacketHandler();
messagingServer.getRemotingService().addRemotingSessionListener(listener);
ConnectionParams connectionParams = new ConnectionParamsImpl();
connectionParams.setKeepAliveInterval(TestSupport.KEEP_ALIVE_INTERVAL);
connectionParams.setKeepAliveTimeout(TestSupport.KEEP_ALIVE_TIMEOUT);
LocationImpl location = new LocationImpl(TCP, "localhost", TestSupport.PORT);
- MinaConnector connectorNotResponding = new MinaConnector(location, new PacketDispatcherImpl(null), notRespondingfactory);
- MinaConnector connectorResponding = new MinaConnector(location, new PacketDispatcherImpl(null), respondingfactory);
+ MinaConnector connectorNotResponding = new MinaConnector(location, new PacketDispatcherImpl(null));
+ MinaConnector connectorResponding = new MinaConnector(location, new PacketDispatcherImpl(null));
NIOSession sessionNotResponding = connectorNotResponding.connect();
+ connectorNotResponding.getDispatcher().register(notRespondingPacketHandler);
long clientSessionIDNotResponding = sessionNotResponding.getID();
@@ -252,11 +257,17 @@
// Inner classes -------------------------------------------------
- private class ClientKeepAliveFactoryNotResponding extends ClientKeepAliveFactory
+
+ private static class NotRespondingPacketHandler implements PacketHandler
{
- public Pong pong(long sessionID, Ping ping)
- {
- return null;
- }
+ public long getID()
+ {
+ return 0;
+ }
+
+ public void handle(Packet packet, PacketReturner sender)
+ {
+ //dont do anything. i.e no response ping
+ }
}
}
\ No newline at end of file
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-12 22:08:49 UTC (rev 4456)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/ping/impl/PingerImplTest.java 2008-06-12 22:19:55 UTC (rev 4457)
@@ -6,26 +6,15 @@
*/
package org.jboss.messaging.tests.unit.core.ping.impl;
-import static org.easymock.EasyMock.anyLong;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import junit.framework.TestCase;
-
+import static org.easymock.EasyMock.*;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.ping.Pinger;
import org.jboss.messaging.core.ping.impl.PingerImpl;
-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.ResponseHandler;
-import org.jboss.messaging.core.remoting.impl.mina.CleanUpNotifier;
+import org.jboss.messaging.core.remoting.*;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
+import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
More information about the jboss-cvs-commits
mailing list