[jboss-cvs] JBoss Messaging SVN: r4857 - in trunk: src/main/org/jboss/messaging/core/client and 32 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 21 09:32:31 EDT 2008
Author: timfox
Date: 2008-08-21 09:32:30 -0400 (Thu, 21 Aug 2008)
New Revision: 4857
Added:
trunk/src/main/org/jboss/messaging/core/remoting/CommandManager.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/CommandManagerImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptor.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptorFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnection.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnectorFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMRegistry.java
trunk/src/main/org/jboss/messaging/core/remoting/spi/ConnectionLifeCycleListener.java
trunk/src/main/org/jboss/messaging/core/remoting/spi/MessagingBuffer.java
Removed:
trunk/src/main/org/jboss/messaging/core/remoting/ConnectionLifeCycleListener.java
trunk/src/main/org/jboss/messaging/core/remoting/MessagingBuffer.java
trunk/src/main/org/jboss/messaging/core/server/CommandManager.java
trunk/src/main/org/jboss/messaging/core/server/impl/CommandManagerImpl.java
Modified:
trunk/src/config/jbm-configuration.xml
trunk/src/config/jbm-connector-factories.properties
trunk/src/main/org/jboss/messaging/core/client/Location.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java
trunk/src/main/org/jboss/messaging/core/config/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/journal/EncodingSupport.java
trunk/src/main/org/jboss/messaging/core/message/Message.java
trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
trunk/src/main/org/jboss/messaging/core/remoting/Packet.java
trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnection.java
trunk/src/main/org/jboss/messaging/core/remoting/RemotingHandler.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/ByteBufferWrapper.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/ExpandingMessagingBuffer.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingHandlerImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/ResponseHandlerImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/IoBufferWrapper.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptorFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnection.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnectorFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/ChannelBufferWrapper.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/MessagingChannelHandler.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyAcceptor.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyAcceptorFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnection.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnectorFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerFlowCreditMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketsConfirmedMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerFlowCreditMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAddDestinationMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserHasNextMessageResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCancelMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateQueueMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRemoveDestinationMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXACommitMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAEndMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAForgetMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAJoinMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAPrepareMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResumeMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXARollbackMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAStartMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/XidCodecSupport.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/cluster/ConsumerReplicateDeliveryMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/cluster/ConsumerReplicateDeliveryResponseMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/spi/AcceptorFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/spi/Connection.java
trunk/src/main/org/jboss/messaging/core/remoting/spi/ConnectorFactory.java
trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerMessageImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
trunk/src/main/org/jboss/messaging/util/TypedProperties.java
trunk/tests/src/org/jboss/messaging/tests/timing/core/client/impl/ClientConsumerImplTest.java
trunk/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingConnectionImplTest.java
trunk/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingHandlerImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientBrowserImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConsumerImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConsumerPacketHandlerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerPacketHandlerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionFactoryImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/SimpleEncoding.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory1.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory2.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory3.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ByteBufferWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectionRegistryImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ExpandingMessagingBufferTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingHandlerImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapper2Test.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/DeliveryImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerBrowserImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerConsumerPacketHandlerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerProducerImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerProducerPacketHandlerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerSessionImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerSessionPacketHandlerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java
Log:
Moved command manager and added invm transport
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/config/jbm-configuration.xml 2008-08-21 13:32:30 UTC (rev 4857)
@@ -74,7 +74,8 @@
-->
<remoting-acceptor-factories>
- <class-name>org.jboss.messaging.core.remoting.impl.mina.MinaAcceptorFactory</class-name>
+ <class-name>org.jboss.messaging.core.remoting.impl.mina.MinaAcceptorFactory</class-name>
+ <class-name>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</class-name>
</remoting-acceptor-factories>
<!-- Storage configuration -->
Modified: trunk/src/config/jbm-connector-factories.properties
===================================================================
--- trunk/src/config/jbm-connector-factories.properties 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/config/jbm-connector-factories.properties 2008-08-21 13:32:30 UTC (rev 4857)
@@ -1 +1,2 @@
-TCP=org.jboss.messaging.core.remoting.impl.mina.MinaConnectorFactory
\ No newline at end of file
+TCP=org.jboss.messaging.core.remoting.impl.mina.MinaConnectorFactory
+INVM=org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/core/client/Location.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/Location.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/client/Location.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -41,5 +41,5 @@
int getPort();
- // public int getServerID();
+ int getServerID(); // For invm only
}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,10 +24,10 @@
import org.jboss.messaging.core.client.ClientBrowser;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
-import org.jboss.messaging.core.server.CommandManager;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -32,10 +32,10 @@
import org.jboss.messaging.core.list.PriorityLinkedList;
import org.jboss.messaging.core.list.impl.PriorityLinkedListImpl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowCreditMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
-import org.jboss.messaging.core.server.CommandManager;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,11 +23,11 @@
package org.jboss.messaging.core.client.impl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
-import org.jboss.messaging.core.server.CommandManager;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -40,8 +40,6 @@
{
private static final Logger log = Logger.getLogger(ClientConsumerPacketHandler.class);
- //private final ClientSessionInternal session;
-
private final ClientConsumerInternal clientConsumer;
private final long consumerID;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -28,10 +28,10 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.util.SimpleString;
import org.jboss.messaging.util.TokenBucketLimiter;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,11 +23,11 @@
package org.jboss.messaging.core.client.impl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerFlowCreditMessage;
-import org.jboss.messaging.core.server.CommandManager;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -27,16 +27,16 @@
import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.ConnectionRegistry;
import org.jboss.messaging.core.remoting.ConnectionRegistryLocator;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingConnection;
+import org.jboss.messaging.core.remoting.impl.CommandManagerImpl;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateSessionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateSessionResponseMessage;
-import org.jboss.messaging.core.server.CommandManager;
-import org.jboss.messaging.core.server.impl.CommandManagerImpl;
import org.jboss.messaging.core.version.Version;
import org.jboss.messaging.util.UUIDGenerator;
import org.jboss.messaging.util.VersionLoader;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -41,10 +41,10 @@
import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.ConnectionRegistry;
import org.jboss.messaging.core.remoting.ConnectionRegistryLocator;
import org.jboss.messaging.core.remoting.FailureListener;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingConnection;
@@ -79,7 +79,7 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
-import org.jboss.messaging.core.server.CommandManager;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.ExecutorFactory;
import org.jboss.messaging.util.JBMThreadFactory;
import org.jboss.messaging.util.OrderedExecutorFactory;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -39,6 +39,8 @@
private int port = ConfigurationImpl.DEFAULT_PORT;
+ private int serverID;
+
public LocationImpl(final TransportType transport, final String host, final int port)
{
if (transport != TransportType.TCP && transport != TransportType.HTTP)
@@ -51,10 +53,20 @@
this.port = port;
}
+ public LocationImpl(final int serverID)
+ {
+ this.serverID = serverID;
+ }
+
public LocationImpl(final TransportType transport, final String host)
{
this(transport, host, ConfigurationImpl.DEFAULT_PORT);
}
+
+ public int getServerID()
+ {
+ return serverID;
+ }
public String getLocation()
{
@@ -95,15 +107,15 @@
return false;
}
-// if (transport == TransportType.INVM)
-// {
-// return serverID == lother.getServerID();
-// }
-// else
-// {
+ if (transport == TransportType.INVM)
+ {
+ return serverID == lother.getServerID();
+ }
+ else
+ {
return this.transport.equals(lother.getTransport()) &&
this.host.equals(lother.getHost()) &&
this.port == lother.getPort();
- // }
+ }
}
}
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -78,8 +78,12 @@
ConnectionParams getConnectionParams();
- TransportType getTransport();
+ int getServerID(); //For INVM transport only
+ void setServerID(int serverID);
+
+ TransportType getTransport();
+
void setTransport(TransportType transport);
String getHost();
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -137,6 +137,8 @@
protected int journalMaxAIO = DEFAULT_JOURNAL_MAX_AIO;
// remoting config
+
+ protected int serverID;
protected TransportType transport = DEFAULT_TRANSPORT;
@@ -226,6 +228,16 @@
{
this.transport = transport;
}
+
+ public int getServerID()
+ {
+ return serverID;
+ }
+
+ public void setServerID(final int serverID)
+ {
+ this.serverID = serverID;
+ }
public String getHost()
{
Modified: trunk/src/main/org/jboss/messaging/core/journal/EncodingSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/EncodingSupport.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/journal/EncodingSupport.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.journal;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/message/Message.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/Message.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/message/Message.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -25,7 +25,7 @@
import java.util.Set;
import org.jboss.messaging.core.journal.EncodingSupport;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
/**
Modified: trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -31,7 +31,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
import org.jboss.messaging.util.TypedProperties;
Modified: trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -51,8 +51,8 @@
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.postoffice.impl.BindingImpl;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.JournalType;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.Queue;
Copied: trunk/src/main/org/jboss/messaging/core/remoting/CommandManager.java (from rev 4837, trunk/src/main/org/jboss/messaging/core/server/CommandManager.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/CommandManager.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/CommandManager.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.remoting;
+
+import org.jboss.messaging.core.exception.MessagingException;
+
+/**
+ * A CommandManagerImpl
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public interface CommandManager
+{
+ Packet sendCommandBlocking(long targetID, Packet packet) throws MessagingException;
+
+ void sendCommandOneway(long targetID, Packet packet);
+
+ void packetProcessed(Packet packet);
+
+ void close();
+}
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/ConnectionLifeCycleListener.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/ConnectionLifeCycleListener.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/ConnectionLifeCycleListener.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.messaging.core.remoting;
-
-import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.spi.Connection;
-
-/**
- *
- * A ConnectionLifeCycleListener
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- */
-public interface ConnectionLifeCycleListener
-{
- void connectionCreated(Connection connection);
-
- void connectionDestroyed(Object connectionID);
-
- void connectionException(Object connectionID, MessagingException me);
-}
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/MessagingBuffer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/MessagingBuffer.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/MessagingBuffer.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -1,125 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.messaging.core.remoting;
-
-import org.jboss.messaging.util.SimpleString;
-
-/**
- *
- * A MessagingBuffer
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- */
-public interface MessagingBuffer
-{
- void putByte(byte val);
-
- void putBytes(byte[] bytes);
-
- void putBytes(byte[] bytes, int offset, int length);
-
- void putInt(int val);
-
- void putInt(int pos, int val);
-
- void putLong(long val);
-
- void putShort(short val);
-
- void putDouble(double val);
-
- void putFloat(float val);
-
- void putBoolean(boolean val);
-
- void putChar(char val);
-
- void putNullableString(String val);
-
- void putString(String val);
-
- void putSimpleString(SimpleString val);
-
- void putNullableSimpleString(SimpleString val);
-
- void putUTF(String utf) throws Exception;
-
- byte getByte();
-
- short getUnsignedByte();
-
- void getBytes(byte[] bytes);
-
- void getBytes(byte[] bytes, int offset, int length);
-
- int getInt();
-
- long getLong();
-
- short getShort();
-
- int getUnsignedShort();
-
- double getDouble();
-
- float getFloat();
-
- boolean getBoolean();
-
- char getChar();
-
- String getString();
-
- String getNullableString();
-
- SimpleString getSimpleString();
-
- SimpleString getNullableSimpleString();
-
- String getUTF() throws Exception;
-
- byte[] array();
-
- int remaining();
-
- int capacity();
-
- int limit();
-
- void limit(int limit);
-
- void flip();
-
- void position(int position);
-
- int position();
-
- void rewind();
-
- MessagingBuffer slice();
-
- MessagingBuffer createNewBuffer(int len);
-
- Object getUnderlyingBuffer();
-}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/Packet.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/Packet.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/Packet.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,8 +22,10 @@
package org.jboss.messaging.core.remoting;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
+
/**
*
* A Packet
Modified: trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnection.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnection.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.server.CommandManager;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/remoting/RemotingHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/RemotingHandler.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/RemotingHandler.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,6 +23,8 @@
import java.util.Set;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
+
/**
*
* A RemotingHandler
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ByteBufferWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ByteBufferWrapper.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ByteBufferWrapper.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -31,7 +31,7 @@
import java.nio.CharBuffer;
import java.nio.charset.Charset;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
/**
Copied: trunk/src/main/org/jboss/messaging/core/remoting/impl/CommandManagerImpl.java (from rev 4837, trunk/src/main/org/jboss/messaging/core/server/impl/CommandManagerImpl.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/CommandManagerImpl.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/CommandManagerImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -0,0 +1,177 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.remoting.impl;
+
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
+import org.jboss.messaging.core.remoting.Packet;
+import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.PacketHandler;
+import org.jboss.messaging.core.remoting.RemotingConnection;
+import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketsConfirmedMessage;
+
+/**
+ * A CommandManagerImpl
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class CommandManagerImpl implements CommandManager, PacketHandler
+{
+ private static final Logger log = Logger.getLogger(CommandManagerImpl.class);
+
+ private final java.util.Queue<Packet> resendCache = new ConcurrentLinkedQueue<Packet>();
+
+ private final int commandBatchSize;
+
+ //These members don't need to be synchronized since only called by one thread concurrently
+ //but do need to be volatile since that could be a different thread each time
+
+ private volatile int lastCommandID = -1;
+
+ private volatile int nextConfirmation;
+
+ private volatile int commandIDSequence = 0;
+
+ private final RemotingConnection remotingConnection;
+
+ private final long sessionTargetID;
+
+ private final long localCommandResponseTargetID;
+
+ private final long remoteCommandResponseTargetID;
+
+ public CommandManagerImpl(final int commandBatchSize, final RemotingConnection remotingConnection,
+ final PacketDispatcher dispatcher,
+ final long sessionTargetID,
+ final long localCommandResponseTargetID,
+ final long remoteCommandResponseTargetID)
+ {
+ this.commandBatchSize = commandBatchSize;
+
+ nextConfirmation = commandBatchSize - 1;
+
+ this.remotingConnection = remotingConnection;
+
+ this.sessionTargetID = sessionTargetID;
+
+ this.localCommandResponseTargetID = localCommandResponseTargetID;
+
+ this.remoteCommandResponseTargetID = remoteCommandResponseTargetID;
+
+ dispatcher.register(this);
+ }
+
+ //Needs to be synchronized since on the server messages can be sent to the client same time as blocking
+ //responses are returned
+ public synchronized Packet sendCommandBlocking(final long targetID, final Packet packet) throws MessagingException
+ {
+ setCommandID(packet);
+
+ Packet response = remotingConnection.sendBlocking(targetID, sessionTargetID, packet, this);
+
+ if (response.getType() == PacketImpl.EXCEPTION)
+ {
+ MessagingExceptionMessage mem = (MessagingExceptionMessage)response;
+
+ throw mem.getException();
+ }
+
+ return response;
+ }
+
+ public synchronized void sendCommandOneway(final long targetID, final Packet packet)
+ {
+ setCommandID(packet);
+
+ remotingConnection.sendOneWay(targetID, sessionTargetID, packet);
+ }
+
+ public void packetProcessed(final Packet packet)
+ {
+ long commandID = packet.getCommandID();
+
+ if (commandID != ++lastCommandID)
+ {
+ throw new IllegalStateException("Command id out of sequence, got " + commandID + " expected " + lastCommandID);
+ }
+
+ if (commandID == nextConfirmation)
+ {
+ Packet confirmed = new PacketsConfirmedMessage(lastCommandID);
+
+ confirmed.setTargetID(remoteCommandResponseTargetID);
+
+ nextConfirmation += commandBatchSize;
+
+ remotingConnection.sendOneWay(confirmed);
+ }
+ }
+
+ public void close()
+ {
+ remotingConnection.getPacketDispatcher().unregister(localCommandResponseTargetID);
+ }
+
+ // PacketHandler implementation --------------------------------------------------------------
+
+ public long getID()
+ {
+ return localCommandResponseTargetID;
+ }
+
+ public void handle(final Object connectionID, final Packet m)
+ {
+ PacketsConfirmedMessage msg = (PacketsConfirmedMessage)m;
+
+ Packet packet;
+ do
+ {
+ packet = resendCache.poll();
+ }
+ while (packet.getCommandID() < msg.getCommandID());
+ }
+
+ // Public -----------------------------------------------------------------------------------
+
+ public int getUnconfirmedPackets()
+ {
+ return this.resendCache.size();
+ }
+
+ // Private -----------------------------------------------------------------------------------
+
+ private void setCommandID(final Packet packet)
+ {
+ int commandID = commandIDSequence++;
+
+ packet.setCommandID(commandID);
+
+ resendCache.add(packet);
+ }
+
+}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -30,13 +30,13 @@
import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.ConnectionRegistry;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.spi.Connector;
import org.jboss.messaging.core.remoting.spi.ConnectorFactory;
import org.jboss.messaging.util.JBMThreadFactory;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ExpandingMessagingBuffer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ExpandingMessagingBuffer.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ExpandingMessagingBuffer.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -27,7 +27,7 @@
import java.nio.ByteBuffer;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -31,15 +31,15 @@
import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.FailureListener;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.spi.Connection;
-import org.jboss.messaging.core.server.CommandManager;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* @author <a href="tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingHandlerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingHandlerImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingHandlerImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -36,7 +36,6 @@
import java.util.concurrent.ExecutorService;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingHandler;
@@ -81,6 +80,7 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.cluster.ConsumerReplicateDeliveryMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.cluster.ConsumerReplicateDeliveryResponseMessage;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.ExecutorFactory;
import org.jboss.messaging.util.OrderedExecutorFactory;
@@ -142,7 +142,7 @@
}
public void bufferReceived(final Object connectionID, final MessagingBuffer buffer) throws Exception
- {
+ {
final Packet packet = decode(connectionID, buffer);
if (executorFactory != null)
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingServiceImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -36,7 +36,6 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.Interceptor;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingConnection;
@@ -45,6 +44,7 @@
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.AcceptorFactory;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.util.JBMThreadFactory;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ResponseHandlerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ResponseHandlerImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ResponseHandlerImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,9 +22,9 @@
package org.jboss.messaging.core.remoting.impl;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.ResponseHandler;
-import org.jboss.messaging.core.server.CommandManager;
/**
*
Added: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptor.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptor.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -0,0 +1,158 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.remoting.impl.invm;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.remoting.RemotingHandler;
+import org.jboss.messaging.core.remoting.spi.Acceptor;
+import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+
+/**
+ * A InVMAcceptor
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class InVMAcceptor implements Acceptor
+{
+ private final int id;
+
+ private final RemotingHandler handler;
+
+ private final ConnectionLifeCycleListener listener;
+
+ private ConcurrentMap<String, Connection> connections = new ConcurrentHashMap<String, Connection>();
+
+ private volatile boolean started;
+
+ public InVMAcceptor(final int id, final RemotingHandler handler,
+ final ConnectionLifeCycleListener listener)
+ {
+ this.id = id;
+
+ this.handler = handler;
+
+ this.listener = listener;
+ }
+
+ public synchronized void start() throws Exception
+ {
+ if (started)
+ {
+ return;
+ }
+
+ InVMRegistry registry = InVMRegistry.instance;
+
+ registry.registerAcceptor(id, this);
+
+ started = true;
+ }
+
+ public synchronized void stop()
+ {
+ if (!started)
+ {
+ return;
+ }
+
+ for (Connection connection: connections.values())
+ {
+ listener.connectionDestroyed(connection.getID());
+ }
+
+ connections.clear();
+
+ InVMRegistry.instance.unregisterAcceptor(id);
+
+ started = true;
+ }
+
+ public RemotingHandler getHandler()
+ {
+ if (!started)
+ {
+ throw new IllegalStateException("Acceptor is not started");
+ }
+
+ return handler;
+ }
+
+ public void connect(final String connectionID, final RemotingHandler remoteHandler)
+ {
+ if (!started)
+ {
+ throw new IllegalStateException("Acceptor is not started");
+ }
+
+ new InVMConnection(connectionID, remoteHandler, new Listener());
+ }
+
+ public void disconnect(final String connectionID)
+ {
+ if (!started)
+ {
+ throw new IllegalStateException("Acceptor is not started");
+ }
+
+ Connection conn = connections.get(connectionID);
+
+ if (conn != null)
+ {
+ conn.close();
+ }
+ }
+
+ private class Listener implements ConnectionLifeCycleListener
+ {
+ public void connectionCreated(Connection connection)
+ {
+ if (connections.putIfAbsent((String)connection.getID(), connection) != null)
+ {
+ throw new IllegalArgumentException("Connection already exists with id " + connection.getID());
+ }
+
+ listener.connectionCreated(connection);
+ }
+
+ public void connectionDestroyed(Object connectionID)
+ {
+ if (connections.remove(connectionID) != null)
+ {
+ throw new IllegalArgumentException("Cannot find connection with id " + connectionID + " to remove");
+ }
+
+ listener.connectionDestroyed(connectionID);
+ }
+
+ public void connectionException(Object connectionID, MessagingException me)
+ {
+ listener.connectionException(connectionID, me);
+ }
+
+ }
+
+}
Added: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptorFactory.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptorFactory.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.remoting.impl.invm;
+
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.remoting.RemotingHandler;
+import org.jboss.messaging.core.remoting.spi.Acceptor;
+import org.jboss.messaging.core.remoting.spi.AcceptorFactory;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+
+/**
+ * A InVMAcceptorFactory
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class InVMAcceptorFactory implements AcceptorFactory
+{
+
+ public Acceptor createAcceptor(final Configuration configuration,
+ final RemotingHandler handler, final ConnectionLifeCycleListener listener)
+ {
+ return new InVMAcceptor(configuration.getServerID(), handler, listener);
+ }
+
+}
Added: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnection.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnection.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -0,0 +1,107 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.remoting.impl.invm;
+
+import java.nio.ByteBuffer;
+
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.RemotingHandler;
+import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
+import org.jboss.messaging.util.UUIDGenerator;
+
+/**
+ * A InVMConnection
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class InVMConnection implements Connection
+{
+ private static final Logger log = Logger.getLogger(InVMConnection.class);
+
+ private final RemotingHandler handler;
+
+ private final ConnectionLifeCycleListener listener;
+
+ private final String id;
+
+ private volatile boolean started;
+
+ public InVMConnection(final RemotingHandler handler, final ConnectionLifeCycleListener listener)
+ {
+ this (UUIDGenerator.getInstance().generateSimpleStringUUID().toString(), handler, listener);
+ }
+
+ public InVMConnection(final String id, final RemotingHandler handler, final ConnectionLifeCycleListener listener)
+ {
+ this.handler = handler;
+
+ this.listener = listener;
+
+ this.id = id;
+
+ listener.connectionCreated(this);
+
+ started = true;
+ }
+
+ public void close()
+ {
+ if (!started)
+ {
+ return;
+ }
+
+ listener.connectionDestroyed(id);
+
+ started = false;
+ }
+
+ public MessagingBuffer createBuffer(int size)
+ {
+ return new ByteBufferWrapper(ByteBuffer.allocate(size));
+ }
+
+ public Object getID()
+ {
+ return id;
+ }
+
+ public void write(MessagingBuffer buffer)
+ {
+ try
+ {
+ buffer.getInt(); //read and discard
+ handler.bufferReceived(id, buffer);
+ }
+ catch (Exception e)
+ {
+ final String msg = "Failed to write to handler";
+ log.error(msg, e);
+ throw new IllegalStateException(msg, e);
+ }
+ }
+
+}
Added: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnector.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnector.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.remoting.impl.invm;
+
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.remoting.RemotingHandler;
+import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+import org.jboss.messaging.core.remoting.spi.Connector;
+
+/**
+ * A InVMConnector
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class InVMConnector implements Connector
+{
+ private final int id;
+
+ private final RemotingHandler handler;
+
+ private final ConnectionLifeCycleListener listener;
+
+ private final InVMAcceptor acceptor;
+
+ public InVMConnector(final int id, final RemotingHandler handler,
+ final ConnectionLifeCycleListener listener)
+ {
+ this.id = id;
+
+ this.handler = handler;
+
+ this.listener = listener;
+
+ InVMRegistry registry = InVMRegistry.instance;
+
+ registry.registerConnector(id, this);
+
+ acceptor = registry.getAcceptor(id);
+
+ if (acceptor == null)
+ {
+ throw new IllegalStateException("Cannot connect to invm acceptor with id " + id + " has it been started?");
+ }
+ }
+
+ public void close()
+ {
+ InVMRegistry.instance.unregisterConnector(id);
+ }
+
+ public Connection createConnection()
+ {
+ Connection conn = new InVMConnection(acceptor.getHandler(), new Listener());
+
+ acceptor.connect((String)conn.getID(), handler);
+
+ return conn;
+ }
+
+ public void start()
+ {
+ }
+
+ public RemotingHandler getHandler()
+ {
+ return handler;
+ }
+
+ private class Listener implements ConnectionLifeCycleListener
+ {
+ public void connectionCreated(Connection connection)
+ {
+ listener.connectionCreated(connection);
+ }
+
+ public void connectionDestroyed(Object connectionID)
+ {
+ //Close the correspond connection on the other side
+ acceptor.disconnect((String)connectionID);
+
+ listener.connectionDestroyed(connectionID);
+ }
+
+ public void connectionException(Object connectionID, MessagingException me)
+ {
+ listener.connectionException(connectionID, me);
+ }
+
+ }
+
+}
Added: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnectorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnectorFactory.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnectorFactory.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.remoting.impl.invm;
+
+import org.jboss.messaging.core.client.ConnectionParams;
+import org.jboss.messaging.core.client.Location;
+import org.jboss.messaging.core.remoting.RemotingHandler;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+import org.jboss.messaging.core.remoting.spi.Connector;
+import org.jboss.messaging.core.remoting.spi.ConnectorFactory;
+
+/**
+ * A InVMConnectorFactory
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class InVMConnectorFactory implements ConnectorFactory
+{
+ public Connector createConnector(final Location location, final ConnectionParams params,
+ final RemotingHandler handler, final ConnectionLifeCycleListener listener)
+ {
+ return new InVMConnector(location.getServerID(), handler, listener);
+ }
+
+}
Added: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMRegistry.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMRegistry.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMRegistry.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.remoting.impl.invm;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.jboss.messaging.core.logging.Logger;
+
+/**
+ * A InVMRegistry
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class InVMRegistry
+{
+ private static final Logger log = Logger.getLogger(InVMRegistry.class);
+
+ public static final InVMRegistry instance = new InVMRegistry();
+
+ private ConcurrentMap<Integer, InVMConnector> connectors =
+ new ConcurrentHashMap<Integer, InVMConnector>();
+
+ private ConcurrentMap<Integer, InVMAcceptor> acceptors =
+ new ConcurrentHashMap<Integer, InVMAcceptor>();
+
+ public void registerAcceptor(final int id, final InVMAcceptor acceptor)
+ {
+ if (acceptors.putIfAbsent(id, acceptor) != null)
+ {
+ throw new IllegalArgumentException("Acceptor with id " + id + " already registered");
+ }
+ }
+
+ public void registerConnector(final int id, final InVMConnector connector)
+ {
+ if (connectors.putIfAbsent(id, connector) != null)
+ {
+ throw new IllegalArgumentException("Connector with id " + id + " already registered");
+ }
+ }
+
+ public void unregisterAcceptor(final int id)
+ {
+ if (acceptors.remove(id) == null)
+ {
+ throw new IllegalArgumentException("Acceptor with id " + id + " not registered");
+ }
+ }
+
+ public void unregisterConnector(final int id)
+ {
+ if (connectors.remove(id) == null)
+ {
+ throw new IllegalArgumentException("Connector with id " + id + " not registered");
+ }
+ }
+
+ public InVMConnector getConnector(final int id)
+ {
+ return connectors.get(id);
+ }
+
+ public InVMAcceptor getAcceptor(final int id)
+ {
+ return acceptors.get(id);
+ }
+}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/IoBufferWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/IoBufferWrapper.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/IoBufferWrapper.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -30,7 +30,7 @@
import java.nio.charset.Charset;
import org.apache.mina.core.buffer.IoBuffer;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -36,10 +36,10 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
/**
* A Mina TCP Acceptor that supports SSL
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptorFactory.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptorFactory.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,10 +23,10 @@
package org.jboss.messaging.core.remoting.impl.mina;
import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.AcceptorFactory;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnection.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnection.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -28,8 +28,8 @@
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.ssl.SslFilter;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -38,9 +38,9 @@
import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.spi.Connector;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnectorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnectorFactory.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnectorFactory.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -2,8 +2,8 @@
import org.jboss.messaging.core.client.ConnectionParams;
import org.jboss.messaging.core.client.Location;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.spi.Connector;
import org.jboss.messaging.core.remoting.spi.ConnectorFactory;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/ChannelBufferWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/ChannelBufferWrapper.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/ChannelBufferWrapper.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -27,7 +27,7 @@
import java.nio.BufferUnderflowException;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
import org.jboss.netty.buffer.ChannelBuffer;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/MessagingChannelHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/MessagingChannelHandler.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/MessagingChannelHandler.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,8 +24,8 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelStateEvent;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyAcceptor.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyAcceptor.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -32,11 +32,11 @@
import javax.net.ssl.SSLContext;
import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.impl.ssl.SSLSupport;
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFactory;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyAcceptorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyAcceptorFactory.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyAcceptorFactory.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,10 +23,10 @@
package org.jboss.messaging.core.remoting.impl.netty;
import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.AcceptorFactory;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
/**
* A NettyAcceptorFactory
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnection.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnection.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,8 +22,8 @@
package org.jboss.messaging.core.remoting.impl.netty;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFutureListener;
import org.jboss.netty.handler.ssl.SslHandler;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnector.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnector.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -21,7 +21,7 @@
*/
package org.jboss.messaging.core.remoting.impl.netty;
-import static org.jboss.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.pipeline;
import java.net.InetSocketAddress;
import java.util.concurrent.ExecutorService;
@@ -34,10 +34,10 @@
import org.jboss.messaging.core.client.ConnectionParams;
import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.impl.ssl.SSLSupport;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.spi.Connector;
import org.jboss.netty.bootstrap.ClientBootstrap;
import org.jboss.netty.channel.Channel;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnectorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnectorFactory.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnectorFactory.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -2,8 +2,8 @@
import org.jboss.messaging.core.client.ConnectionParams;
import org.jboss.messaging.core.client.Location;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.spi.Connector;
import org.jboss.messaging.core.remoting.spi.ConnectorFactory;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerFlowCreditMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerFlowCreditMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerFlowCreditMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateSessionResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,7 +23,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,8 +24,8 @@
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.Packet;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.DataConstants;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketsConfirmedMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketsConfirmedMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketsConfirmedMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerFlowCreditMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerFlowCreditMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerFlowCreditMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -25,7 +25,7 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.ServerMessage;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAddDestinationMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAddDestinationMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAddDestinationMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserHasNextMessageResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserHasNextMessageResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserHasNextMessageResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCancelMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCancelMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCancelMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateQueueMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateQueueMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateQueueMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRemoveDestinationMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRemoveDestinationMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRemoveDestinationMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXACommitMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXACommitMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXACommitMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAEndMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAEndMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAEndMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAForgetMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAForgetMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAForgetMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -27,7 +27,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAJoinMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAJoinMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAJoinMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAPrepareMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAPrepareMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAPrepareMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResumeMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResumeMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResumeMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXARollbackMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXARollbackMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXARollbackMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAStartMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAStartMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAStartMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/XidCodecSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/XidCodecSupport.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/XidCodecSupport.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,7 +24,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.transaction.impl.XidImpl;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/cluster/ConsumerReplicateDeliveryMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/cluster/ConsumerReplicateDeliveryMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/cluster/ConsumerReplicateDeliveryMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,8 +22,8 @@
package org.jboss.messaging.core.remoting.impl.wireformat.cluster;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/cluster/ConsumerReplicateDeliveryResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/cluster/ConsumerReplicateDeliveryResponseMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/cluster/ConsumerReplicateDeliveryResponseMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,8 +22,8 @@
package org.jboss.messaging.core.remoting.impl.wireformat.cluster;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/remoting/spi/AcceptorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/spi/AcceptorFactory.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/spi/AcceptorFactory.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,7 +23,6 @@
package org.jboss.messaging.core.remoting.spi;
import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/spi/Connection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/spi/Connection.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/spi/Connection.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,7 +22,6 @@
package org.jboss.messaging.core.remoting.spi;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
/**
Copied: trunk/src/main/org/jboss/messaging/core/remoting/spi/ConnectionLifeCycleListener.java (from rev 4837, trunk/src/main/org/jboss/messaging/core/remoting/ConnectionLifeCycleListener.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/spi/ConnectionLifeCycleListener.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/spi/ConnectionLifeCycleListener.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.remoting.spi;
+
+import org.jboss.messaging.core.exception.MessagingException;
+
+/**
+ *
+ * A ConnectionLifeCycleListener
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public interface ConnectionLifeCycleListener
+{
+ void connectionCreated(Connection connection);
+
+ void connectionDestroyed(Object connectionID);
+
+ void connectionException(Object connectionID, MessagingException me);
+}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/spi/ConnectorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/spi/ConnectorFactory.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/remoting/spi/ConnectorFactory.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -2,7 +2,6 @@
import org.jboss.messaging.core.client.ConnectionParams;
import org.jboss.messaging.core.client.Location;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
/**
Copied: trunk/src/main/org/jboss/messaging/core/remoting/spi/MessagingBuffer.java (from rev 4837, trunk/src/main/org/jboss/messaging/core/remoting/MessagingBuffer.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/spi/MessagingBuffer.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/spi/MessagingBuffer.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -0,0 +1,125 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.messaging.core.remoting.spi;
+
+import org.jboss.messaging.util.SimpleString;
+
+/**
+ *
+ * A MessagingBuffer
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public interface MessagingBuffer
+{
+ void putByte(byte val);
+
+ void putBytes(byte[] bytes);
+
+ void putBytes(byte[] bytes, int offset, int length);
+
+ void putInt(int val);
+
+ void putInt(int pos, int val);
+
+ void putLong(long val);
+
+ void putShort(short val);
+
+ void putDouble(double val);
+
+ void putFloat(float val);
+
+ void putBoolean(boolean val);
+
+ void putChar(char val);
+
+ void putNullableString(String val);
+
+ void putString(String val);
+
+ void putSimpleString(SimpleString val);
+
+ void putNullableSimpleString(SimpleString val);
+
+ void putUTF(String utf) throws Exception;
+
+ byte getByte();
+
+ short getUnsignedByte();
+
+ void getBytes(byte[] bytes);
+
+ void getBytes(byte[] bytes, int offset, int length);
+
+ int getInt();
+
+ long getLong();
+
+ short getShort();
+
+ int getUnsignedShort();
+
+ double getDouble();
+
+ float getFloat();
+
+ boolean getBoolean();
+
+ char getChar();
+
+ String getString();
+
+ String getNullableString();
+
+ SimpleString getSimpleString();
+
+ SimpleString getNullableSimpleString();
+
+ String getUTF() throws Exception;
+
+ byte[] array();
+
+ int remaining();
+
+ int capacity();
+
+ int limit();
+
+ void limit(int limit);
+
+ void flip();
+
+ void position(int position);
+
+ int position();
+
+ void rewind();
+
+ MessagingBuffer slice();
+
+ MessagingBuffer createNewBuffer(int len);
+
+ Object getUnderlyingBuffer();
+}
Deleted: trunk/src/main/org/jboss/messaging/core/server/CommandManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/CommandManager.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/CommandManager.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.messaging.core.server;
-
-import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.Packet;
-
-/**
- * A CommandManagerImpl
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- */
-public interface CommandManager
-{
- Packet sendCommandBlocking(long targetID, Packet packet) throws MessagingException;
-
- void sendCommandOneway(long targetID, Packet packet);
-
- void packetProcessed(Packet packet);
-
- void close();
-}
Deleted: trunk/src/main/org/jboss/messaging/core/server/impl/CommandManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/CommandManagerImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/CommandManagerImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -1,177 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.messaging.core.server.impl;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.RemotingConnection;
-import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketsConfirmedMessage;
-import org.jboss.messaging.core.server.CommandManager;
-
-/**
- * A CommandManagerImpl
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- */
-public class CommandManagerImpl implements CommandManager, PacketHandler
-{
- private static final Logger log = Logger.getLogger(CommandManagerImpl.class);
-
- private final java.util.Queue<Packet> resendCache = new ConcurrentLinkedQueue<Packet>();
-
- private final int commandBatchSize;
-
- //These members don't need to be synchronized since only called by one thread concurrently
- //but do need to be volatile since that could be a different thread each time
-
- private volatile int lastCommandID = -1;
-
- private volatile int nextConfirmation;
-
- private volatile int commandIDSequence = 0;
-
- private final RemotingConnection remotingConnection;
-
- private final long sessionTargetID;
-
- private final long localCommandResponseTargetID;
-
- private final long remoteCommandResponseTargetID;
-
- public CommandManagerImpl(final int commandBatchSize, final RemotingConnection remotingConnection,
- final PacketDispatcher dispatcher,
- final long sessionTargetID,
- final long localCommandResponseTargetID,
- final long remoteCommandResponseTargetID)
- {
- this.commandBatchSize = commandBatchSize;
-
- nextConfirmation = commandBatchSize - 1;
-
- this.remotingConnection = remotingConnection;
-
- this.sessionTargetID = sessionTargetID;
-
- this.localCommandResponseTargetID = localCommandResponseTargetID;
-
- this.remoteCommandResponseTargetID = remoteCommandResponseTargetID;
-
- dispatcher.register(this);
- }
-
- //Needs to be synchronized since on the server messages can be sent to the client same time as blocking
- //responses are returned
- public synchronized Packet sendCommandBlocking(final long targetID, final Packet packet) throws MessagingException
- {
- setCommandID(packet);
-
- Packet response = remotingConnection.sendBlocking(targetID, sessionTargetID, packet, this);
-
- if (response.getType() == PacketImpl.EXCEPTION)
- {
- MessagingExceptionMessage mem = (MessagingExceptionMessage)response;
-
- throw mem.getException();
- }
-
- return response;
- }
-
- public synchronized void sendCommandOneway(final long targetID, final Packet packet)
- {
- setCommandID(packet);
-
- remotingConnection.sendOneWay(targetID, sessionTargetID, packet);
- }
-
- public void packetProcessed(final Packet packet)
- {
- long commandID = packet.getCommandID();
-
- if (commandID != ++lastCommandID)
- {
- throw new IllegalStateException("Command id out of sequence, got " + commandID + " expected " + lastCommandID);
- }
-
- if (commandID == nextConfirmation)
- {
- Packet confirmed = new PacketsConfirmedMessage(lastCommandID);
-
- confirmed.setTargetID(remoteCommandResponseTargetID);
-
- nextConfirmation += commandBatchSize;
-
- remotingConnection.sendOneWay(confirmed);
- }
- }
-
- public void close()
- {
- remotingConnection.getPacketDispatcher().unregister(localCommandResponseTargetID);
- }
-
- // PacketHandler implementation --------------------------------------------------------------
-
- public long getID()
- {
- return localCommandResponseTargetID;
- }
-
- public void handle(final Object connectionID, final Packet m)
- {
- PacketsConfirmedMessage msg = (PacketsConfirmedMessage)m;
-
- Packet packet;
- do
- {
- packet = resendCache.poll();
- }
- while (packet.getCommandID() < msg.getCommandID());
- }
-
- // Public -----------------------------------------------------------------------------------
-
- public int getUnconfirmedPackets()
- {
- return this.resendCache.size();
- }
-
- // Private -----------------------------------------------------------------------------------
-
- private void setCommandID(final Packet packet)
- {
- int commandID = commandIDSequence++;
-
- packet.setCommandID(commandID);
-
- resendCache.add(packet);
- }
-
-}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,8 +23,8 @@
package org.jboss.messaging.core.server.impl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.Delivery;
import org.jboss.messaging.core.server.MessageReference;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -39,15 +39,16 @@
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.postoffice.impl.PostOfficeImpl;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.RemotingService;
+import org.jboss.messaging.core.remoting.impl.CommandManagerImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateSessionResponseMessage;
import org.jboss.messaging.core.security.JBMSecurityManager;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.security.SecurityStore;
import org.jboss.messaging.core.security.impl.SecurityStoreImpl;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.QueueFactory;
import org.jboss.messaging.core.server.ServerSession;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -37,6 +37,7 @@
import org.jboss.messaging.core.filter.impl.FilterImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
@@ -44,7 +45,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerMessage;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,12 +24,12 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowCreditMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.ServerConsumer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerMessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerMessageImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerMessageImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -25,7 +25,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerMessage;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -26,10 +26,10 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.postoffice.FlowController;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerFlowCreditMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.ServerProducer;
import org.jboss.messaging.core.server.ServerSession;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,12 +24,12 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.ServerProducer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -43,6 +43,7 @@
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.FlowController;
import org.jboss.messaging.core.postoffice.PostOffice;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.FailureListener;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingConnection;
@@ -54,7 +55,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAResponseMessage;
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.SecurityStore;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.Delivery;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.MessagingServer;
@@ -139,6 +139,8 @@
private final CommandManager commandManager;
private volatile boolean started = false;
+
+ private volatile boolean attached;
// Constructors
// ---------------------------------------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -28,6 +28,7 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
@@ -55,7 +56,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.ServerSession;
/**
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -43,8 +43,8 @@
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.JBossDestination;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/src/main/org/jboss/messaging/util/TypedProperties.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/TypedProperties.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/src/main/org/jboss/messaging/util/TypedProperties.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -50,7 +50,7 @@
import org.jboss.messaging.core.journal.EncodingSupport;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
*
Modified: trunk/tests/src/org/jboss/messaging/tests/timing/core/client/impl/ClientConsumerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/core/client/impl/ClientConsumerImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/core/client/impl/ClientConsumerImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -34,9 +34,9 @@
import org.jboss.messaging.core.client.impl.ClientSessionInternal;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingConnectionImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingConnectionImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingConnectionImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -37,7 +37,6 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.FailureListener;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
@@ -47,6 +46,7 @@
import org.jboss.messaging.core.remoting.impl.RemotingConnectionImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingHandlerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingHandlerImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/core/remoting/impl/RemotingHandlerImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -26,12 +26,12 @@
import java.util.concurrent.ExecutorService;
import org.easymock.EasyMock;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.impl.RemotingHandlerImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientBrowserImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientBrowserImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientBrowserImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -28,10 +28,10 @@
import org.jboss.messaging.core.client.impl.ClientBrowserImpl;
import org.jboss.messaging.core.client.impl.ClientSessionInternal;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConsumerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConsumerImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConsumerImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -34,10 +34,10 @@
import org.jboss.messaging.core.client.impl.ClientSessionInternal;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowCreditMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConsumerPacketHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConsumerPacketHandlerTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConsumerPacketHandlerTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -26,9 +26,9 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.impl.ClientConsumerInternal;
import org.jboss.messaging.core.client.impl.ClientConsumerPacketHandler;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientMessageImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -26,8 +26,8 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.message.impl.MessageImplTestBase;
import org.jboss.messaging.tests.util.RandomUtil;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -28,10 +28,10 @@
import org.jboss.messaging.core.client.impl.ClientProducerInternal;
import org.jboss.messaging.core.client.impl.ClientSessionInternal;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
import org.jboss.messaging.util.TokenBucketLimiter;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerPacketHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerPacketHandlerTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerPacketHandlerTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -25,9 +25,9 @@
import org.easymock.EasyMock;
import org.jboss.messaging.core.client.impl.ClientProducerInternal;
import org.jboss.messaging.core.client.impl.ClientProducerPacketHandler;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerFlowCreditMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionFactoryImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionFactoryImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionFactoryImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -31,15 +31,15 @@
import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.ConnectionRegistry;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.TransportType;
+import org.jboss.messaging.core.remoting.impl.CommandManagerImpl;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateSessionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateSessionResponseMessage;
-import org.jboss.messaging.core.server.CommandManager;
-import org.jboss.messaging.core.server.impl.CommandManagerImpl;
import org.jboss.messaging.core.version.Version;
import org.jboss.messaging.core.version.impl.VersionImpl;
import org.jboss.messaging.tests.util.RandomUtil;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -46,8 +46,8 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.ConnectionRegistry;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingConnection;
@@ -83,7 +83,7 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
-import org.jboss.messaging.core.server.CommandManager;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/SimpleEncoding.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/SimpleEncoding.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/SimpleEncoding.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,7 +23,7 @@
package org.jboss.messaging.tests.unit.core.journal.impl.fakes;
import org.jboss.messaging.core.journal.EncodingSupport;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
/**
* Provides a SimpleEncoding with a Fake Payload
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -38,9 +38,9 @@
import org.jboss.messaging.core.journal.EncodingSupport;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.impl.mina.IoBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -45,8 +45,8 @@
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.postoffice.impl.BindingImpl;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.HandleStatus;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.Queue;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -32,7 +32,7 @@
import static org.jboss.messaging.tests.util.UnitTestCase.assertEqualsByteArrays;
import junit.framework.TestCase;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.RandomUtil;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory1.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory1.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory1.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,10 +22,10 @@
package org.jboss.messaging.tests.unit.core.remoting.impl;
import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.AcceptorFactory;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
/**
*
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory2.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory2.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory2.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,10 +22,10 @@
package org.jboss.messaging.tests.unit.core.remoting.impl;
import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.AcceptorFactory;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
/**
*
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory3.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory3.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactory3.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,10 +22,10 @@
package org.jboss.messaging.tests.unit.core.remoting.impl;
import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.AcceptorFactory;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
/**
*
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ByteBufferWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ByteBufferWrapperTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ByteBufferWrapperTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,8 +24,8 @@
import java.nio.ByteBuffer;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectionRegistryImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectionRegistryImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectionRegistryImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -28,7 +28,6 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.ConnectionRegistry;
import org.jboss.messaging.core.remoting.FailureListener;
import org.jboss.messaging.core.remoting.RemotingConnection;
@@ -36,6 +35,7 @@
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.remoting.impl.ConnectionRegistryImpl;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.spi.Connector;
import org.jboss.messaging.core.remoting.spi.ConnectorFactory;
import org.jboss.messaging.tests.util.UnitTestCase;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ExpandingMessagingBufferTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ExpandingMessagingBufferTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ExpandingMessagingBufferTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,8 +22,8 @@
package org.jboss.messaging.tests.unit.core.remoting.impl;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ExpandingMessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -37,7 +37,6 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.FailureListener;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
@@ -47,6 +46,7 @@
import org.jboss.messaging.core.remoting.impl.RemotingConnectionImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingHandlerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingHandlerImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingHandlerImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -30,7 +30,6 @@
import org.easymock.EasyMock;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
@@ -73,6 +72,7 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
import org.jboss.messaging.core.transaction.impl.XidImpl;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingServiceImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingServiceImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -28,7 +28,6 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.FailureListener;
import org.jboss.messaging.core.remoting.Interceptor;
import org.jboss.messaging.core.remoting.RemotingConnection;
@@ -38,6 +37,7 @@
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.AcceptorFactory;
import org.jboss.messaging.core.remoting.spi.Connection;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapper2Test.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapper2Test.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapper2Test.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,8 +22,8 @@
package org.jboss.messaging.tests.unit.core.remoting.impl.mina;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.mina.IoBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapperTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapperTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,8 +23,8 @@
package org.jboss.messaging.tests.unit.core.remoting.impl.mina;
import org.apache.mina.core.buffer.IoBuffer;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.mina.IoBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorFactoryTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorFactoryTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,11 +24,11 @@
import org.easymock.EasyMock;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.impl.mina.MinaAcceptor;
import org.jboss.messaging.core.remoting.impl.mina.MinaAcceptorFactory;
import org.jboss.messaging.core.remoting.spi.Acceptor;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -25,9 +25,9 @@
import org.easymock.EasyMock;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.impl.mina.MinaAcceptor;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectionTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectionTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,8 +23,8 @@
import org.apache.mina.core.session.IoSession;
import org.easymock.EasyMock;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnection;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectorTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectorTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -27,10 +27,10 @@
import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
import org.jboss.messaging.core.client.impl.LocationImpl;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,8 +22,8 @@
package org.jboss.messaging.tests.unit.core.remoting.impl.netty;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.netty.ChannelBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -22,8 +22,8 @@
package org.jboss.messaging.tests.unit.core.remoting.impl.netty;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.netty.ChannelBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,11 +24,11 @@
import org.easymock.EasyMock;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.impl.netty.NettyAcceptor;
import org.jboss.messaging.core.remoting.impl.netty.NettyAcceptorFactory;
import org.jboss.messaging.core.remoting.spi.Acceptor;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -25,9 +25,9 @@
import org.easymock.EasyMock;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.impl.netty.NettyAcceptor;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -24,8 +24,8 @@
import java.util.UUID;
import org.easymock.EasyMock;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.netty.NettyConnection;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.netty.channel.Channel;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -27,10 +27,10 @@
import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
import org.jboss.messaging.core.client.impl.LocationImpl;
-import org.jboss.messaging.core.remoting.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
+import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/DeliveryImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/DeliveryImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/DeliveryImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -23,9 +23,9 @@
import org.easymock.EasyMock;
import org.easymock.IAnswer;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.DeliveryImpl;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -42,13 +42,13 @@
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.RemotingService;
+import org.jboss.messaging.core.remoting.impl.CommandManagerImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateSessionResponseMessage;
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.JBMSecurityManager;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.ServerSession;
-import org.jboss.messaging.core.server.impl.CommandManagerImpl;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.core.server.impl.MessagingServerPacketHandler;
import org.jboss.messaging.core.server.impl.QueueFactoryImpl;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerBrowserImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerBrowserImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerBrowserImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -28,6 +28,7 @@
import org.easymock.IAnswer;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
@@ -35,7 +36,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerMessage;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerConsumerPacketHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerConsumerPacketHandlerTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerConsumerPacketHandlerTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -30,11 +30,11 @@
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowCreditMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.ServerConsumer;
import org.jboss.messaging.core.server.impl.ServerConsumerPacketHandler;
import org.jboss.messaging.tests.util.UnitTestCase;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -29,8 +29,8 @@
import org.easymock.EasyMock;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerMessage;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerProducerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerProducerImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerProducerImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -33,10 +33,10 @@
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.jboss.messaging.core.postoffice.FlowController;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerFlowCreditMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.ServerSession;
import org.jboss.messaging.core.server.impl.ServerProducerImpl;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerProducerPacketHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerProducerPacketHandlerTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerProducerPacketHandlerTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -30,11 +30,11 @@
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.ServerProducer;
import org.jboss.messaging.core.server.impl.ServerProducerPacketHandler;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerSessionImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerSessionImplTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerSessionImplTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -51,6 +51,7 @@
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.FlowController;
import org.jboss.messaging.core.postoffice.PostOffice;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.FailureListener;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
@@ -67,7 +68,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAResponseMessage;
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.SecurityStore;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.Consumer;
import org.jboss.messaging.core.server.Delivery;
import org.jboss.messaging.core.server.HandleStatus;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerSessionPacketHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerSessionPacketHandlerTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerSessionPacketHandlerTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -34,6 +34,7 @@
import org.easymock.IAnswer;
import org.easymock.classextension.EasyMock;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.remoting.CommandManager;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
@@ -66,7 +67,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
-import org.jboss.messaging.core.server.CommandManager;
import org.jboss.messaging.core.server.ServerSession;
import org.jboss.messaging.core.server.impl.ServerSessionPacketHandler;
import org.jboss.messaging.tests.util.UnitTestCase;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -31,8 +31,8 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.client.JBossBytesMessage;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -45,7 +45,7 @@
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.MessageHandler;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.JBossDestination;
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.JBossTopic;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -52,8 +52,8 @@
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.client.JBossBytesMessage;
import org.jboss.messaging.jms.client.JBossMapMessage;
import org.jboss.messaging.jms.client.JBossMessage;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -44,8 +44,8 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.client.JBossObjectMessage;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -40,7 +40,7 @@
import org.jboss.messaging.core.client.ClientBrowser;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.client.JBossMessage;
import org.jboss.messaging.jms.client.JBossQueueBrowser;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -40,8 +40,8 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.client.JBossTextMessage;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java 2008-08-21 07:08:18 UTC (rev 4856)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java 2008-08-21 13:32:30 UTC (rev 4857)
@@ -38,8 +38,8 @@
import junit.framework.TestCase;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
import org.jboss.messaging.core.remoting.impl.mina.IoBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
import org.jboss.messaging.util.TypedProperties;
More information about the jboss-cvs-commits
mailing list