[jboss-cvs] JBoss Messaging SVN: r4479 - in trunk: src/main/org/jboss/messaging/core/message and 12 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Jun 16 09:07:57 EDT 2008


Author: timfox
Date: 2008-06-16 09:07:56 -0400 (Mon, 16 Jun 2008)
New Revision: 4479

Added:
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java
Removed:
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/EmptyPacket.java
Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.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/ClientProducerPacketHandler.java
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.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/remoting/Packet.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/MessagingCodecImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionCreateSessionMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionCreateSessionResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerFlowCreditMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateConnectionRequest.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateConnectionResponse.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Ping.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Pong.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/server/Queue.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
   trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java
   trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
   trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java
   trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
   trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
   trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/Handler.java
   trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerPingTest.java
   trunk/tests/src/org/jboss/messaging/tests/performance/remoting/impl/MeasureBase.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/ClientConnectionImplTest.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/ClientProducerPacketHandlerTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionImplTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/MessagingCodecImplTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaProtocolCodecFilterTest.java
Log:
A few more tweaks


Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -25,7 +25,7 @@
 import org.jboss.messaging.core.client.ClientMessage;
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.remoting.RemotingConnection;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+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;
 
@@ -76,7 +76,7 @@
       
       try
       {
-         remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new EmptyPacket(EmptyPacket.CLOSE));
+         remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new PacketImpl(PacketImpl.CLOSE));
       }
       finally
       {
@@ -95,7 +95,7 @@
    {
       checkClosed();
       
-      remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new EmptyPacket(EmptyPacket.SESS_BROWSER_RESET));
+      remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new PacketImpl(PacketImpl.SESS_BROWSER_RESET));
    }
 
    public boolean hasNextMessage() throws MessagingException
@@ -103,7 +103,7 @@
       checkClosed();
       
       SessionBrowserHasNextMessageResponseMessage response =
-         (SessionBrowserHasNextMessageResponseMessage)remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new EmptyPacket(EmptyPacket.SESS_BROWSER_HASNEXTMESSAGE));
+         (SessionBrowserHasNextMessageResponseMessage)remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new PacketImpl(PacketImpl.SESS_BROWSER_HASNEXTMESSAGE));
       
       return response.hasNext();
    }
@@ -113,7 +113,7 @@
       checkClosed();
       
       ReceiveMessage response =
-         (ReceiveMessage)remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new EmptyPacket(EmptyPacket.SESS_BROWSER_NEXTMESSAGE));
+         (ReceiveMessage)remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new PacketImpl(PacketImpl.SESS_BROWSER_NEXTMESSAGE));
       
       return response.getClientMessage();
    }

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -58,6 +58,20 @@
    private static final long serialVersionUID = 2512460695662741413L;
    
    private static final Logger log = Logger.getLogger(ClientConnectionFactoryImpl.class);
+   
+   public static final int DEFAULT_DEFAULT_CONSUMER_WINDOW_SIZE = 1024 * 1024;
+   
+   public static final int DEFAULT_DEFAULT_CONSUMER_MAX_RATE = -1;
+   
+   public static final int DEFAULT_DEFAULT_PRODUCER_WINDOW_SIZE = 1024 * 1024;
+   
+   public static final int DEFAULT_DEFAULT_PRODUCER_MAX_RATE = -1;
+   
+   public static final boolean DEFAULT_DEFAULT_BLOCK_ON_ACKNOWLEDGE = false;
+   
+   public static final boolean DEFAULT_DEFAULT_BLOCK_ON_PERSISTENT_SEND = false;
+   
+   public static final boolean DEFAULT_DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND = false;
 
    // Attributes -----------------------------------------------------------------------------------
    
@@ -85,20 +99,8 @@
         
    // Static ---------------------------------------------------------------------------------------
    
-   public static final int DEFAULT_DEFAULT_CONSUMER_WINDOW_SIZE = 1024 * 1024;
+  
    
-   public static final int DEFAULT_DEFAULT_CONSUMER_MAX_RATE = -1;
-   
-   public static final int DEFAULT_DEFAULT_PRODUCER_WINDOW_SIZE = 1024 * 1024;
-   
-   public static final int DEFAULT_DEFAULT_PRODUCER_MAX_RATE = -1;
-   
-   public static final boolean DEFAULT_DEFAULT_BLOCK_ON_ACKNOWLEDGE = false;
-   
-   public static final boolean DEFAULT_DEFAULT_BLOCK_ON_PERSISTENT_SEND = false;
-   
-   public static final boolean DEFAULT_DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND = false;
-   
    // Constructors ---------------------------------------------------------------------------------
 
    /**

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -32,7 +32,7 @@
 import org.jboss.messaging.core.remoting.RemotingConnection;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.version.Version;
 import org.jboss.messaging.util.ConcurrentHashSet;
 
@@ -122,14 +122,14 @@
    {
       checkClosed();
        
-      remotingConnection.sendOneWay(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.CONN_START));
+      remotingConnection.sendOneWay(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.CONN_START));
    }
    
    public void stop() throws MessagingException
    {
       checkClosed();
       
-      remotingConnection.sendBlocking(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.CONN_STOP));
+      remotingConnection.sendBlocking(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.CONN_STOP));
    }
 
    public void setRemotingSessionListener(final RemotingSessionListener listener) throws MessagingException
@@ -150,7 +150,7 @@
       {
          closeChildren();
          
-         remotingConnection.sendBlocking(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.CLOSE));
+         remotingConnection.sendBlocking(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.CLOSE));
       }
       finally
       {

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -33,7 +33,7 @@
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.RemotingConnection;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowCreditMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -271,7 +271,7 @@
          
          receiverThread = null;
 
-         remotingConnection.sendBlocking(targetID, session.getServerTargetID(), new EmptyPacket(EmptyPacket.CLOSE));
+         remotingConnection.sendBlocking(targetID, session.getServerTargetID(), new PacketImpl(PacketImpl.CLOSE));
 
          remotingConnection.getPacketDispatcher().unregister(clientTargetID);
       }

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -4,7 +4,7 @@
 import org.jboss.messaging.core.remoting.Packet;
 import org.jboss.messaging.core.remoting.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
 
 /**
@@ -38,7 +38,7 @@
    {
       byte type = packet.getType();
       
-      if (type == EmptyPacket.RECEIVE_MSG)
+      if (type == PacketImpl.RECEIVE_MSG)
       {
          ReceiveMessage message = (ReceiveMessage) packet;
          

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -4,7 +4,7 @@
 import org.jboss.messaging.core.remoting.Packet;
 import org.jboss.messaging.core.remoting.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.ProducerFlowCreditMessage;
 
 /**
@@ -38,7 +38,7 @@
    {    
       byte type = packet.getType();
       
-      if (type == EmptyPacket.PROD_RECEIVETOKENS)
+      if (type == PacketImpl.PROD_RECEIVETOKENS)
       {
          ProducerFlowCreditMessage message = (ProducerFlowCreditMessage) packet;
          

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -41,7 +41,7 @@
 import org.jboss.messaging.core.remoting.Packet;
 import org.jboss.messaging.core.remoting.RemotingConnection;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowCreditMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionAcknowledgeMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionAddDestinationMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryMessage;
@@ -419,7 +419,7 @@
       //Flush any acks to the server
       acknowledgeInternal(false);
       
-      remotingConnection.sendBlocking(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.SESS_COMMIT));
+      remotingConnection.sendBlocking(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.SESS_COMMIT));
       
       lastCommittedID = lastID;
    }
@@ -446,7 +446,7 @@
 
       toAckCount = 0;
 
-      remotingConnection.sendBlocking(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.SESS_ROLLBACK));   
+      remotingConnection.sendBlocking(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.SESS_ROLLBACK));   
    }
    
    public void acknowledge() throws MessagingException
@@ -504,7 +504,7 @@
          //Flush any acks to the server
          acknowledgeInternal(false);
          
-         remotingConnection.sendBlocking(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.CLOSE));
+         remotingConnection.sendBlocking(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.CLOSE));
       }
       finally
       {
@@ -673,7 +673,7 @@
          
          if (flags == XAResource.TMSUSPEND)
          {
-            packet = new EmptyPacket(EmptyPacket.SESS_XA_SUSPEND);                  
+            packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND);                  
          }
          else if (flags == XAResource.TMSUCCESS)
          {
@@ -734,7 +734,7 @@
       try
       {                              
          SessionXAGetTimeoutResponseMessage response =
-            (SessionXAGetTimeoutResponseMessage)remotingConnection.sendBlocking(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.SESS_XA_GET_TIMEOUT));
+            (SessionXAGetTimeoutResponseMessage)remotingConnection.sendBlocking(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT));
          
          return response.getTimeoutSeconds();
       }
@@ -799,7 +799,7 @@
       {
          if ((flags & XAResource.TMSTARTRSCAN) == XAResource.TMSTARTRSCAN)
          {
-            SessionXAGetInDoubtXidsResponseMessage response = (SessionXAGetInDoubtXidsResponseMessage)remotingConnection.sendBlocking(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.SESS_XA_INDOUBT_XIDS));
+            SessionXAGetInDoubtXidsResponseMessage response = (SessionXAGetInDoubtXidsResponseMessage)remotingConnection.sendBlocking(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS));
             
             List<Xid> xids = response.getXids();
             

Modified: trunk/src/main/org/jboss/messaging/core/message/Message.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/Message.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/message/Message.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -40,9 +40,7 @@
  * $Id: Message.java 3341 2007-11-19 14:34:57Z timfox $
  */
 public interface Message extends EncodingSupport
-{
-   public static final SimpleString HDR_ACTUAL_EXPIRY_TIME = new SimpleString("JBMActualExpiryTime");
-   
+{   
    SimpleString getDestination();
    
    void setDestination(SimpleString destination);

Modified: trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -54,7 +54,9 @@
    // Constants -----------------------------------------------------
    
    private static final Logger log = Logger.getLogger(MessageImpl.class);
-
+   
+   public static final SimpleString HDR_ACTUAL_EXPIRY_TIME = new SimpleString("JBMActualExpiryTime");
+   
    // Attributes ----------------------------------------------------
 
    private SimpleString destination;

Modified: trunk/src/main/org/jboss/messaging/core/remoting/Packet.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/Packet.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/Packet.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -20,9 +20,7 @@
 public interface Packet
 {
    // Public --------------------------------------------------------
-
-   public static final long NO_ID_SET = -1L;
-
+   
    void setResponseTargetID(long responseTargetID);
 
    long getResponseTargetID();

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/MessagingCodecImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/MessagingCodecImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/MessagingCodecImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -10,7 +10,7 @@
 import org.jboss.messaging.core.remoting.MessagingCodec;
 import org.jboss.messaging.core.remoting.Packet;
 import org.jboss.messaging.core.remoting.impl.wireformat.*;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.*;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.*;
 import static org.jboss.messaging.util.DataConstants.SIZE_INT;
 import org.jboss.messaging.util.MessagingBuffer;
 
@@ -60,7 +60,7 @@
       {
          case NULL:
          {
-            packet = new EmptyPacket(EmptyPacket.NULL);
+            packet = new PacketImpl(PacketImpl.NULL);
             break;
          }
          case PING:
@@ -80,7 +80,7 @@
          }
          case CLOSE:
          {
-            packet = new EmptyPacket(EmptyPacket.CLOSE);
+            packet = new PacketImpl(PacketImpl.CLOSE);
             break;
          }
          case CREATECONNECTION:
@@ -93,237 +93,237 @@
             packet = new CreateConnectionResponse();
             break;
          }
-         case EmptyPacket.CONN_CREATESESSION:
+         case PacketImpl.CONN_CREATESESSION:
          {
             packet = new ConnectionCreateSessionMessage();
             break;
          }
-         case EmptyPacket.CONN_CREATESESSION_RESP:
+         case PacketImpl.CONN_CREATESESSION_RESP:
          {
             packet = new ConnectionCreateSessionResponseMessage();
             break;
          }
-         case EmptyPacket.CONN_START:
+         case PacketImpl.CONN_START:
          {
-            packet = new EmptyPacket(EmptyPacket.CONN_START);
+            packet = new PacketImpl(PacketImpl.CONN_START);
             break;
          }
-         case EmptyPacket.CONN_STOP:
+         case PacketImpl.CONN_STOP:
          {
-            packet = new EmptyPacket(EmptyPacket.CONN_STOP);
+            packet = new PacketImpl(PacketImpl.CONN_STOP);
             break;
          }
-         case EmptyPacket.SESS_CREATECONSUMER:
+         case PacketImpl.SESS_CREATECONSUMER:
          {
             packet = new SessionCreateConsumerMessage();
             break;
          }
-         case EmptyPacket.SESS_CREATECONSUMER_RESP:
+         case PacketImpl.SESS_CREATECONSUMER_RESP:
          {
             packet = new SessionCreateConsumerResponseMessage();
             break;
          }
-         case EmptyPacket.SESS_CREATEPRODUCER:
+         case PacketImpl.SESS_CREATEPRODUCER:
          {
             packet = new SessionCreateProducerMessage();
             break;
          }
-         case EmptyPacket.SESS_CREATEPRODUCER_RESP:
+         case PacketImpl.SESS_CREATEPRODUCER_RESP:
          {
             packet = new SessionCreateProducerResponseMessage();
             break;
          }
-         case EmptyPacket.SESS_CREATEBROWSER:
+         case PacketImpl.SESS_CREATEBROWSER:
          {
             packet = new SessionCreateBrowserMessage();
             break;
          }
-         case EmptyPacket.SESS_CREATEBROWSER_RESP:
+         case PacketImpl.SESS_CREATEBROWSER_RESP:
          {
             packet = new SessionCreateBrowserResponseMessage();
             break;
          }
-         case EmptyPacket.SESS_ACKNOWLEDGE:
+         case PacketImpl.SESS_ACKNOWLEDGE:
          {
             packet = new SessionAcknowledgeMessage();
             break;
          }
-         case EmptyPacket.SESS_RECOVER:
+         case PacketImpl.SESS_RECOVER:
          {
-            packet = new EmptyPacket(EmptyPacket.SESS_RECOVER);
+            packet = new PacketImpl(PacketImpl.SESS_RECOVER);
             break;
          }
-         case EmptyPacket.SESS_COMMIT:
+         case PacketImpl.SESS_COMMIT:
          {
-            packet = new EmptyPacket(EmptyPacket.SESS_COMMIT);
+            packet = new PacketImpl(PacketImpl.SESS_COMMIT);
             break;
          }
-         case EmptyPacket.SESS_ROLLBACK:
+         case PacketImpl.SESS_ROLLBACK:
          {
-            packet = new EmptyPacket(EmptyPacket.SESS_ROLLBACK);
+            packet = new PacketImpl(PacketImpl.SESS_ROLLBACK);
             break;
          }
-         case EmptyPacket.SESS_CANCEL:
+         case PacketImpl.SESS_CANCEL:
          {
             packet = new SessionCancelMessage();
             break;
          }
-         case EmptyPacket.SESS_QUEUEQUERY:
+         case PacketImpl.SESS_QUEUEQUERY:
          {
             packet = new SessionQueueQueryMessage();
             break;
          }
-         case EmptyPacket.SESS_QUEUEQUERY_RESP:
+         case PacketImpl.SESS_QUEUEQUERY_RESP:
          {
             packet = new SessionQueueQueryResponseMessage();
             break;
          }
-         case EmptyPacket.SESS_CREATEQUEUE:
+         case PacketImpl.SESS_CREATEQUEUE:
          {
             packet = new SessionCreateQueueMessage();
             break;
          }
-         case EmptyPacket.SESS_DELETE_QUEUE:
+         case PacketImpl.SESS_DELETE_QUEUE:
          {
             packet = new SessionDeleteQueueMessage();
             break;
          }
-         case EmptyPacket.SESS_ADD_DESTINATION:
+         case PacketImpl.SESS_ADD_DESTINATION:
          {
             packet = new SessionAddDestinationMessage();
             break;
          }
-         case EmptyPacket.SESS_REMOVE_DESTINATION:
+         case PacketImpl.SESS_REMOVE_DESTINATION:
          {
             packet = new SessionRemoveDestinationMessage();
             break;
          }
-         case EmptyPacket.SESS_BINDINGQUERY:
+         case PacketImpl.SESS_BINDINGQUERY:
          {
             packet = new SessionBindingQueryMessage();
             break;
          }
-         case EmptyPacket.SESS_BINDINGQUERY_RESP:
+         case PacketImpl.SESS_BINDINGQUERY_RESP:
          {
             packet = new SessionBindingQueryResponseMessage();
             break;
          }
-         case EmptyPacket.SESS_BROWSER_RESET:
+         case PacketImpl.SESS_BROWSER_RESET:
          {
-            packet = new EmptyPacket(EmptyPacket.SESS_BROWSER_RESET);
+            packet = new PacketImpl(PacketImpl.SESS_BROWSER_RESET);
             break;
          }
-         case EmptyPacket.SESS_BROWSER_HASNEXTMESSAGE:
+         case PacketImpl.SESS_BROWSER_HASNEXTMESSAGE:
          {
-            packet = new EmptyPacket(EmptyPacket.SESS_BROWSER_HASNEXTMESSAGE);
+            packet = new PacketImpl(PacketImpl.SESS_BROWSER_HASNEXTMESSAGE);
             break;
          }
-         case EmptyPacket.SESS_BROWSER_HASNEXTMESSAGE_RESP:
+         case PacketImpl.SESS_BROWSER_HASNEXTMESSAGE_RESP:
          {
             packet = new SessionBrowserHasNextMessageResponseMessage();
             break;
          }
-         case EmptyPacket.SESS_BROWSER_NEXTMESSAGE:
+         case PacketImpl.SESS_BROWSER_NEXTMESSAGE:
          {
-            packet = new EmptyPacket(EmptyPacket.SESS_BROWSER_NEXTMESSAGE);
+            packet = new PacketImpl(PacketImpl.SESS_BROWSER_NEXTMESSAGE);
             break;
          }
-         case EmptyPacket.SESS_XA_START:
+         case PacketImpl.SESS_XA_START:
          {
             packet = new SessionXAStartMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_END:
+         case PacketImpl.SESS_XA_END:
          {
             packet = new SessionXAEndMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_COMMIT:
+         case PacketImpl.SESS_XA_COMMIT:
          {
             packet = new SessionXACommitMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_PREPARE:
+         case PacketImpl.SESS_XA_PREPARE:
          {
             packet = new SessionXAPrepareMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_RESP:
+         case PacketImpl.SESS_XA_RESP:
          {
             packet = new SessionXAResponseMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_ROLLBACK:
+         case PacketImpl.SESS_XA_ROLLBACK:
          {
             packet = new SessionXARollbackMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_JOIN:
+         case PacketImpl.SESS_XA_JOIN:
          {
             packet = new SessionXAJoinMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_SUSPEND:
+         case PacketImpl.SESS_XA_SUSPEND:
          {
-            packet = new EmptyPacket(EmptyPacket.SESS_XA_SUSPEND);
+            packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND);
             break;
          }
-         case EmptyPacket.SESS_XA_RESUME:
+         case PacketImpl.SESS_XA_RESUME:
          {
             packet = new SessionXAResumeMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_FORGET:
+         case PacketImpl.SESS_XA_FORGET:
          {
             packet = new SessionXAForgetMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_INDOUBT_XIDS:
+         case PacketImpl.SESS_XA_INDOUBT_XIDS:
          {
-            packet = new EmptyPacket(EmptyPacket.SESS_XA_INDOUBT_XIDS);
+            packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS);
             break;
          }
-         case EmptyPacket.SESS_XA_INDOUBT_XIDS_RESP:
+         case PacketImpl.SESS_XA_INDOUBT_XIDS_RESP:
          {
             packet = new SessionXAGetInDoubtXidsResponseMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_SET_TIMEOUT:
+         case PacketImpl.SESS_XA_SET_TIMEOUT:
          {
             packet = new SessionXASetTimeoutMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_SET_TIMEOUT_RESP:
+         case PacketImpl.SESS_XA_SET_TIMEOUT_RESP:
          {
             packet = new SessionXASetTimeoutResponseMessage();
             break;
          }
-         case EmptyPacket.SESS_XA_GET_TIMEOUT:
+         case PacketImpl.SESS_XA_GET_TIMEOUT:
          {
-            packet = new EmptyPacket(EmptyPacket.SESS_XA_GET_TIMEOUT);
+            packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT);
             break;
          }
-         case EmptyPacket.SESS_XA_GET_TIMEOUT_RESP:
+         case PacketImpl.SESS_XA_GET_TIMEOUT_RESP:
          {
             packet = new SessionXAGetTimeoutResponseMessage();
             break;
          }
-         case EmptyPacket.CONS_FLOWTOKEN:
+         case PacketImpl.CONS_FLOWTOKEN:
          {
             packet = new ConsumerFlowCreditMessage();
             break;
          }
-         case EmptyPacket.PROD_SEND:
+         case PacketImpl.PROD_SEND:
          {
             packet = new ProducerSendMessage();
             break;
          }
-         case EmptyPacket.PROD_RECEIVETOKENS:
+         case PacketImpl.PROD_RECEIVETOKENS:
          {
             packet = new ProducerFlowCreditMessage();
             break;
          }
-         case EmptyPacket.RECEIVE_MSG:
+         case PacketImpl.RECEIVE_MSG:
          {
             packet = new ReceiveMessage();
             break;

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -6,10 +6,7 @@
  */
 package org.jboss.messaging.core.remoting.impl;
 
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.*;
-import static org.jboss.messaging.core.remoting.Packet.NO_ID_SET;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
 
 import java.util.Iterator;
 import java.util.List;
@@ -19,6 +16,15 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.Interceptor;
+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.PacketHandlerRegistrationListener;
+import org.jboss.messaging.core.remoting.PacketReturner;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
+
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>.
@@ -31,8 +37,7 @@
 
    private static final long serialVersionUID = -4626926952268528384L;
 
-   public static final Logger log = Logger
-           .getLogger(PacketDispatcherImpl.class);
+   public static final Logger log = Logger.getLogger(PacketDispatcherImpl.class);
 
    private static boolean trace = log.isTraceEnabled();
 
@@ -150,7 +155,7 @@
       else
       {
          //Producer tokens can arrive after producer is closed - this is ok
-         if (packet.getType() != EmptyPacket.PROD_RECEIVETOKENS)
+         if (packet.getType() != PacketImpl.PROD_RECEIVETOKENS)
          {
             log.error("Unhandled packet " + packet);
          }

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -6,18 +6,24 @@
  */
 package org.jboss.messaging.core.remoting.impl.mina;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+
 import org.apache.mina.common.IoHandlerAdapter;
 import org.apache.mina.common.IoSession;
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.*;
+import org.jboss.messaging.core.remoting.CleanUpNotifier;
+import org.jboss.messaging.core.remoting.Packet;
+import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.PacketHandlerRegistrationListener;
+import org.jboss.messaging.core.remoting.PacketReturner;
 import org.jboss.messaging.util.OrderedExecutorFactory;
 
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -164,7 +170,7 @@
    {
       PacketReturner returner;
 
-      if (packet.getResponseTargetID() != Packet.NO_ID_SET)
+      if (packet.getResponseTargetID() != NO_ID_SET)
       {
          returner = new PacketReturner()
          {

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionCreateSessionMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionCreateSessionMessage.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionCreateSessionMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class ConnectionCreateSessionMessage extends EmptyPacket
+public class ConnectionCreateSessionMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionCreateSessionResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionCreateSessionResponseMessage.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionCreateSessionResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -15,7 +15,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class ConnectionCreateSessionResponseMessage extends EmptyPacket
+public class ConnectionCreateSessionResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerFlowCreditMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class ConsumerFlowCreditMessage extends EmptyPacket
+public class ConsumerFlowCreditMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateConnectionRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateConnectionRequest.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateConnectionRequest.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class CreateConnectionRequest extends EmptyPacket
+public class CreateConnectionRequest extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateConnectionResponse.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateConnectionResponse.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateConnectionResponse.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class CreateConnectionResponse extends EmptyPacket
+public class CreateConnectionResponse extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/EmptyPacket.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/EmptyPacket.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/EmptyPacket.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -1,227 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.impl.wireformat;
-
-
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.util.DataConstants;
-import org.jboss.messaging.util.MessagingBuffer;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * 
- * @version <tt>$Revision$</tt>
- */
-public class EmptyPacket implements Packet
-{
-   // Constants -----------------------------------------------------
-   
-   private static final Logger log = Logger.getLogger(EmptyPacket.class);
-
-
-   private long responseTargetID = NO_ID_SET;
-
-   private long targetID = NO_ID_SET;
-
-   private long executorID = NO_ID_SET;
-
-   private final byte type;
-      
-   // The message types
-   // ------------------------------------------------------------------------------------
-   
-   public static final byte NULL = 1;
-   public static final byte PING = 4;
-   public static final byte PONG = 5;
-   
-   // Miscellaneous   
-   public static final byte EXCEPTION = 10;
-   public static final byte CLOSE = 11;
-   
-   // Server
-   public static final byte CREATECONNECTION = 20;
-   public static final byte CREATECONNECTION_RESP = 21;
-   
-   // Connection
-   public static final byte CONN_CREATESESSION = 30;
-   public static final byte CONN_CREATESESSION_RESP = 31;
-   public static final byte CONN_START = 32;
-   public static final byte CONN_STOP = 33;
-
-   // Session   
-   public static final byte SESS_CREATECONSUMER = 40;
-   public static final byte SESS_CREATECONSUMER_RESP = 41;
-   public static final byte SESS_CREATEPRODUCER = 42;
-   public static final byte SESS_CREATEPRODUCER_RESP = 43;
-   public static final byte SESS_CREATEBROWSER = 44;
-   public static final byte SESS_CREATEBROWSER_RESP = 45;    
-   public static final byte SESS_ACKNOWLEDGE = 46;
-   public static final byte SESS_RECOVER = 47;
-   public static final byte SESS_COMMIT = 48;
-   public static final byte SESS_ROLLBACK = 49;
-   public static final byte SESS_CANCEL = 50;
-   public static final byte SESS_QUEUEQUERY = 51;
-   public static final byte SESS_QUEUEQUERY_RESP = 52;
-   public static final byte SESS_CREATEQUEUE = 53;
-   public static final byte SESS_DELETE_QUEUE = 54;  
-   public static final byte SESS_ADD_DESTINATION = 55;
-   public static final byte SESS_REMOVE_DESTINATION = 56;
-   public static final byte SESS_BINDINGQUERY = 57;
-   public static final byte SESS_BINDINGQUERY_RESP = 58;
-   public static final byte SESS_BROWSER_RESET = 59;
-   public static final byte SESS_BROWSER_HASNEXTMESSAGE = 60;
-   public static final byte SESS_BROWSER_HASNEXTMESSAGE_RESP = 61;
-   public static final byte SESS_BROWSER_NEXTMESSAGE = 64; 
-   public static final byte SESS_XA_START = 66;
-   public static final byte SESS_XA_END = 67;
-   public static final byte SESS_XA_COMMIT = 68;
-   public static final byte SESS_XA_PREPARE = 69;
-   public static final byte SESS_XA_RESP = 70;
-   public static final byte SESS_XA_ROLLBACK = 71;
-   public static final byte SESS_XA_JOIN = 72;
-   public static final byte SESS_XA_SUSPEND = 73;
-   public static final byte SESS_XA_RESUME = 74;
-   public static final byte SESS_XA_FORGET = 75;
-   public static final byte SESS_XA_INDOUBT_XIDS = 76;
-   public static final byte SESS_XA_INDOUBT_XIDS_RESP = 77;
-   public static final byte SESS_XA_SET_TIMEOUT = 78;
-   public static final byte SESS_XA_SET_TIMEOUT_RESP = 79;
-   public static final byte SESS_XA_GET_TIMEOUT = 80;
-   public static final byte SESS_XA_GET_TIMEOUT_RESP = 81;
-       
-   // Consumer 
-   public static final byte CONS_FLOWTOKEN = 90;   
-   
-   //Producer
-   public static final byte PROD_SEND = 100;
-   public static final byte PROD_RECEIVETOKENS = 101;
-   
-   public static final byte RECEIVE_MSG = 110;
-
-   // Static --------------------------------------------------------
-
-   public EmptyPacket(final byte type)
-   {
-      this.type = type;
-   }
-
-   // Public --------------------------------------------------------
-
-   public byte getType()
-   {
-      return type;
-   }
-
-   public void setResponseTargetID(long responseTargetID)
-   {
-      this.responseTargetID = responseTargetID;
-   }
-
-   public long getResponseTargetID()
-   {
-      return responseTargetID;
-   }
-
-   public long getTargetID()
-   {
-      return targetID;
-   }
-
-   public void setTargetID(long targetID)
-   {
-      this.targetID = targetID;
-   }
-
-   public long getExecutorID()
-   {
-      return executorID;
-   }
-
-   public void setExecutorID(long executorID)
-   {
-      this.executorID = executorID;
-   }
-
-   public void normalize(Packet other)
-   {
-      assert other != null;
-
-      setTargetID(other.getResponseTargetID());
-   }
-
-   public void encode(MessagingBuffer buffer)
-   {      
-      //The standard header fields
-      buffer.putInt(0); //The length gets filled in at the end
-      buffer.putByte(type); 
-      buffer.putLong(responseTargetID);
-      buffer.putLong(targetID);
-      buffer.putLong(executorID);
-
-      encodeBody(buffer);
-      
-      //The length doesn't include the actual length byte
-      int len = buffer.position() - DataConstants.SIZE_INT;
-      
-      buffer.putInt(0, len);
-      
-      buffer.flip();
-   }
-
-   public void decode(final MessagingBuffer buffer) throws Exception
-   {
-      responseTargetID = buffer.getLong();
-      targetID = buffer.getLong();
-      executorID = buffer.getLong();
-      
-      decodeBody(buffer);
-   }
-   
-   public void encodeBody(final MessagingBuffer buffer)
-   {      
-   }
-   
-   public void decodeBody(final MessagingBuffer buffer)
-   {      
-   }
-
-   @Override
-   public String toString()
-   {
-      return getParentString() + "]";
-   }
-   
-   public boolean equals(Object other)
-   {
-      if (other instanceof EmptyPacket == false)
-      {
-         return false;
-      }
-            
-      EmptyPacket r = (EmptyPacket)other;
-      
-      return r.type == this.type;      
-   }
-   
-   // Package protected ---------------------------------------------
-
-   protected String getParentString()
-   {
-      return "PACKET[type=" + type
-      + ", responseTargetID=" + responseTargetID + ", targetID=" + targetID
-      + ", executorID=" + executorID;
-   }
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
-}

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * @version <tt>$Revision$</tt>
  * 
  */
-public class MessagingExceptionMessage extends EmptyPacket
+public class MessagingExceptionMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Copied: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java (from rev 4474, trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/EmptyPacket.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java	                        (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -0,0 +1,228 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl.wireformat;
+
+
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.Packet;
+import org.jboss.messaging.util.DataConstants;
+import org.jboss.messaging.util.MessagingBuffer;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * 
+ * @version <tt>$Revision$</tt>
+ */
+public class PacketImpl implements Packet
+{
+   // Constants -----------------------------------------------------
+   
+   private static final Logger log = Logger.getLogger(PacketImpl.class);
+
+   public static final long NO_ID_SET = -1L;
+
+   private long responseTargetID = NO_ID_SET;
+
+   private long targetID = NO_ID_SET;
+
+   private long executorID = NO_ID_SET;
+
+   private final byte type;
+      
+   // The message types
+   // ------------------------------------------------------------------------------------
+   
+   public static final byte NULL = 1;
+   public static final byte PING = 4;
+   public static final byte PONG = 5;
+   
+   // Miscellaneous   
+   public static final byte EXCEPTION = 10;
+   public static final byte CLOSE = 11;
+   
+   // Server
+   public static final byte CREATECONNECTION = 20;
+   public static final byte CREATECONNECTION_RESP = 21;
+   
+   // Connection
+   public static final byte CONN_CREATESESSION = 30;
+   public static final byte CONN_CREATESESSION_RESP = 31;
+   public static final byte CONN_START = 32;
+   public static final byte CONN_STOP = 33;
+
+   // Session   
+   public static final byte SESS_CREATECONSUMER = 40;
+   public static final byte SESS_CREATECONSUMER_RESP = 41;
+   public static final byte SESS_CREATEPRODUCER = 42;
+   public static final byte SESS_CREATEPRODUCER_RESP = 43;
+   public static final byte SESS_CREATEBROWSER = 44;
+   public static final byte SESS_CREATEBROWSER_RESP = 45;    
+   public static final byte SESS_ACKNOWLEDGE = 46;
+   public static final byte SESS_RECOVER = 47;
+   public static final byte SESS_COMMIT = 48;
+   public static final byte SESS_ROLLBACK = 49;
+   public static final byte SESS_CANCEL = 50;
+   public static final byte SESS_QUEUEQUERY = 51;
+   public static final byte SESS_QUEUEQUERY_RESP = 52;
+   public static final byte SESS_CREATEQUEUE = 53;
+   public static final byte SESS_DELETE_QUEUE = 54;  
+   public static final byte SESS_ADD_DESTINATION = 55;
+   public static final byte SESS_REMOVE_DESTINATION = 56;
+   public static final byte SESS_BINDINGQUERY = 57;
+   public static final byte SESS_BINDINGQUERY_RESP = 58;
+   public static final byte SESS_BROWSER_RESET = 59;
+   public static final byte SESS_BROWSER_HASNEXTMESSAGE = 60;
+   public static final byte SESS_BROWSER_HASNEXTMESSAGE_RESP = 61;
+   public static final byte SESS_BROWSER_NEXTMESSAGE = 62; 
+   public static final byte SESS_XA_START = 63;
+   public static final byte SESS_XA_END = 64;
+   public static final byte SESS_XA_COMMIT = 65;
+   public static final byte SESS_XA_PREPARE = 66;
+   public static final byte SESS_XA_RESP = 67;
+   public static final byte SESS_XA_ROLLBACK = 68;
+   public static final byte SESS_XA_JOIN = 69;
+   public static final byte SESS_XA_SUSPEND = 70;
+   public static final byte SESS_XA_RESUME = 71;
+   public static final byte SESS_XA_FORGET = 72;
+   public static final byte SESS_XA_INDOUBT_XIDS = 73;
+   public static final byte SESS_XA_INDOUBT_XIDS_RESP = 74;
+   public static final byte SESS_XA_SET_TIMEOUT = 75;
+   public static final byte SESS_XA_SET_TIMEOUT_RESP = 76;
+   public static final byte SESS_XA_GET_TIMEOUT = 77;
+   public static final byte SESS_XA_GET_TIMEOUT_RESP = 78;
+       
+   // Consumer 
+   public static final byte CONS_FLOWTOKEN = 90;   
+   
+   //Producer
+   public static final byte PROD_SEND = 100;
+   public static final byte PROD_RECEIVETOKENS = 101;
+   
+   public static final byte RECEIVE_MSG = 110;
+
+   // Static --------------------------------------------------------
+
+   public PacketImpl(final byte type)
+   {
+      this.type = type;
+   }
+
+   // Public --------------------------------------------------------
+
+   public byte getType()
+   {
+      return type;
+   }
+
+   public void setResponseTargetID(long responseTargetID)
+   {
+      this.responseTargetID = responseTargetID;
+   }
+
+   public long getResponseTargetID()
+   {
+      return responseTargetID;
+   }
+
+   public long getTargetID()
+   {
+      return targetID;
+   }
+
+   public void setTargetID(long targetID)
+   {
+      this.targetID = targetID;
+   }
+
+   public long getExecutorID()
+   {
+      return executorID;
+   }
+
+   public void setExecutorID(long executorID)
+   {
+      this.executorID = executorID;
+   }
+
+   public void normalize(Packet other)
+   {
+      assert other != null;
+
+      setTargetID(other.getResponseTargetID());
+   }
+
+   public void encode(MessagingBuffer buffer)
+   {      
+      //The standard header fields
+      buffer.putInt(0); //The length gets filled in at the end
+      buffer.putByte(type); 
+      buffer.putLong(responseTargetID);
+      buffer.putLong(targetID);
+      buffer.putLong(executorID);
+
+      encodeBody(buffer);
+      
+      //The length doesn't include the actual length byte
+      int len = buffer.position() - DataConstants.SIZE_INT;
+      
+      buffer.putInt(0, len);
+      
+      buffer.flip();
+   }
+
+   public void decode(final MessagingBuffer buffer) throws Exception
+   {
+      responseTargetID = buffer.getLong();
+      targetID = buffer.getLong();
+      executorID = buffer.getLong();
+      
+      decodeBody(buffer);
+   }
+   
+   public void encodeBody(final MessagingBuffer buffer)
+   {      
+   }
+   
+   public void decodeBody(final MessagingBuffer buffer)
+   {      
+   }
+
+   @Override
+   public String toString()
+   {
+      return getParentString() + "]";
+   }
+   
+   public boolean equals(Object other)
+   {
+      if (other instanceof PacketImpl == false)
+      {
+         return false;
+      }
+            
+      PacketImpl r = (PacketImpl)other;
+      
+      return r.type == this.type;      
+   }
+   
+   // Package protected ---------------------------------------------
+
+   protected String getParentString()
+   {
+      return "PACKET[type=" + type
+      + ", responseTargetID=" + responseTargetID + ", targetID=" + targetID
+      + ", executorID=" + executorID;
+   }
+
+   // Protected -----------------------------------------------------
+
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
+
+}

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Ping.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Ping.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Ping.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class Ping extends EmptyPacket
+public class Ping extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Pong.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Pong.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Pong.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class Pong extends EmptyPacket
+public class Pong extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerFlowCreditMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -15,7 +15,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class ProducerFlowCreditMessage extends EmptyPacket
+public class ProducerFlowCreditMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -18,7 +18,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class ProducerSendMessage extends EmptyPacket
+public class ProducerSendMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -18,7 +18,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class ReceiveMessage extends EmptyPacket
+public class ReceiveMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionAcknowledgeMessage extends EmptyPacket
+public class SessionAcknowledgeMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAddDestinationMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -17,7 +17,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionAddDestinationMessage extends EmptyPacket
+public class SessionAddDestinationMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -17,7 +17,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionBindingQueryMessage extends EmptyPacket
+public class SessionBindingQueryMessage extends PacketImpl
 {
    private SimpleString address;
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -13,7 +13,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionBindingQueryResponseMessage extends EmptyPacket
+public class SessionBindingQueryResponseMessage extends PacketImpl
 {
    private boolean exists;
    

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserHasNextMessageResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -15,7 +15,7 @@
  * @version <tt>$Revision$</tt>
  * 
  */
-public class SessionBrowserHasNextMessageResponseMessage extends EmptyPacket
+public class SessionBrowserHasNextMessageResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCancelMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionCancelMessage extends EmptyPacket
+public class SessionCancelMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * @version <tt>$Revision$</tt>
  * 
  */
-public class SessionCreateBrowserMessage extends EmptyPacket
+public class SessionCreateBrowserMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -15,7 +15,7 @@
  * @version <tt>$Revision$</tt>
  * 
  */
-public class SessionCreateBrowserResponseMessage extends EmptyPacket
+public class SessionCreateBrowserResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -15,7 +15,7 @@
  *
  * @version <tt>$Revision$</tt>
  */
-public class SessionCreateConsumerMessage extends EmptyPacket
+public class SessionCreateConsumerMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionCreateConsumerResponseMessage extends EmptyPacket
+public class SessionCreateConsumerResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -15,7 +15,7 @@
  *
  * @version <tt>$Revision$</tt>
  */
-public class SessionCreateProducerMessage extends EmptyPacket
+public class SessionCreateProducerMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -13,7 +13,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionCreateProducerResponseMessage extends EmptyPacket
+public class SessionCreateProducerResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateQueueMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
 
  * @version <tt>$Revision$</tt>
  */
-public class SessionCreateQueueMessage extends EmptyPacket
+public class SessionCreateQueueMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
 
  * @version <tt>$Revision$</tt>
  */
-public class SessionDeleteQueueMessage extends EmptyPacket
+public class SessionDeleteQueueMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -17,7 +17,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionQueueQueryMessage extends EmptyPacket
+public class SessionQueueQueryMessage extends PacketImpl
 {
    private SimpleString queueName;
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -10,7 +10,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionQueueQueryResponseMessage extends EmptyPacket
+public class SessionQueueQueryResponseMessage extends PacketImpl
 {
    private boolean exists;
    

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRemoveDestinationMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -17,7 +17,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionRemoveDestinationMessage extends EmptyPacket
+public class SessionRemoveDestinationMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXACommitMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXACommitMessage extends EmptyPacket
+public class SessionXACommitMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAEndMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAEndMessage extends EmptyPacket
+public class SessionXAEndMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAForgetMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAForgetMessage extends EmptyPacket
+public class SessionXAForgetMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -19,7 +19,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAGetInDoubtXidsResponseMessage extends EmptyPacket
+public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -15,7 +15,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAGetTimeoutResponseMessage extends EmptyPacket
+public class SessionXAGetTimeoutResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAJoinMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAJoinMessage extends EmptyPacket
+public class SessionXAJoinMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAPrepareMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAPrepareMessage extends EmptyPacket
+public class SessionXAPrepareMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAResponseMessage extends EmptyPacket
+public class SessionXAResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResumeMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAResumeMessage extends EmptyPacket
+public class SessionXAResumeMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXARollbackMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXARollbackMessage extends EmptyPacket
+public class SessionXARollbackMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -15,7 +15,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXASetTimeoutMessage extends EmptyPacket
+public class SessionXASetTimeoutMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXASetTimeoutResponseMessage extends EmptyPacket
+public class SessionXASetTimeoutResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAStartMessage.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAStartMessage extends EmptyPacket
+public class SessionXAStartMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Modified: trunk/src/main/org/jboss/messaging/core/server/Queue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/Queue.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/server/Queue.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -40,9 +40,7 @@
  *
  */
 public interface Queue
-{
-   public static final int NUM_PRIORITIES = 10;
-      
+{     
    HandleStatus addLast(MessageReference ref);
    
    HandleStatus addFirst(MessageReference ref);

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -22,7 +22,7 @@
 package org.jboss.messaging.core.server.impl;
 
 import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.impl.MessageImpl;
 import org.jboss.messaging.core.persistence.StorageManager;
 import org.jboss.messaging.core.postoffice.Binding;
 import org.jboss.messaging.core.postoffice.PostOffice;
@@ -246,7 +246,7 @@
       {
          long actualExpiryTime = System.currentTimeMillis();
       
-         copy.putLongProperty(Message.HDR_ACTUAL_EXPIRY_TIME, actualExpiryTime);
+         copy.putLongProperty(MessageImpl.HDR_ACTUAL_EXPIRY_TIME, actualExpiryTime);
       }
       
       return copy;

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -26,7 +26,7 @@
 import org.jboss.messaging.core.remoting.Packet;
 import org.jboss.messaging.core.remoting.PacketReturner;
 import org.jboss.messaging.core.remoting.impl.wireformat.*;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CREATECONNECTION;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.CREATECONNECTION;
 import org.jboss.messaging.core.server.MessagingServer;
 
 /**
@@ -81,7 +81,7 @@
          response = createConnectionResponse;
 
       }
-      else if (type == EmptyPacket.PING)
+      else if (type == PacketImpl.PING)
       {
          Ping decodedPing = (Ping) packet;
          Pong pong = new Pong(decodedPing.getSessionID(), !server.getRemotingService().isSession(sender.getSessionID()));

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -67,7 +67,9 @@
    private static final Logger log = Logger.getLogger(QueueImpl.class);
 
    private static final boolean trace = log.isTraceEnabled();
-
+   
+   public static final int NUM_PRIORITIES = 10;
+   
    private volatile long persistenceID = -1;
 
    private final SimpleString name;

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -21,11 +21,12 @@
  */
 package org.jboss.messaging.core.server.impl;
 
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CLOSE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.NULL;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.SESS_BROWSER_HASNEXTMESSAGE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.SESS_BROWSER_NEXTMESSAGE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.SESS_BROWSER_RESET;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.CLOSE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NULL;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.SESS_BROWSER_HASNEXTMESSAGE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.SESS_BROWSER_NEXTMESSAGE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.SESS_BROWSER_RESET;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -39,7 +40,7 @@
 import org.jboss.messaging.core.remoting.Packet;
 import org.jboss.messaging.core.remoting.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+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.MessageReference;
@@ -233,9 +234,9 @@
          }
 
          // reply if necessary
-         if (response == null && packet.getResponseTargetID() != Packet.NO_ID_SET)
+         if (response == null && packet.getResponseTargetID() != NO_ID_SET)
          {
-            response = new EmptyPacket(NULL);               
+            response = new PacketImpl(NULL);               
          }            
          
          return response;

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -21,11 +21,13 @@
   */
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
+
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.remoting.Packet;
 import org.jboss.messaging.core.remoting.PacketReturner;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.server.ServerConnection;
 
 /**
@@ -56,17 +58,17 @@
 
       switch (type)
       {
-         case EmptyPacket.CONN_CREATESESSION:
+         case PacketImpl.CONN_CREATESESSION:
             ConnectionCreateSessionMessage request = (ConnectionCreateSessionMessage) packet;
             response = connection.createSession(request.isXA(), request.isAutoCommitSends(), request.isAutoCommitAcks(), sender);
             break;
-         case EmptyPacket.CONN_START:
+         case PacketImpl.CONN_START:
             connection.start();
             break;
-         case EmptyPacket.CONN_STOP:
+         case PacketImpl.CONN_STOP:
             connection.stop();
             break;
-         case EmptyPacket.CLOSE:
+         case PacketImpl.CLOSE:
             //clientPinger.unregister(connection.getRemotingClientSessionID());
             connection.close();
             break;
@@ -76,9 +78,9 @@
       }
 
       // reply if necessary
-      if (response == null && packet.getResponseTargetID() != Packet.NO_ID_SET)
+      if (response == null && packet.getResponseTargetID() != NO_ID_SET)
       {
-         response = new EmptyPacket(EmptyPacket.NULL);
+         response = new PacketImpl(PacketImpl.NULL);
       }
 
       return response;

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -21,12 +21,14 @@
   */
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
+
 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.PacketReturner;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowCreditMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.server.ServerConsumer;
 
 /**
@@ -60,11 +62,11 @@
       byte type = packet.getType();
       switch (type)
       {
-      case EmptyPacket.CONS_FLOWTOKEN:
+      case PacketImpl.CONS_FLOWTOKEN:
          ConsumerFlowCreditMessage message = (ConsumerFlowCreditMessage) packet;
          consumer.receiveCredits(message.getTokens());
          break;
-      case EmptyPacket.CLOSE:
+      case PacketImpl.CLOSE:
          consumer.close();
          break;
       default:
@@ -73,9 +75,9 @@
       }
 
       // reply if necessary
-      if (response == null && packet.getResponseTargetID() != Packet.NO_ID_SET)
+      if (response == null && packet.getResponseTargetID() != NO_ID_SET)
       {
-         response = new EmptyPacket(EmptyPacket.NULL);               
+         response = new PacketImpl(PacketImpl.NULL);               
       }
       
       return response;

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -21,11 +21,14 @@
   */
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
+
 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.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketReturner;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
 
 /**
@@ -66,7 +69,7 @@
       }
       
       // reply if necessary
-      if (response != null && packet.getResponseTargetID() != Packet.NO_ID_SET)
+      if (response != null && packet.getResponseTargetID() != NO_ID_SET)
       {
          response.normalize(packet);
          

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -21,10 +21,12 @@
   */
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
+
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.remoting.Packet;
 import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
 import org.jboss.messaging.core.server.ServerProducer;
 
@@ -56,11 +58,11 @@
       byte type = packet.getType();
       switch (type)
       {
-      case EmptyPacket.PROD_SEND:
+      case PacketImpl.PROD_SEND:
          ProducerSendMessage message = (ProducerSendMessage) packet;
          producer.send(message.getServerMessage());
          break;
-      case EmptyPacket.CLOSE:
+      case PacketImpl.CLOSE:
          producer.close();
          break;
       default:
@@ -69,9 +71,9 @@
       }
 
       // reply if necessary
-      if (response == null && packet.getResponseTargetID() != Packet.NO_ID_SET)
+      if (response == null && packet.getResponseTargetID() != NO_ID_SET)
       {
-         response = new EmptyPacket(EmptyPacket.NULL);               
+         response = new PacketImpl(PacketImpl.NULL);               
       }
       
       return response;

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -21,6 +21,8 @@
   */
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
+
 import java.util.List;
 
 import javax.transaction.xa.Xid;
@@ -29,7 +31,7 @@
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.Packet;
 import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionAcknowledgeMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionAddDestinationMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryMessage;
@@ -87,7 +89,7 @@
       
       switch (type)
       {
-      case EmptyPacket.SESS_CREATECONSUMER:
+      case PacketImpl.SESS_CREATECONSUMER:
       {
          SessionCreateConsumerMessage request = (SessionCreateConsumerMessage) packet;
          
@@ -96,7 +98,7 @@
          		                            request.getWindowSize(), request.getMaxRate());
          break;
       }
-      case EmptyPacket.SESS_CREATEQUEUE:
+      case PacketImpl.SESS_CREATEQUEUE:
       {
          SessionCreateQueueMessage request = (SessionCreateQueueMessage) packet;
          session.createQueue(request.getAddress(), request.getQueueName(), request
@@ -104,138 +106,138 @@
                .isTemporary());
          break;
       }
-      case EmptyPacket.SESS_DELETE_QUEUE:
+      case PacketImpl.SESS_DELETE_QUEUE:
       {
          SessionDeleteQueueMessage request = (SessionDeleteQueueMessage) packet;
          session.deleteQueue(request.getQueueName());
          break;
       }
-      case EmptyPacket.SESS_QUEUEQUERY:
+      case PacketImpl.SESS_QUEUEQUERY:
       {
          SessionQueueQueryMessage request = (SessionQueueQueryMessage) packet;
          response = session.executeQueueQuery(request);
          break;
       }
-      case EmptyPacket.SESS_BINDINGQUERY:
+      case PacketImpl.SESS_BINDINGQUERY:
       {
          SessionBindingQueryMessage request = (SessionBindingQueryMessage)packet;
          response = session.executeBindingQuery(request);
          break;
       }
-      case EmptyPacket.SESS_CREATEBROWSER:
+      case PacketImpl.SESS_CREATEBROWSER:
       {
          SessionCreateBrowserMessage request = (SessionCreateBrowserMessage) packet;
          response = session.createBrowser(request.getQueueName(), request
                .getFilterString());
          break;
       }
-      case EmptyPacket.SESS_CREATEPRODUCER:
+      case PacketImpl.SESS_CREATEPRODUCER:
       {
          SessionCreateProducerMessage request = (SessionCreateProducerMessage) packet;
          response = session.createProducer(request.getClientTargetID(), request.getAddress(), request.getWindowSize(), request.getMaxRate());
          break;
       }
-      case EmptyPacket.CLOSE:
+      case PacketImpl.CLOSE:
       {
          session.close();
          break;
       }
-      case EmptyPacket.SESS_ACKNOWLEDGE:
+      case PacketImpl.SESS_ACKNOWLEDGE:
       {
          SessionAcknowledgeMessage message = (SessionAcknowledgeMessage) packet;
          session.acknowledge(message.getDeliveryID(), message.isAllUpTo());
          break;
       }
-      case EmptyPacket.SESS_COMMIT:
+      case PacketImpl.SESS_COMMIT:
          session.commit();
          break;
-      case EmptyPacket.SESS_ROLLBACK:
+      case PacketImpl.SESS_ROLLBACK:
          session.rollback();
          break;
-      case EmptyPacket.SESS_CANCEL:
+      case PacketImpl.SESS_CANCEL:
       {
          SessionCancelMessage message = (SessionCancelMessage) packet;
          session.cancel(message.getDeliveryID(), message.isExpired());
          break;
       }
-      case EmptyPacket.SESS_XA_COMMIT:
+      case PacketImpl.SESS_XA_COMMIT:
       {
          SessionXACommitMessage message = (SessionXACommitMessage) packet;
          response = session.XACommit(message.isOnePhase(), message.getXid());
          break;
       }
-      case EmptyPacket.SESS_XA_END:
+      case PacketImpl.SESS_XA_END:
       {
          SessionXAEndMessage message = (SessionXAEndMessage) packet;
          response = session.XAEnd(message.getXid(), message.isFailed());
          break;
       }
-      case EmptyPacket.SESS_XA_FORGET:
+      case PacketImpl.SESS_XA_FORGET:
       {
          SessionXAForgetMessage message = (SessionXAForgetMessage) packet;
          response = session.XAForget(message.getXid());
          break;
       }
-      case EmptyPacket.SESS_XA_JOIN:
+      case PacketImpl.SESS_XA_JOIN:
       {
          SessionXAJoinMessage message = (SessionXAJoinMessage) packet;
          response = session.XAJoin(message.getXid());
          break;
       }
-      case EmptyPacket.SESS_XA_RESUME:
+      case PacketImpl.SESS_XA_RESUME:
       {
          SessionXAResumeMessage message = (SessionXAResumeMessage) packet;
          response = session.XAResume(message.getXid());
          break;
       }
-      case EmptyPacket.SESS_XA_ROLLBACK:
+      case PacketImpl.SESS_XA_ROLLBACK:
       {
          SessionXARollbackMessage message = (SessionXARollbackMessage) packet;
          response = session.XARollback(message.getXid());
          break;
       }
-      case EmptyPacket.SESS_XA_START:
+      case PacketImpl.SESS_XA_START:
       {
          SessionXAStartMessage message = (SessionXAStartMessage) packet;
          response = session.XAStart(message.getXid());
          break;
       }
-      case EmptyPacket.SESS_XA_SUSPEND:
+      case PacketImpl.SESS_XA_SUSPEND:
       {
          response = session.XASuspend();
          break;
       }
-      case EmptyPacket.SESS_XA_PREPARE:
+      case PacketImpl.SESS_XA_PREPARE:
       {
          SessionXAPrepareMessage message = (SessionXAPrepareMessage) packet;
          response = session.XAPrepare(message.getXid());
          break;
       }
-      case EmptyPacket.SESS_XA_INDOUBT_XIDS:
+      case PacketImpl.SESS_XA_INDOUBT_XIDS:
       {
          List<Xid> xids = session.getInDoubtXids();
          response = new SessionXAGetInDoubtXidsResponseMessage(xids);
          break;
       }
-      case EmptyPacket.SESS_XA_GET_TIMEOUT:
+      case PacketImpl.SESS_XA_GET_TIMEOUT:
       {
          response = new SessionXAGetTimeoutResponseMessage(session.getXATimeout());
          break;
       }
-      case EmptyPacket.SESS_XA_SET_TIMEOUT:
+      case PacketImpl.SESS_XA_SET_TIMEOUT:
       {
          SessionXASetTimeoutMessage message = (SessionXASetTimeoutMessage) packet;
          response = new SessionXASetTimeoutResponseMessage(session.setXATimeout(message
                .getTimeoutSeconds()));
          break;
       }
-      case EmptyPacket.SESS_ADD_DESTINATION:
+      case PacketImpl.SESS_ADD_DESTINATION:
       {
          SessionAddDestinationMessage message = (SessionAddDestinationMessage) packet;
          session.addDestination(message.getAddress(), message.isTemporary());
          break;
       }
-      case EmptyPacket.SESS_REMOVE_DESTINATION:
+      case PacketImpl.SESS_REMOVE_DESTINATION:
       {
          SessionRemoveDestinationMessage message = (SessionRemoveDestinationMessage) packet;
          session.removeDestination(message.getAddress(), message.isTemporary());
@@ -246,9 +248,9 @@
       }
       
       // reply if necessary
-      if (response == null && packet.getResponseTargetID() != Packet.NO_ID_SET)
+      if (response == null && packet.getResponseTargetID() != NO_ID_SET)
       {
-         response = new EmptyPacket(EmptyPacket.NULL);               
+         response = new PacketImpl(PacketImpl.NULL);               
       }
 
       return response;

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/Handler.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/Handler.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/Handler.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -17,7 +17,7 @@
 import org.jboss.messaging.core.remoting.Packet;
 import org.jboss.messaging.core.remoting.PacketReturner;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
 import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
 
@@ -66,7 +66,7 @@
    
    protected boolean isRequest(final Packet packet)
    {
-      return packet.getTargetID() != EmptyPacket.NO_ID_SET && packet.getResponseTargetID() != EmptyPacket.NO_ID_SET;
+      return packet.getTargetID() != PacketImpl.NO_ID_SET && packet.getResponseTargetID() != PacketImpl.NO_ID_SET;
    }
    
    @Override

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerPingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerPingTest.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerPingTest.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -7,7 +7,7 @@
 package org.jboss.messaging.tests.integration.core.remoting.mina;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CREATECONNECTION;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.CREATECONNECTION;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicLong;
@@ -23,7 +23,7 @@
 import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
 import org.jboss.messaging.core.remoting.impl.RemotingServiceImpl;
 import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.server.impl.ServerPacketHandlerSupport;
 import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
 
@@ -122,7 +122,7 @@
             response = createConnectionResponse;*/
 
          }
-         else if (type == EmptyPacket.PING)
+         else if (type == PacketImpl.PING)
          {
             //do nothing
          }

Modified: trunk/tests/src/org/jboss/messaging/tests/performance/remoting/impl/MeasureBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/performance/remoting/impl/MeasureBase.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/tests/src/org/jboss/messaging/tests/performance/remoting/impl/MeasureBase.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -17,7 +17,7 @@
 import org.jboss.messaging.core.remoting.PacketReturner;
 import org.jboss.messaging.core.remoting.impl.RemotingConnectionImpl;
 import org.jboss.messaging.core.remoting.impl.RemotingServiceImpl;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 
 
 /**
@@ -56,13 +56,13 @@
       {
          if (i % 2 == 0)
          {
-            remoting.sendOneWay(10, 10, new EmptyPacket(EmptyPacket.CLOSE));
+            remoting.sendOneWay(10, 10, new PacketImpl(PacketImpl.CLOSE));
          }
          else
          {
-            Object ret = remoting.sendBlocking(10, 0, new EmptyPacket(EmptyPacket.CLOSE));
-            assertTrue(ret instanceof EmptyPacket);
-            //assertEquals(EmptyPacket.EXCEPTION, ret.getType());
+            Object ret = remoting.sendBlocking(10, 0, new PacketImpl(PacketImpl.CLOSE));
+            assertTrue(ret instanceof PacketImpl);
+            //assertEquals(PacketImpl.EXCEPTION, ret.getType());
          }
       }
 
@@ -91,8 +91,8 @@
 
       for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
       {
-         Object ret = remoting.sendBlocking(10, 10, new EmptyPacket(EmptyPacket.CLOSE));
-         assertTrue(ret instanceof EmptyPacket);
+         Object ret = remoting.sendBlocking(10, 10, new PacketImpl(PacketImpl.CLOSE));
+         assertTrue(ret instanceof PacketImpl);
       }
 
       long end = System.currentTimeMillis();
@@ -120,10 +120,10 @@
 
       for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
       {
-         remoting.sendOneWay(10, 10, new EmptyPacket(EmptyPacket.CLOSE));
+         remoting.sendOneWay(10, 10, new PacketImpl(PacketImpl.CLOSE));
       }
 
-      remoting.sendBlocking(10, 10, new EmptyPacket(EmptyPacket.CLOSE));
+      remoting.sendBlocking(10, 10, new PacketImpl(PacketImpl.CLOSE));
 
       long end = System.currentTimeMillis();
 

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientBrowserImplTest.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -29,7 +29,7 @@
 import org.jboss.messaging.core.client.impl.ClientSessionInternal;
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.RemotingConnection;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+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.tests.util.UnitTestCase;
@@ -85,7 +85,7 @@
       
       EasyMock.expect(session.getServerTargetID()).andReturn(sessionTargetID);
       
-      EasyMock.expect(rc.sendBlocking(targetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_BROWSER_NEXTMESSAGE))).andReturn(resp);
+      EasyMock.expect(rc.sendBlocking(targetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_BROWSER_NEXTMESSAGE))).andReturn(resp);
       
       EasyMock.replay(session, connection, rc);
       
@@ -114,7 +114,7 @@
       
       EasyMock.expect(session.getServerTargetID()).andReturn(sessionTargetID);
       
-      EasyMock.expect(rc.sendBlocking(targetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_BROWSER_RESET))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(targetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_BROWSER_RESET))).andReturn(null);
       
       EasyMock.replay(session, connection, rc);
       
@@ -150,7 +150,7 @@
       
       EasyMock.expect(session.getServerTargetID()).andReturn(sessionTargetID);
       
-      EasyMock.expect(rc.sendBlocking(targetID, sessionTargetID, new EmptyPacket(EmptyPacket.CLOSE))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(targetID, sessionTargetID, new PacketImpl(PacketImpl.CLOSE))).andReturn(null);
       
       session.removeBrowser(browser);
       
@@ -194,7 +194,7 @@
       
       EasyMock.expect(session.getServerTargetID()).andReturn(sessionTargetID);
       
-      EasyMock.expect(rc.sendBlocking(targetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_BROWSER_HASNEXTMESSAGE))).andReturn(resp);
+      EasyMock.expect(rc.sendBlocking(targetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_BROWSER_HASNEXTMESSAGE))).andReturn(resp);
       
       EasyMock.replay(session, connection, rc);
       

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConnectionImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConnectionImplTest.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConnectionImplTest.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -40,7 +40,7 @@
 import org.jboss.messaging.core.remoting.TransportType;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.version.Version;
 import org.jboss.messaging.core.version.impl.VersionImpl;
 import org.jboss.messaging.tests.util.UnitTestCase;
@@ -95,9 +95,9 @@
       
       ClientConnectionInternal conn = new ClientConnectionImpl(cf, serverTargetID, rc, version);
       
-      rc.sendOneWay(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.CONN_START));
+      rc.sendOneWay(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.CONN_START));
       
-      EasyMock.expect(rc.sendBlocking(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.CONN_STOP))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.CONN_STOP))).andReturn(null);
       
       EasyMock.replay(rc);
       
@@ -170,7 +170,7 @@
       sess2.close();
       sess3.close();
       
-      EasyMock.expect(rc.sendBlocking(serverTargetID, serverTargetID, new EmptyPacket(EmptyPacket.CLOSE))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(serverTargetID, serverTargetID, new PacketImpl(PacketImpl.CLOSE))).andReturn(null);
             
       rc.stop();      
       

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientConsumerPacketHandlerTest.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -26,7 +26,7 @@
 import org.jboss.messaging.core.client.impl.ClientConsumerInternal;
 import org.jboss.messaging.core.client.impl.ClientConsumerPacketHandler;
 import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
 import org.jboss.messaging.tests.util.UnitTestCase;
 
@@ -63,7 +63,7 @@
       
       try
       {
-         handler.handle(new EmptyPacket(EmptyPacket.CONN_START), EasyMock.createStrictMock(PacketReturner.class));
+         handler.handle(new PacketImpl(PacketImpl.CONN_START), EasyMock.createStrictMock(PacketReturner.class));
          fail("Should throw Exception");
       }
       catch (IllegalStateException e)

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerPacketHandlerTest.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -26,7 +26,7 @@
 import org.jboss.messaging.core.client.impl.ClientProducerInternal;
 import org.jboss.messaging.core.client.impl.ClientProducerPacketHandler;
 import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.ProducerFlowCreditMessage;
 import org.jboss.messaging.tests.util.UnitTestCase;
 
@@ -63,7 +63,7 @@
       
       try
       {
-         handler.handle(new EmptyPacket(EmptyPacket.CONN_START), EasyMock.createStrictMock(PacketReturner.class));
+         handler.handle(new PacketImpl(PacketImpl.CONN_START), EasyMock.createStrictMock(PacketReturner.class));
          fail("Should throw Exception");
       }
       catch (IllegalStateException e)

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-06-16 11:56:32 UTC (rev 4478)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientSessionImplTest.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -49,7 +49,7 @@
 import org.jboss.messaging.core.remoting.RemotingConnection;
 import org.jboss.messaging.core.remoting.TransportType;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowCreditMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionAcknowledgeMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionAddDestinationMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryMessage;
@@ -630,7 +630,7 @@
             
       rc.sendOneWay(sessionTargetID, sessionTargetID, message);
 
-      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_COMMIT))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_COMMIT))).andReturn(null);
       
       //Create some consumers
       
@@ -644,7 +644,7 @@
       
       rc.sendOneWay(sessionTargetID, sessionTargetID, message2);
 
-      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_ROLLBACK))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_ROLLBACK))).andReturn(null);
                   
       EasyMock.replay(conn, rc, pd, cons1, cons2);
       
@@ -711,7 +711,7 @@
          rc.sendOneWay(sessionTargetID, sessionTargetID, message);
       }
       
-      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_COMMIT))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_COMMIT))).andReturn(null);
                   
       EasyMock.replay(conn);
       EasyMock.replay(rc);
@@ -758,7 +758,7 @@
          rc.sendOneWay(sessionTargetID, sessionTargetID, message);
       }
       
-      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_COMMIT))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_COMMIT))).andReturn(null);
                   
       EasyMock.replay(conn);
       EasyMock.replay(rc);
@@ -911,7 +911,7 @@
         
       final long sessionTargetID = 9121892;
       
-      Packet packet = new EmptyPacket(EmptyPacket.SESS_XA_GET_TIMEOUT);
+      Packet packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT);
 
       final int timeout = 1098289;
       
@@ -1200,7 +1200,7 @@
          rc.sendOneWay(sessionTargetID, sessionTargetID, message);
       }
             
-      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new EmptyPacket(EmptyPacket.CLOSE))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new PacketImpl(PacketImpl.CLOSE))).andReturn(null);
       
       conn.removeSession(session);      
             
@@ -1585,7 +1585,7 @@
                   
       if ((flags & XAResource.TMSTARTRSCAN) == XAResource.TMSTARTRSCAN)
       {
-         EmptyPacket packet = new EmptyPacket(EmptyPacket.SESS_XA_INDOUBT_XIDS);
+         PacketImpl packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS);
          
          SessionXAGetInDoubtXidsResponseMessage resp = new SessionXAGetInDoubtXidsResponseMessage(Arrays.asList(xids));
          
@@ -1740,7 +1740,7 @@
       Packet packet = null;
       if (flags == XAResource.TMSUSPEND)
       {
-         packet = new EmptyPacket(EmptyPacket.SESS_XA_SUSPEND);                  
+         packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND);                  
       }
       else if (flags == XAResource.TMSUCCESS)
       {
@@ -1931,7 +1931,7 @@
          }
       }
 
-      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_COMMIT))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_COMMIT))).andReturn(null);
       
       ClientConsumerInternal cons1 = EasyMock.createStrictMock(ClientConsumerInternal.class);
       ClientConsumerInternal cons2 = EasyMock.createStrictMock(ClientConsumerInternal.class);
@@ -1953,7 +1953,7 @@
       cons1.recover(numMessages * 2);
       cons2.recover(numMessages * 2);
             
-      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_ROLLBACK))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_ROLLBACK))).andReturn(null);
                                      
       EasyMock.replay(conn, rc, pd, cons1, cons2);
             
@@ -2016,7 +2016,7 @@
          }
       }
       
-      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_COMMIT))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_COMMIT))).andReturn(null);
       
       final int[] messages2 = new int[] { 43, 44, 50, 47, 48, 60, 45, 61, 62, 64 };
       
@@ -2041,7 +2041,7 @@
       cons1.recover(36);
       cons2.recover(36);
             
-      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new EmptyPacket(EmptyPacket.SESS_ROLLBACK))).andReturn(null);
+      EasyMock.expect(rc.sendBlocking(sessionTargetID, sessionTargetID, new PacketImpl(PacketImpl.SESS_ROLLBACK))).andReturn(null);
                         
       EasyMock.replay(conn, rc, pd, cons1, cons2);
       

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/MessagingCodecImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/MessagingCodecImplTest.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/MessagingCodecImplTest.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -60,11 +60,11 @@
    }
    public void testEmptyPacket() throws Exception
    {
-      EmptyPacket message = new EmptyPacket(EmptyPacket.NULL);
+      PacketImpl message = new PacketImpl(PacketImpl.NULL);
       setHeaders(message);
       codec.encode(buff, message);
       buff.rewind();
-      EmptyPacket copy = (EmptyPacket) codec.decode(buff);
+      PacketImpl copy = (PacketImpl) codec.decode(buff);
       checkHeaders(message, copy);
    }
 
@@ -585,14 +585,14 @@
       assertByteArraysEquivalent(message.getXid().getGlobalTransactionId(), copy.getXid().getGlobalTransactionId());
    }
 
-   private void setHeaders(EmptyPacket packet)
+   private void setHeaders(PacketImpl packet)
    {
       packet.setExecutorID(RandomUtil.randomLong());
       packet.setResponseTargetID(RandomUtil.randomLong());
       packet.setTargetID(RandomUtil.randomLong());
    }
 
-   private void checkHeaders(EmptyPacket emptyPacket, EmptyPacket emptyPacket2)
+   private void checkHeaders(PacketImpl emptyPacket, PacketImpl emptyPacket2)
    {
       assertEquals(emptyPacket.getExecutorID(), emptyPacket2.getExecutorID());
       assertEquals(emptyPacket.getResponseTargetID(), emptyPacket2.getResponseTargetID());

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaProtocolCodecFilterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaProtocolCodecFilterTest.java	2008-06-16 11:56:32 UTC (rev 4478)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaProtocolCodecFilterTest.java	2008-06-16 13:07:56 UTC (rev 4479)
@@ -14,7 +14,7 @@
 import org.jboss.messaging.core.remoting.impl.mina.IoBufferWrapper;
 import org.jboss.messaging.core.remoting.impl.mina.MinaProtocolCodecFilter;
 import org.jboss.messaging.core.remoting.impl.wireformat.*;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.*;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.*;
 import org.jboss.messaging.core.version.impl.VersionImpl;
 import org.jboss.messaging.tests.unit.core.remoting.impl.CodecAssert;
 import static org.jboss.messaging.tests.unit.core.remoting.impl.CodecAssert.assertSameXids;
@@ -179,14 +179,14 @@
 
    public void testNullPacket() throws Exception
    {
-      Packet packet = new EmptyPacket(NULL);
+      Packet packet = new PacketImpl(NULL);
       packet.setResponseTargetID(randomLong());
       packet.setTargetID(randomLong());
       packet.setExecutorID(randomLong());
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(packet);
 
-      assertTrue(decodedPacket instanceof EmptyPacket);
+      assertTrue(decodedPacket instanceof PacketImpl);
       assertEquals(NULL, decodedPacket.getType());
       assertEquals(packet.getResponseTargetID(), decodedPacket
             .getResponseTargetID());
@@ -425,7 +425,7 @@
 
    public void testStartConnectionMessage() throws Exception
    {
-      Packet packet = new EmptyPacket(CONN_START);
+      Packet packet = new PacketImpl(CONN_START);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(packet);
 
@@ -434,7 +434,7 @@
 
    public void testStopConnectionMessage() throws Exception
    {
-      Packet packet = new EmptyPacket(CONN_STOP);
+      Packet packet = new PacketImpl(CONN_STOP);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(packet);
 
@@ -518,7 +518,7 @@
 
    public void testSessionCommitMessage() throws Exception
    {
-      Packet message = new EmptyPacket(SESS_COMMIT);
+      Packet message = new PacketImpl(SESS_COMMIT);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(message);
 
@@ -527,7 +527,7 @@
 
    public void testSessionRollbackMessage() throws Exception
    {
-      Packet message = new EmptyPacket(SESS_ROLLBACK);
+      Packet message = new PacketImpl(SESS_ROLLBACK);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(message);
 
@@ -536,7 +536,7 @@
 
    public void testSessionRecoverMessage() throws Exception
    {
-      Packet message = new EmptyPacket(SESS_RECOVER);
+      Packet message = new PacketImpl(SESS_RECOVER);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(message);
 
@@ -545,7 +545,7 @@
 
    public void testCloseMessage() throws Exception
    {
-      Packet message = new EmptyPacket(CLOSE);
+      Packet message = new PacketImpl(CLOSE);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(message);
 
@@ -587,7 +587,7 @@
 
    public void testBrowserResetMessage() throws Exception
    {
-      Packet message = new EmptyPacket(SESS_BROWSER_RESET);
+      Packet message = new PacketImpl(SESS_BROWSER_RESET);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(message);
 
@@ -596,7 +596,7 @@
 
    public void testBrowserHasNextMessageRequest() throws Exception
    {
-      Packet request = new EmptyPacket(SESS_BROWSER_HASNEXTMESSAGE);
+      Packet request = new PacketImpl(SESS_BROWSER_HASNEXTMESSAGE);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(request);
 
@@ -620,7 +620,7 @@
 
    public void testBrowserNextMessageRequest() throws Exception
    {
-      Packet request = new EmptyPacket(SESS_BROWSER_NEXTMESSAGE);
+      Packet request = new PacketImpl(SESS_BROWSER_NEXTMESSAGE);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(request);
 
@@ -672,7 +672,7 @@
 
    public void testSessionXAGetInDoubtXidsMessage() throws Exception
    {
-      Packet request = new EmptyPacket(SESS_XA_INDOUBT_XIDS);
+      Packet request = new PacketImpl(SESS_XA_INDOUBT_XIDS);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(request);
 
@@ -701,7 +701,7 @@
 
    public void testSessionXAGetTimeoutMessage() throws Exception
    {
-      Packet message = new EmptyPacket(SESS_XA_GET_TIMEOUT);
+      Packet message = new PacketImpl(SESS_XA_GET_TIMEOUT);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(message);
 
@@ -836,7 +836,7 @@
 
    public void testSessionXASuspendMessage() throws Exception
    {
-      Packet message = new EmptyPacket(SESS_XA_SUSPEND);
+      Packet message = new PacketImpl(SESS_XA_SUSPEND);
 
       Packet decodedPacket = encodeAndCheckBytesAndDecode(message);
 




More information about the jboss-cvs-commits mailing list