Author: jmesnil Date: 2010-01-21 09:37:33 -0500 (Thu, 21 Jan 2010) New Revision: 8823 Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnection.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnector.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/BufferHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java 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/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/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/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/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/http/NettyHttpTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.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/integration/xa/BasicXaTest.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/DummyServerHolder.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 8806:8821 https://svn.jboss.org/repos/hornetq/trunk Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -16,9 +16,9 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import org.hornetq.integration.stomp.StompFrameDelimiter; -import org.hornetq.integration.stomp.StompMarshaller; -import org.hornetq.integration.stomp.StompPacketDecoder; +import org.hornetq.integration.protocol.stomp.StompFrameDelimiter; +import org.hornetq.integration.protocol.stomp.StompMarshaller; +import org.hornetq.integration.protocol.stomp.StompPacketDecoder; import org.hornetq.spi.core.remoting.BufferHandler; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.ssl.SslHandler; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -39,25 +39,21 @@ import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.PacketDecoder; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.CorePacketDecoder; import org.hornetq.core.remoting.impl.ssl.SSLSupport; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.ServerSession; import org.hornetq.core.server.impl.ServerMessageImpl; import org.hornetq.core.server.management.Notification; import org.hornetq.core.server.management.NotificationService; -import org.hornetq.integration.stomp.Stomp; -import org.hornetq.integration.stomp.StompDestinationConverter; -import org.hornetq.integration.stomp.StompException; -import org.hornetq.integration.stomp.StompFrame; -import org.hornetq.integration.stomp.StompMarshaller; +import org.hornetq.integration.protocol.stomp.Stomp; +import org.hornetq.integration.protocol.stomp.StompDestinationConverter; +import org.hornetq.integration.protocol.stomp.StompException; +import org.hornetq.integration.protocol.stomp.StompFrame; +import org.hornetq.integration.protocol.stomp.StompMarshaller; import org.hornetq.jms.client.HornetQBytesMessage; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.spi.core.remoting.Acceptor; @@ -329,9 +325,7 @@ else { ChannelPipelineSupport.addHornetQCodecFilter(pipeline, handler); - PacketDecoder decoder = new CorePacketDecoder(); pipeline.addLast("handler", new HornetQServerChannelHandler(channelGroup, - decoder, handler, new Listener())); } @@ -527,18 +521,14 @@ private final class HornetQServerChannelHandler extends AbstractServerChannelHandler { - private PacketDecoder decoder; - private BufferHandler handler; HornetQServerChannelHandler(final ChannelGroup group, - final PacketDecoder decoder, final BufferHandler handler, final ConnectionLifeCycleListener listener) { super(group, listener); - this.decoder = decoder; this.handler = handler; } @@ -547,7 +537,7 @@ { ChannelBuffer buffer = (ChannelBuffer)e.getMessage(); - handler.bufferReceived(e.getChannel().getId(), new ChannelBufferWrapper(buffer), decoder); + handler.bufferReceived(e.getChannel().getId(), new ChannelBufferWrapper(buffer)); } } @@ -578,7 +568,7 @@ // need to interact with HornetQ server & session HornetQServer server = serverHandler.getServer(); - RemotingConnection connection = serverHandler.getRemotingConnection(e.getChannel().getId()); + CoreRemotingConnection connection = serverHandler.getRemotingConnection(e.getChannel().getId()); try { @@ -655,19 +645,17 @@ * @throws StompException * @throws HornetQException */ - private StompFrame onSubscribe(StompFrame frame, HornetQServer server, RemotingConnection connection) throws StompException, HornetQException + private StompFrame onSubscribe(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception, StompException, HornetQException { Map<String, Object> headers = frame.getHeaders(); String queue = (String)headers.get(Stomp.Headers.Send.DESTINATION); SimpleString queueName = StompDestinationConverter.convertDestination(queue); ServerSession session = checkAndGetSession(connection); - long id = server.getStorageManager().generateUniqueID(); - SessionCreateConsumerMessage packet = new SessionCreateConsumerMessage(id , queueName, null, false, false); - session.handleCreateConsumer(packet); - SessionConsumerFlowCreditMessage credits = new SessionConsumerFlowCreditMessage(id, -1); - session.handleReceiveConsumerCredits(credits ); - session.handleStart(new PacketImpl(PacketImpl.SESS_START)); + long consumerID = server.getStorageManager().generateUniqueID(); + session.createConsumer(consumerID, queueName, null, false); + session.receiveConsumerCredits(consumerID, -1); + session.start(); return null; } @@ -700,7 +688,7 @@ return null; } - private StompFrame onSend(StompFrame frame, HornetQServer server, RemotingConnection connection) throws HornetQException, StompException + private StompFrame onSend(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception { ServerSession session = checkAndGetSession(connection); @@ -737,8 +725,7 @@ message.getBodyBuffer().writeBytes(content); } - SessionSendMessage packet = new SessionSendMessage(message, false); - session.handleSend(packet); + session.send(message); if (headers.containsKey(Stomp.Headers.RECEIPT_REQUESTED)) { Map<String, Object> h = new HashMap<String, Object>(); @@ -751,7 +738,7 @@ } } - private StompFrame onConnect(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception + private StompFrame onConnect(StompFrame frame, HornetQServer server, CoreRemotingConnection connection) throws Exception { Map<String, Object> headers = frame.getHeaders(); String login = (String)headers.get(Stomp.Headers.Connect.LOGIN); @@ -760,17 +747,14 @@ String name = UUIDGenerator.getInstance().generateStringUUID(); server.createSession(name, - 1, login, passcode, HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - VersionLoader.getVersion().getIncrementingVersion(), connection, true, true, false, - false, - -1); + false); ServerSession session = server.getSession(name); sessions.put(connection, session); System.out.println(">>> created session " + session); @@ -821,14 +805,14 @@ private class Listener implements ConnectionLifeCycleListener { - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { if (connections.putIfAbsent(connection.getID(), connection) != null) { throw new IllegalArgumentException("Connection already exists with id " + connection.getID()); } - listener.connectionCreated(connection); + listener.connectionCreated(connection, protocol); } public void connectionDestroyed(final Object connectionID) Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnection.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -16,6 +16,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; import org.jboss.netty.buffer.ChannelBuffers; @@ -54,7 +55,7 @@ this.listener = listener; - listener.connectionCreated(this); + listener.connectionCreated(this, ProtocolType.CORE); } // Public -------------------------------------------------------- Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnector.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -31,8 +31,8 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.PacketDecoder; -import org.hornetq.core.remoting.impl.CorePacketDecoder; +import org.hornetq.core.protocol.core.PacketDecoder; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.core.remoting.impl.ssl.SSLSupport; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; @@ -97,7 +97,7 @@ private final BufferHandler handler; - private final PacketDecoder decoder = new CorePacketDecoder(); + private final PacketDecoder decoder = new PacketDecoder(); private final ConnectionLifeCycleListener listener; @@ -457,7 +457,7 @@ { ChannelBuffer buffer = (ChannelBuffer)e.getMessage(); - handler.bufferReceived(e.getChannel().getId(), new ChannelBufferWrapper(buffer), decoder); + handler.bufferReceived(e.getChannel().getId(), new ChannelBufferWrapper(buffer)); } } @@ -614,7 +614,7 @@ private class Listener implements ConnectionLifeCycleListener { - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { if (connections.putIfAbsent(connection.getID(), connection) != null) { Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -13,7 +13,7 @@ package org.hornetq.integration.transports.netty; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.server.HornetQServer; /** @@ -27,5 +27,6 @@ { HornetQServer getServer(); - RemotingConnection getRemotingConnection(int connectionID); + // FIXME should NOT be CoreRemotingConnection but RemotingConnection + CoreRemotingConnection getRemotingConnection(int connectionID); } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/BufferHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/BufferHandler.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/BufferHandler.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -13,7 +13,6 @@ package org.hornetq.spi.core.remoting; import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.remoting.PacketDecoder; /** * A BufferHandler that will handle buffers received by an acceptor. @@ -30,5 +29,5 @@ * @param connectionID the connection the buffer was received on * @param buffer the buffer to decode */ - void bufferReceived(Object connectionID, HornetQBuffer buffer, PacketDecoder decoder); + void bufferReceived(Object connectionID, HornetQBuffer buffer); } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -13,6 +13,7 @@ package org.hornetq.spi.core.remoting; import org.hornetq.api.core.HornetQException; +import org.hornetq.core.remoting.ProtocolType; /** * A ConnectionLifeCycleListener is called by the remoting implementation to notify of connection events. @@ -26,7 +27,7 @@ * * @param connection the connection that has been created */ - void connectionCreated(Connection connection); + void connectionCreated(Connection connection, ProtocolType protocol); /** * called when a connection is destroyed. 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -24,11 +24,11 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +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.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.ServerMessage; 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -27,9 +27,9 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.tests.util.ServiceTestBase; 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -11,11 +11,11 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; 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.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -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.remoting.impl.wireformat.PacketImpl; +import org.hornetq.core.protocol.core.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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -24,12 +24,12 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.client.impl.FailoverManagerImpl; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; +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.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; @@ -51,7 +51,7 @@ private HornetQServer server; - private RemotingConnection connection; + private CoreRemotingConnection connection; // Static -------------------------------------------------------- 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -25,9 +25,9 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -27,12 +27,12 @@ import org.hornetq.core.client.impl.ClientSessionInternal; 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.remoting.CloseListener; -import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.RandomUtil; 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -19,9 +19,9 @@ import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +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.remoting.impl.wireformat.SessionReceiveMessage; /** * @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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -18,7 +18,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; import org.hornetq.core.remoting.RemotingConnection; /** 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -15,9 +15,9 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; /** * 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -16,9 +16,9 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; /** * 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -16,9 +16,9 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; /** * A DelayInterceptor3 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -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.remoting.impl.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -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.remoting.impl.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.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/http/NettyHttpTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -25,7 +25,8 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.PacketDecoder; +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; @@ -482,7 +483,7 @@ this.latch = latch; } - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { int i = buffer.readInt(); messages.add(i); @@ -504,7 +505,7 @@ this.latch = latch; } - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { int i = buffer.readInt(); @@ -537,7 +538,7 @@ return 0; } - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { int i = buffer.readInt(); messages.add(i); @@ -557,7 +558,7 @@ latch = connCreatedLatch; } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { this.connection = connection; if (latch != null) Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -152,8 +152,7 @@ ClientSessionFactory sf = createInVMFactory(); if (sendingBlocking) - { - sf.setBlockOnNonDurableSend(true); + { sf.setBlockOnNonDurableSend(true); sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); } @@ -523,7 +522,7 @@ } session.close(); - + long globalSize = server.getPostOffice().getPagingManager().getTotalMemory(); Assert.assertEquals(0l, globalSize); Assert.assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getDeliveringCount()); 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -22,16 +22,20 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.*; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.config.Configuration; 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.remoting.CloseListener; -import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; @@ -345,14 +349,14 @@ session.addFailureListener(clientListener); - RemotingConnection serverConn = null; + CoreRemotingConnection serverConn = null; while (serverConn == null) { Set<RemotingConnection> conns = server.getRemotingService().getConnections(); if (!conns.isEmpty()) { - serverConn = server.getRemotingService().getConnections().iterator().next(); + serverConn = (CoreRemotingConnection)server.getRemotingService().getConnections().iterator().next(); } else { 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -58,7 +58,7 @@ import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.persistence.impl.journal.JournalStorageManager; import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.remoting.Packet; +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; 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -49,7 +49,7 @@ import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.stomp.Stomp; +import org.hornetq.integration.protocol.stomp.Stomp; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.jms.client.HornetQConnectionFactory; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -160,6 +160,8 @@ clientSession = sessionFactory.createSession(true, false, false); + log.info("committing"); + clientSession.commit(xid, false); clientSession.start(); ClientConsumer clientConsumer = clientSession.createConsumer(atestq); 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -24,9 +24,9 @@ import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.integration.remoting.PingTest; import org.hornetq.tests.util.RandomUtil; 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -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.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; +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.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/DummyServerHolder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/DummyServerHolder.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/DummyServerHolder.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -13,7 +13,7 @@ package org.hornetq.tests.unit.core.remoting.impl.netty; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.ServerHolder; @@ -31,7 +31,7 @@ return null; } - public RemotingConnection getRemotingConnection(int connectionID) + public CoreRemotingConnection getRemotingConnection(int connectionID) { return null; } 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -21,7 +21,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.PacketDecoder; +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; @@ -48,7 +48,7 @@ BufferHandler handler = new BufferHandler() { - public void bufferReceived(Object connectionID, HornetQBuffer buffer, PacketDecoder decoder) + public void bufferReceived(Object connectionID, HornetQBuffer buffer) { } }; @@ -64,7 +64,7 @@ { } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } }; 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -22,7 +22,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.PacketDecoder; +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; @@ -61,7 +61,7 @@ BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { } }; @@ -78,7 +78,7 @@ { } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } }; 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -22,6 +22,7 @@ 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.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; @@ -219,7 +220,7 @@ class MyListener implements ConnectionLifeCycleListener { - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } 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-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -21,7 +21,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; -import org.hornetq.core.remoting.PacketDecoder; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyConnector; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; @@ -51,7 +51,7 @@ { BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { } }; @@ -66,7 +66,7 @@ { } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } }; @@ -88,7 +88,7 @@ { BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { } }; @@ -103,7 +103,7 @@ { } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } };