Author: jmesnil Date: 2010-01-22 05:16:25 -0500 (Fri, 22 Jan 2010) New Revision: 8834 Added: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/AardvarkProtocolTest.java Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/InterceptorTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ProducerTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/SessionTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/PingTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * sync with the trunk: svn merge -r 8821:8832 https://svn.jboss.org/repos/hornetq/trunk Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/InterceptorTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -25,12 +25,12 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; -import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.ServerMessage; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.ServiceTestBase; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -28,10 +28,10 @@ import org.hornetq.api.core.client.MessageHandler; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.impl.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.ServiceTestBase; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -24,12 +24,12 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQSession; import org.hornetq.jms.server.impl.JMSServerManagerImpl; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.integration.jms.server.management.NullInitialContext; import org.hornetq.tests.util.UnitTestCase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -12,12 +12,12 @@ import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.impl.PacketImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; +import org.hornetq.spi.core.protocol.RemotingConnection; /** * Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -20,7 +20,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.impl.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -27,8 +27,8 @@ import org.hornetq.core.protocol.core.Channel; import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; -import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; +import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ProducerTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -26,9 +26,9 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.impl.PacketImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.ServiceTestBase; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -21,11 +21,11 @@ import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.UnitTestCase; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/SessionTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -29,9 +29,9 @@ import org.hornetq.api.core.client.ClientSession.BindingQuery; import org.hornetq.api.core.client.ClientSession.QueueQuery; import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.ServiceTestBase; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -28,13 +28,13 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.protocol.core.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.hornetq.core.protocol.core.impl.RemotingConnectionImpl; import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -20,8 +20,8 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.hornetq.spi.core.protocol.RemotingConnection; /** * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a> Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -19,7 +19,7 @@ import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.spi.core.protocol.RemotingConnection; /** * Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -27,7 +27,6 @@ import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; @@ -36,6 +35,7 @@ import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.cluster.impl.BridgeImpl; import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.spi.core.protocol.RemotingConnection; /** * A BridgeReconnectTest Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -31,7 +31,7 @@ import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.client.impl.DelegatingSession; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.spi.core.protocol.RemotingConnection; /** * A MultiThreadFailoverTest Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -16,8 +16,8 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.hornetq.spi.core.protocol.RemotingConnection; /** * A DelayInterceptor Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -17,8 +17,8 @@ import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.hornetq.spi.core.protocol.RemotingConnection; /** * A DelayInterceptor2 Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -17,8 +17,8 @@ import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.impl.PacketImpl; +import org.hornetq.spi.core.protocol.RemotingConnection; /** * A DelayInterceptor3 Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -35,10 +35,10 @@ import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.transaction.impl.XidImpl; import org.hornetq.jms.client.HornetQTextMessage; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.RandomUtil; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -22,10 +22,10 @@ import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.cluster.MessageFlowRecord; import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -30,11 +30,11 @@ import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.replication.impl.ReplicationEndpointImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.impl.HornetQServerImpl; import org.hornetq.core.settings.impl.AddressSettings; +import org.hornetq.spi.core.protocol.RemotingConnection; /** * A PagingFailoverTest Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -26,8 +26,8 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.client.impl.ClientSessionInternal; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.settings.impl.AddressSettings; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -26,7 +26,7 @@ import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.impl.RemotingConnectionImpl; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -31,7 +31,7 @@ import org.hornetq.api.core.client.MessageHandler; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.impl.RemotingConnectionImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.tests.util.ServiceTestBase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -29,11 +29,11 @@ import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.server.HornetQServer; import org.hornetq.jms.client.HornetQTextMessage; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.ServiceTestBase; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -25,11 +25,10 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.protocol.core.PacketDecoder; -import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyAcceptor; import org.hornetq.integration.transports.netty.NettyConnector; import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -32,9 +32,9 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQSession; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.JMSTestBase; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -38,7 +38,6 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; @@ -46,6 +45,7 @@ import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.client.HornetQSession; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -37,7 +37,6 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; @@ -45,6 +44,7 @@ import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.client.HornetQSession; import org.hornetq.jms.client.HornetQTopic; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -27,7 +27,7 @@ import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -26,9 +26,9 @@ import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQSession; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.JMSTestBase; /** Copied: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/AardvarkProtocolTest.java (from rev 8832, trunk/tests/src/org/hornetq/tests/integration/remoting/AardvarkProtocolTest.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/AardvarkProtocolTest.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/AardvarkProtocolTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -0,0 +1,101 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.tests.integration.remoting; + +import java.io.BufferedOutputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.util.HashMap; +import java.util.Map; + +import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.integration.transports.netty.NettyAcceptorFactory; +import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.spi.core.protocol.ProtocolType; +import org.hornetq.tests.util.ServiceTestBase; + +/** + * An AardvarkProtocolTest + * + * @author Tim Fox + * + * + */ +public class AardvarkProtocolTest extends ServiceTestBase +{ + private static final Logger log = Logger.getLogger(AardvarkProtocolTest.class); + + public void testAardvark() throws Exception + { + RemotingServiceImpl.hackProtocol = ProtocolType.AARDVARK; + + Configuration config = new ConfigurationImpl(); + + config.setSecurityEnabled(false); + config.setPersistenceEnabled(false); + + Map<String, Object> params = new HashMap<String, Object>(); + + params.put(TransportConstants.PORT_PROP_NAME, 9876); + params.put(TransportConstants.HOST_PROP_NAME, "127.0.0.1"); + + TransportConfiguration tc = new TransportConfiguration(NettyAcceptorFactory.class.getCanonicalName(), + params); + + config.getAcceptorConfigurations().add(tc); + + HornetQServer server = HornetQServers.newHornetQServer(config); + + server.start(); + + //Now we should be able to make a connection to this port and talk the Aardvark protocol! + + Socket socket = new Socket("127.0.0.1", 9876); + + + + OutputStream out = new BufferedOutputStream(socket.getOutputStream()); + + String s = "AARDVARK!\n"; + + byte[] bytes = s.getBytes("UTF-8"); + + out.write(bytes); + + out.flush(); + + InputStream in = socket.getInputStream(); + + log.info("writing bytes"); + byte b; + + while ((b = (byte)in.read()) != '\n') + { + log.info("read " + (char)b); + } + + socket.close(); + + server.stop(); + + RemotingServiceImpl.hackProtocol = ProtocolType.CORE; + } +} Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/PingTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -33,11 +33,11 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.impl.PacketImpl; import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.ServiceTestBase; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -59,7 +59,6 @@ import org.hornetq.core.persistence.impl.journal.JournalStorageManager; import org.hornetq.core.persistence.impl.journal.OperationContextImpl; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.replication.impl.ReplicatedJournal; import org.hornetq.core.replication.impl.ReplicationManagerImpl; @@ -69,6 +68,7 @@ import org.hornetq.core.server.impl.ServerMessageImpl; import org.hornetq.core.settings.HierarchicalRepository; import org.hornetq.core.settings.impl.AddressSettings; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.utils.ExecutorFactory; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -58,6 +58,7 @@ import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; import org.hornetq.jms.server.config.impl.QueueConfigurationImpl; import org.hornetq.jms.server.impl.JMSServerManagerImpl; +import org.hornetq.spi.core.protocol.ProtocolType; public class StompTest extends TestCase { private static final transient Logger log = Logger.getLogger(StompTest.class); @@ -852,7 +853,7 @@ config.setPersistenceEnabled(false); Map<String, Object> params = new HashMap<String, Object>(); - params.put(TransportConstants.PROTOCOL_PROP_NAME, TransportConstants.STOMP_PROTOCOL); + params.put(TransportConstants.PROTOCOL_PROP_NAME, ProtocolType.STOMP.toString()); params.put(TransportConstants.PORT_PROP_NAME, TransportConstants.DEFAULT_STOMP_PORT); TransportConfiguration stompTransport = new TransportConfiguration(NettyAcceptorFactory.class.getName(), params); config.getAcceptorConfigurations().add(stompTransport); Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -25,9 +25,9 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.Packet; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.impl.PacketImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.integration.remoting.PingTest; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -36,9 +36,9 @@ import org.hornetq.core.client.impl.ClientConsumerInternal; import org.hornetq.core.client.impl.ClientMessageInternal; import org.hornetq.core.client.impl.LargeMessageBufferImpl; -import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -21,10 +21,10 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyAcceptor; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.ServerHolder; +import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.spi.core.remoting.Acceptor; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -22,10 +22,10 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyAcceptor; import org.hornetq.integration.transports.netty.ServerHolder; import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -22,8 +22,8 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; -import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyConnection; +import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; import org.hornetq.tests.util.RandomUtil; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2010-01-22 09:57:54 UTC (rev 8833) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2010-01-22 10:16:25 UTC (rev 8834) @@ -21,8 +21,8 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; -import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyConnector; +import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener;