[jboss-cvs] JBoss Messaging SVN: r4022 - in trunk: src/main/org/jboss/messaging/core/remoting and 11 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Apr 8 10:55:46 EDT 2008


Author: jmesnil
Date: 2008-04-08 10:55:45 -0400 (Tue, 08 Apr 2008)
New Revision: 4022

Added:
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java
Removed:
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/AbstractPacket.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CloseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionStartMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionStopMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/NullPacket.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserHasNextMessageMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserResetMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCommitMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRecoverMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRollbackMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASuspendMessage.java
Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.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/client/impl/RemotingConnection.java
   trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/NIOSession.java
   trunk/src/main/org/jboss/messaging/core/remoting/PacketHandler.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/AbstractPacketCodec.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaDecoder.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaEncoder.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaInspector.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/PacketCodecFactory.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/BytesPacket.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/ConsumerDeliverMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerFlowTokenMessage.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/Packet.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketType.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/ProducerReceiveTokensMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.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/SessionBrowserNextMessageBlockMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageBlockResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCancelMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateQueueMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRemoveDestinationMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXACommitMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAEndMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAForgetMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAJoinMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAPrepareMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResumeMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXARollbackMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAStartMessage.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/TextPacket.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.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/ServerProducerPacketHandler.java
   trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/SessionTestBase.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaSessionTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/stress/PacketStressTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/wireformat/test/unit/PacketTypeTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/TestPacketHandler.java
Log:
* renamed AbstractPacket to PacketImpl
* modified PacketType to make it a class with constant bytes instead of a Enum
* removed subclasses of PacketImpl which had empty body and used directly  PacketImpl instead

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -21,17 +21,19 @@
   */
 package org.jboss.messaging.core.client.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_HASNEXTMESSAGE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_NEXTMESSAGE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_RESET;
+
 import org.jboss.messaging.core.client.ClientBrowser;
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.impl.wireformat.CloseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageBlockMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageBlockResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserResetMessage;
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -81,7 +83,7 @@
       
       try
       {
-         remotingConnection.send(id, session.getID(), new CloseMessage());
+         remotingConnection.send(id, session.getID(), new PacketImpl(CLOSE));
       }
       finally
       {
@@ -100,7 +102,7 @@
    {
       checkClosed();
       
-      remotingConnection.send(id, session.getID(), new SessionBrowserResetMessage());
+      remotingConnection.send(id, session.getID(), new PacketImpl(SESS_BROWSER_RESET));
    }
 
    public boolean hasNextMessage() throws MessagingException
@@ -108,7 +110,7 @@
       checkClosed();
       
       SessionBrowserHasNextMessageResponseMessage response =
-         (SessionBrowserHasNextMessageResponseMessage)remotingConnection.send(id, session.getID(), new SessionBrowserHasNextMessageMessage());
+         (SessionBrowserHasNextMessageResponseMessage)remotingConnection.send(id, session.getID(), new PacketImpl(SESS_BROWSER_HASNEXTMESSAGE));
       
       return response.hasNext();
    }
@@ -118,7 +120,7 @@
       checkClosed();
       
       SessionBrowserNextMessageResponseMessage response =
-         (SessionBrowserNextMessageResponseMessage)remotingConnection.send(id, session.getID(), new SessionBrowserNextMessageMessage());
+         (SessionBrowserNextMessageResponseMessage)remotingConnection.send(id, session.getID(), new PacketImpl(SESS_BROWSER_NEXTMESSAGE));
       
       return response.getMessage();
    }

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -21,6 +21,10 @@
   */
 package org.jboss.messaging.core.client.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_START;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_STOP;
+
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -30,11 +34,9 @@
 import org.jboss.messaging.core.client.FailureListener;
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.impl.wireformat.CloseMessage;
 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.ConnectionStartMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionStopMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 
 /**
  * The client-side Connection connectionFactory class.
@@ -133,14 +135,14 @@
    {
       checkClosed();
        
-      remotingConnection.send(id, id, new ConnectionStartMessage(), true);
+      remotingConnection.send(id, id, new PacketImpl(CONN_START), true);
    }
    
    public void stop() throws MessagingException
    {
       checkClosed();
       
-      remotingConnection.send(id, new ConnectionStopMessage());
+      remotingConnection.send(id, new PacketImpl(CONN_STOP));
    }
 
    public void setFailureListener(final FailureListener listener) throws MessagingException
@@ -161,7 +163,7 @@
       {
          closeChildren();
          
-         remotingConnection.send(id, new CloseMessage());
+         remotingConnection.send(id, new 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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -21,6 +21,8 @@
  */
 package org.jboss.messaging.core.client.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
+
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -31,9 +33,9 @@
 import org.jboss.messaging.core.list.impl.PriorityLinkedListImpl;
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.impl.wireformat.CloseMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -245,7 +247,7 @@
          
          receiverThread = null;
 
-         remotingConnection.send(id, session.getID(), new CloseMessage());
+         remotingConnection.send(id, session.getID(), new PacketImpl(CLOSE));
 
          remotingConnection.getPacketDispatcher().unregister(id);
       }

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,11 +1,12 @@
 package org.jboss.messaging.core.client.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_DELIVER;
+
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketSender;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -37,9 +38,9 @@
    {
       try
       {
-         PacketType type = packet.getType();
+         byte type = packet.getType();
          
-         if (type == PacketType.CONS_DELIVER)
+         if (type == CONS_DELIVER)
          {
             ConsumerDeliverMessage message = (ConsumerDeliverMessage) 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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,11 +1,12 @@
 package org.jboss.messaging.core.client.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PROD_RECEIVETOKENS;
+
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 import org.jboss.messaging.core.remoting.impl.wireformat.ProducerReceiveTokensMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
 
 /**
  * 
@@ -38,9 +39,9 @@
    {
       try
       {
-         PacketType type = packet.getType();
+         byte type = packet.getType();
          
-         if (type == PacketType.PROD_RECEIVETOKENS)
+         if (type == PROD_RECEIVETOKENS)
          {
             ProducerReceiveTokensMessage message = (ProducerReceiveTokensMessage) 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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -21,6 +21,13 @@
   */
 package org.jboss.messaging.core.client.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_COMMIT;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ROLLBACK;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_GET_TIMEOUT;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_INDOUBT_XIDS;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_SUSPEND;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -38,15 +45,14 @@
 import org.jboss.messaging.core.client.ClientProducer;
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
-import org.jboss.messaging.core.remoting.impl.wireformat.CloseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
+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;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionCancelMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionCommitMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionCreateBrowserMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionCreateBrowserResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionCreateConsumerMessage;
@@ -58,13 +64,10 @@
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionQueueQueryMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionRemoveDestinationMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionRollbackMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXACommitMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAEndMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAForgetMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetTimeoutMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetTimeoutResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAJoinMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAPrepareMessage;
@@ -74,7 +77,6 @@
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASuspendMessage;
 import org.jboss.messaging.jms.client.SelectorTranslator;
 
 /**
@@ -363,7 +365,7 @@
         
       acknowledgeInternal(false);
       
-      remotingConnection.send(id, new SessionCommitMessage());
+      remotingConnection.send(id, new PacketImpl(SESS_COMMIT));
       
       lastCommittedID = lastID;
    }
@@ -391,7 +393,7 @@
 
       toAckCount = 0;
 
-      remotingConnection.send(id, new SessionRollbackMessage());   
+      remotingConnection.send(id, new PacketImpl(SESS_ROLLBACK));   
    }
    
    public void acknowledge() throws MessagingException
@@ -452,7 +454,7 @@
          
          acknowledgeInternal(false);      
          
-         remotingConnection.send(id, new CloseMessage());
+         remotingConnection.send(id, new PacketImpl(CLOSE));
    
          executor.shutdown();
       }
@@ -560,11 +562,11 @@
    {
       try
       {
-         AbstractPacket packet;
+         Packet packet;
          
          if (flags == XAResource.TMSUSPEND)
          {
-            packet = new SessionXASuspendMessage();                  
+            packet = new PacketImpl(SESS_XA_SUSPEND);                  
          }
          else if (flags == XAResource.TMSUCCESS)
          {
@@ -623,7 +625,7 @@
       try
       {                              
          SessionXAGetTimeoutResponseMessage response =
-            (SessionXAGetTimeoutResponseMessage)remotingConnection.send(id, new SessionXAGetTimeoutMessage());
+            (SessionXAGetTimeoutResponseMessage)remotingConnection.send(id, new PacketImpl(SESS_XA_GET_TIMEOUT));
          
          return response.getTimeoutSeconds();
       }
@@ -680,10 +682,8 @@
    {
       try
       {
-         SessionXAGetInDoubtXidsMessage packet = new SessionXAGetInDoubtXidsMessage();
+         SessionXAGetInDoubtXidsResponseMessage response = (SessionXAGetInDoubtXidsResponseMessage)remotingConnection.send(id, new PacketImpl(SESS_XA_INDOUBT_XIDS));
          
-         SessionXAGetInDoubtXidsResponseMessage response = (SessionXAGetInDoubtXidsResponseMessage)remotingConnection.send(id, packet);
-         
          List<Xid> xids = response.getXids();
          
          Xid[] xidArray = xids.toArray(new Xid[xids.size()]);
@@ -738,7 +738,7 @@
    {
       try
       {
-         AbstractPacket packet;
+         Packet packet;
          
          if (flags == XAResource.TMJOIN)
          {

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnection.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnection.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -3,7 +3,7 @@
 import org.jboss.messaging.core.client.FailureListener;
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 
 /**
  * 
@@ -24,11 +24,11 @@
     * Use this method if the packet is to be executed in the context of the targetID (i.e. for
     * sessions, connections & connections factories)
     */
-   AbstractPacket send(String targetID, AbstractPacket packet) throws MessagingException;
+   Packet send(String targetID, Packet packet) throws MessagingException;
 
-   AbstractPacket send(String targetID, String executorID, AbstractPacket packet) throws MessagingException;
+   Packet send(String targetID, String executorID, Packet packet) throws MessagingException;
    
-   AbstractPacket send(String targetID, String executorID, AbstractPacket packet, boolean oneWay) throws MessagingException;
+   Packet send(String targetID, String executorID, Packet packet, boolean oneWay) throws MessagingException;
    
    void setFailureListener(FailureListener newListener);
    

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -31,8 +31,8 @@
 import org.jboss.messaging.core.remoting.NIOConnector;
 import org.jboss.messaging.core.remoting.NIOSession;
 import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
 import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 
 /**
  * 
@@ -125,8 +125,8 @@
       }
       return session.getID();
    }
- 
-   public AbstractPacket send(String targetID, AbstractPacket packet)
+    
+   public Packet send(String targetID, Packet packet)
          throws MessagingException
    {
       return send(targetID, targetID, packet);
@@ -135,23 +135,23 @@
    /**
     * send the packet and block until a response is received (<code>oneWay</code> is set to <code>false</code>)
     */
-   public AbstractPacket send(final String targetID, final String executorID, final AbstractPacket packet) throws MessagingException
+   public Packet send(final String targetID, final String executorID, final Packet packet) throws MessagingException
    {
       return send(targetID, executorID, packet, false);
    }
    
-   public AbstractPacket send(final String targetID, final String executorID, final AbstractPacket packet, final boolean oneWay) throws MessagingException
+   public Packet send(final String targetID, final String executorID, final Packet packet, final boolean oneWay) throws MessagingException
    {
       assert packet != null;
 
       packet.setTargetID(targetID);
       packet.setExecutorID(executorID);
       
-      AbstractPacket response;
+      Packet response;
       
       try
       {      
-         response = (AbstractPacket) send(packet, oneWay);
+         response = (Packet) send(packet, oneWay);
       }
       catch (Exception e)
       {
@@ -206,7 +206,7 @@
 
    // Private --------------------------------------------------------------------------------------
 
-   private AbstractPacket send(final AbstractPacket packet, final boolean oneWay) throws Exception
+   private Packet send(final Packet packet, final boolean oneWay) throws Exception
    {
       assert packet != null;
       checkConnected();
@@ -218,7 +218,7 @@
          return null;
       } else 
       {
-         AbstractPacket response = (AbstractPacket) session.writeAndBlock(packet, 
+         Packet response = (Packet) session.writeAndBlock(packet, 
                config.getTimeout(), SECONDS);
          return response;
       }

Modified: trunk/src/main/org/jboss/messaging/core/remoting/NIOSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/NIOSession.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/NIOSession.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -8,7 +8,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -23,7 +23,7 @@
 
    void write(Object object) throws Exception;
 
-   Object writeAndBlock(AbstractPacket packet, long timeout, TimeUnit timeUnit) throws Exception;
+   Object writeAndBlock(Packet packet, long timeout, TimeUnit timeUnit) throws Exception;
 
    boolean isConnected();
 }
\ No newline at end of file

Modified: trunk/src/main/org/jboss/messaging/core/remoting/PacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/PacketHandler.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/PacketHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -6,11 +6,10 @@
  */
 package org.jboss.messaging.core.remoting;
 
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 
 /**
- * A PacketHandler handles packets (as defined by {@link AbstractPacket} and its
+ * A PacketHandler handles packets (as defined by {@link Packet} and its
  * subclasses).
  * 
  * It must have an ID unique among all PacketHandlers (or at least among those

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -7,7 +7,7 @@
 package org.jboss.messaging.core.remoting.impl;
 
 import static org.jboss.messaging.core.remoting.impl.Assert.assertValidID;
-import static org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket.NO_ID_SET;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
 
 import java.io.Serializable;
 import java.util.List;

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/AbstractPacketCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/AbstractPacketCodec.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/AbstractPacketCodec.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -9,7 +9,7 @@
 import static org.jboss.messaging.core.remoting.impl.codec.DecoderStatus.NEED_DATA;
 import static org.jboss.messaging.core.remoting.impl.codec.DecoderStatus.NOT_OK;
 import static org.jboss.messaging.core.remoting.impl.codec.DecoderStatus.OK;
-import static org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket.NO_ID_SET;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
 
 import java.nio.charset.CharacterCodingException;
 
@@ -17,7 +17,6 @@
 
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
 import org.jboss.messaging.core.transaction.impl.XidImpl;
 
 /**
@@ -43,16 +42,14 @@
 
    // Attributes ----------------------------------------------------
 
-   private PacketType type;
+   protected final byte type;
 
    // Static --------------------------------------------------------
    
    // Constructors --------------------------------------------------
    
-   protected AbstractPacketCodec(PacketType type)
+   protected AbstractPacketCodec(byte type)
    {
-      assert type != null;
-
       this.type = type;
    }
 
@@ -84,7 +81,7 @@
       }
       int headerLength = LONG_LENGTH + sizeof(targetID) + sizeof(callbackID) + sizeof(executorID) + BOOLEAN_LENGTH;
 
-      buf.put(packet.getType().byteValue());
+      buf.put(packet.getType());
       buf.putInt(headerLength);
       buf.putLong(correlationID);
       buf.putNullableString(targetID);
@@ -174,7 +171,7 @@
       return OK;
    }
 
-   public P decode(RemotingBuffer wrapper) throws Exception
+   public Packet decode(RemotingBuffer wrapper) throws Exception
    {
       wrapper.get(); // skip message type
       wrapper.getInt(); // skip header length
@@ -184,7 +181,7 @@
       String executorID = wrapper.getNullableString();
       boolean oneWay = wrapper.getBoolean();
       
-      P packet = decodeBody(wrapper);
+      Packet packet = decodeBody(wrapper);
 
       if (packet == null)
       {
@@ -213,7 +210,7 @@
    protected abstract void encodeBody(P packet, RemotingBuffer buf)
          throws Exception;
 
-   protected abstract P decodeBody(RemotingBuffer buffer) throws Exception;
+   protected abstract Packet decodeBody(RemotingBuffer buffer) throws Exception;
 
    protected static void encodeXid(Xid xid, RemotingBuffer out)
    {

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,6 @@
 import org.jboss.messaging.core.remoting.NIOSession;
 import org.jboss.messaging.core.remoting.PacketDispatcher;
 import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 
 /**
@@ -74,9 +73,9 @@
 
    public void write(final Object object) throws Exception
    {
-      assert object instanceof AbstractPacket;
+      assert object instanceof Packet;
 
-      serverDispatcher.dispatch((AbstractPacket) object,
+      serverDispatcher.dispatch((Packet) object,
             new PacketSender()
             {
                public void send(Packet response) throws Exception
@@ -97,7 +96,7 @@
             });
    }
 
-   public Object writeAndBlock(final AbstractPacket request, long timeout, TimeUnit timeUnit) throws Exception
+   public Object writeAndBlock(final Packet request, long timeout, TimeUnit timeUnit) throws Exception
    {
       request.setCorrelationID(correlationCounter++);
       final Packet[] responses = new Packet[1];

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaDecoder.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaDecoder.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaDecoder.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -18,7 +18,6 @@
 import org.jboss.messaging.core.remoting.impl.codec.DecoderStatus;
 import org.jboss.messaging.core.remoting.impl.codec.RemotingBuffer;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -45,9 +44,9 @@
 
    // Public --------------------------------------------------------
 
-   public void put(PacketType type, AbstractPacketCodec codec)
+   public void put(byte type, AbstractPacketCodec codec)
    {
-      codecs.put(type.byteValue(), codec);
+      codecs.put(type, codec);
    }
    
    // MessageDecoder implementation ---------------------------------

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaEncoder.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaEncoder.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaEncoder.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -30,7 +30,7 @@
 
    // Attributes ----------------------------------------------------
 
-   private final Map<PacketType, AbstractPacketCodec> codecs;
+   private final Map<Byte, AbstractPacketCodec> codecs;
 
    // Static --------------------------------------------------------
 
@@ -38,11 +38,11 @@
 
     MinaEncoder()
    {
-      codecs = new HashMap<PacketType, AbstractPacketCodec>();
+      codecs = new HashMap<Byte, AbstractPacketCodec>();
    }
    // Public --------------------------------------------------------
 
-   public void put(PacketType type, AbstractPacketCodec codec)
+   public void put(byte type, AbstractPacketCodec codec)
    {
       codecs.put(type, codec);
    }

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -20,7 +20,7 @@
 import org.jboss.messaging.core.remoting.PacketHandlerRegistrationListener;
 import org.jboss.messaging.core.remoting.PacketSender;
 import org.jboss.messaging.core.remoting.RemotingException;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
 import org.jboss.messaging.util.OrderedExecutorFactory;
@@ -130,7 +130,7 @@
       final Packet packet = (Packet) message;
       String executorID = packet.getExecutorID();
       
-      if (AbstractPacket.NO_ID_SET.equals(executorID)) 
+      if (PacketImpl.NO_ID_SET.equals(executorID)) 
          throw new IllegalArgumentException("executor ID not set for " + packet);
       
       Executor executor = executors.get(executorID);

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaInspector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaInspector.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaInspector.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -7,11 +7,11 @@
 package org.jboss.messaging.core.remoting.impl.mina;
 
 import static org.apache.mina.filter.reqres.ResponseType.WHOLE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket.NO_CORRELATION_ID;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_CORRELATION_ID;
 
 import org.apache.mina.filter.reqres.ResponseInspector;
 import org.apache.mina.filter.reqres.ResponseType;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
@@ -34,11 +34,11 @@
 
    public Object getRequestId(Object message)
    {
-      if (!(message instanceof AbstractPacket))
+      if (!(message instanceof Packet))
       {
          return null;
       }
-      AbstractPacket packet = (AbstractPacket) message;
+      Packet packet = (Packet) message;
       if (packet.getCorrelationID() != NO_CORRELATION_ID)
          return packet.getCorrelationID();
       else
@@ -47,7 +47,7 @@
 
    public ResponseType getResponseType(Object message)
    {
-      if (!(message instanceof AbstractPacket))
+      if (!(message instanceof Packet))
       {
          return null;
       }

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaSession.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -12,7 +12,7 @@
 import org.apache.mina.filter.reqres.Request;
 import org.apache.mina.filter.reqres.Response;
 import org.jboss.messaging.core.remoting.NIOSession;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -54,7 +54,7 @@
       session.write(object);
    }
 
-   public Object writeAndBlock(AbstractPacket packet, long timeout, TimeUnit timeUnit) throws Exception
+   public Object writeAndBlock(Packet packet, long timeout, TimeUnit timeUnit) throws Exception
    {
       packet.setCorrelationID(correlationCounter++);
       Request req = new Request(packet.getCorrelationID(), packet, timeout, timeUnit);

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/PacketCodecFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/PacketCodecFactory.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/PacketCodecFactory.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -116,22 +116,8 @@
 import org.jboss.messaging.core.remoting.impl.codec.SessionXASetTimeoutResponseMessageCodec;
 import org.jboss.messaging.core.remoting.impl.codec.SessionXAStartMessageCodec;
 import org.jboss.messaging.core.remoting.impl.codec.TextPacketCodec;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
-import org.jboss.messaging.core.remoting.impl.wireformat.CloseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionStartMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionStopMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserResetMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionCommitMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionRecoverMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionRollbackMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetTimeoutMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASuspendMessage;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
@@ -159,7 +145,7 @@
        addMessageDecoder(decoder);
        addMessageEncoder(Packet.class, encoder);
       
-      addCodecForEmptyPacket(encoder, decoder, NULL, NullPacket.class);
+      addCodecForEmptyPacket(encoder, decoder, NULL);
       addCodec(encoder, decoder, PROD_SEND,
             new ProducerSendMessageCodec());
       addCodec(encoder, decoder, CONS_DELIVER,
@@ -205,11 +191,9 @@
       addCodec(encoder, decoder, SESS_CREATEBROWSER_RESP,
             new SessionCreateBrowserResponseMessageCodec());
 
-      addCodecForEmptyPacket(encoder, decoder, CONN_START,
-            ConnectionStartMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, CONN_START);
 
-      addCodecForEmptyPacket(encoder, decoder, CONN_STOP,
-            ConnectionStopMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, CONN_STOP);
 
       addCodec(encoder, decoder, CONS_FLOWTOKEN,
             new ConsumerFlowTokenMessageCodec());
@@ -219,28 +203,22 @@
 
       addCodec(encoder, decoder, SESS_CANCEL, new SessionCancelMessageCodec());
 
-      addCodecForEmptyPacket(encoder, decoder, SESS_COMMIT,
-            SessionCommitMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, SESS_COMMIT);
 
-      addCodecForEmptyPacket(encoder, decoder, SESS_ROLLBACK,
-            SessionRollbackMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, SESS_ROLLBACK);
 
-      addCodecForEmptyPacket(encoder, decoder, CLOSE, CloseMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, CLOSE);
 
-      addCodecForEmptyPacket(encoder, decoder, SESS_RECOVER,
-            SessionRecoverMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, SESS_RECOVER);
 
-      addCodecForEmptyPacket(encoder, decoder, SESS_BROWSER_RESET,
-            SessionBrowserResetMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, SESS_BROWSER_RESET);
 
-      addCodecForEmptyPacket(encoder, decoder, SESS_BROWSER_HASNEXTMESSAGE,
-            SessionBrowserHasNextMessageMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, SESS_BROWSER_HASNEXTMESSAGE);
 
       addCodec(encoder, decoder, SESS_BROWSER_HASNEXTMESSAGE_RESP,
             new SessionBrowserHasNextMessageResponseMessageCodec());
 
-      addCodecForEmptyPacket(encoder, decoder, SESS_BROWSER_NEXTMESSAGE,
-            SessionBrowserNextMessageMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, SESS_BROWSER_NEXTMESSAGE);
 
       addCodec(encoder, decoder, SESS_BROWSER_NEXTMESSAGE_RESP,
             new SessionBrowserNextMessageResponseMessageCodec());
@@ -259,14 +237,12 @@
       addCodec(encoder, decoder, SESS_XA_FORGET,
             new SessionXAForgetMessageCodec());
 
-      addCodecForEmptyPacket(encoder, decoder, SESS_XA_INDOUBT_XIDS,
-            SessionXAGetInDoubtXidsMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, SESS_XA_INDOUBT_XIDS);
 
       addCodec(encoder, decoder, SESS_XA_INDOUBT_XIDS_RESP,
             new SessionXAGetInDoubtXidsResponseMessageCodec());
 
-      addCodecForEmptyPacket(encoder, decoder, SESS_XA_GET_TIMEOUT,
-            SessionXAGetTimeoutMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, SESS_XA_GET_TIMEOUT);
 
       addCodec(encoder, decoder, SESS_XA_GET_TIMEOUT_RESP,
             new SessionXAGetTimeoutResponseMessageCodec());
@@ -294,8 +270,7 @@
       addCodec(encoder, decoder, SESS_XA_START,
             new SessionXAStartMessageCodec());
 
-      addCodecForEmptyPacket(encoder, decoder, SESS_XA_SUSPEND,
-            SessionXASuspendMessage.class);
+      addCodecForEmptyPacket(encoder, decoder, SESS_XA_SUSPEND);
 
       addCodec(encoder, decoder, SESS_REMOVE_DESTINATION,
             new SessionRemoveDestinationMessageCodec());
@@ -328,23 +303,10 @@
 
    // Public --------------------------------------------------------
 
-   public static AbstractPacketCodec<AbstractPacket> createCodecForEmptyPacket(
-         PacketType type, final Class<? extends AbstractPacket> clazz)
+   public static AbstractPacketCodec<Packet> createCodecForEmptyPacket(
+         final byte type)
    {
-      return new CodecForEmptyPacket<AbstractPacket>(type)
-      {
-         @Override
-         protected AbstractPacket newPacket()
-         {
-            try
-            {
-               return (AbstractPacket) clazz.newInstance();
-            } catch (Throwable t)
-            {
-               return null;
-            }
-         }
-      };
+      return new CodecForEmptyPacket<Packet>(type);
    }
    
    // Package protected ---------------------------------------------
@@ -355,7 +317,7 @@
 
    // FIXME generics definition should be in term of <P>...
    private void addCodec(MinaEncoder encoder, MinaDecoder decoder,
-         PacketType type, AbstractPacketCodec<? extends AbstractPacket> codec)
+         byte type, AbstractPacketCodec<? extends Packet> codec)
    {
       try
       {
@@ -366,23 +328,22 @@
          log.error("Unable to add codec for packet " + type, e);
       }
    }
-
+   
    private void addCodecForEmptyPacket(MinaEncoder encoder,
-         MinaDecoder decoder, PacketType type,
-         Class<? extends AbstractPacket> packetClass)
+         MinaDecoder decoder, byte type)
    {
-      AbstractPacketCodec<AbstractPacket> codec = createCodecForEmptyPacket(
-            type, packetClass);
+      AbstractPacketCodec<Packet> codec = createCodecForEmptyPacket(
+            type);
       addCodec(encoder, decoder, type, codec);
    }
 
    // Inner classes -------------------------------------------------
 
-   abstract static class CodecForEmptyPacket<P extends AbstractPacket> extends
+   static class CodecForEmptyPacket<P extends Packet> extends
          AbstractPacketCodec<P>
    {
 
-      public CodecForEmptyPacket(PacketType type)
+      public CodecForEmptyPacket(byte type)
       {
          super(type);
       }
@@ -395,12 +356,10 @@
       }
 
       @Override
-      protected P decodeBody(RemotingBuffer in) throws Exception
+      protected Packet decodeBody(RemotingBuffer in) throws Exception
       {
          in.getInt(); // skip body length
-         return newPacket();
+         return new PacketImpl(type);
       }
-
-      protected abstract P newPacket();
    }
 }

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/AbstractPacket.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/AbstractPacket.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/AbstractPacket.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,157 +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 static org.jboss.messaging.core.remoting.impl.Assert.assertValidID;
-
-import org.jboss.messaging.core.client.impl.RemotingConnection;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- * 
- * @version <tt>$Revision$</tt>
- */
-public class AbstractPacket implements Packet
-{
-   // Constants -----------------------------------------------------
-
-   public static final String NO_ID_SET = "NO_ID_SET";
-
-   public static final long NO_CORRELATION_ID = -1L;
-
-   // Attributes ----------------------------------------------------
-
-   private long correlationID = NO_CORRELATION_ID;
-
-   private String targetID = NO_ID_SET;
-
-   private String callbackID = NO_ID_SET;
-
-   String executorID = NO_ID_SET;
-
-   private final PacketType type;
-
-   /**
-    * <code>oneWay</code> is <code>true</code> when the packet is sent "one way"
-    * by the client which does not expect any response to it.
-    * 
-    * @see RemotingConnection#sendOneWay(AbstractPacket)
-    */
-   private boolean oneWay = false;
-   
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   AbstractPacket(PacketType type)
-   {
-      assert type != null;
-
-      this.type = type;
-   }
-
-   // Public --------------------------------------------------------
-
-   public PacketType getType()
-   {
-      return type;
-   }
-
-   public void setCorrelationID(long correlationID)
-   {
-      this.correlationID = correlationID;
-   }
-
-   public long getCorrelationID()
-   {
-      return correlationID;
-   }
-
-   public String getTargetID()
-   {
-      return targetID;
-   }
-
-   public void setTargetID(String targetID)
-   {
-      assertValidID(targetID);
-
-      this.targetID = targetID;
-   }
-
-   public void setCallbackID(String callbackID)
-   {
-      assertValidID(callbackID);
-
-      this.callbackID = callbackID;
-   }
-
-   public String getCallbackID()
-   {
-      return callbackID;
-   }
-   
-  public String getExecutorID()
-  {
-     return executorID;
-  }
-  
-  public void setExecutorID(String executorID)
-  {
-     assertValidID(executorID);
-     
-     this.executorID = executorID;
-  }
-
-   public void setOneWay(boolean oneWay)
-   {
-      this.oneWay = oneWay;
-   }
-
-   public boolean isOneWay()
-   {
-      return oneWay;
-   }
-   
-   public void normalize(Packet other)
-   {
-      assert other != null;
-
-      setCorrelationID(other.getCorrelationID());
-      setTargetID(other.getCallbackID());
-   }
-
-   /**
-    * An AbstractPacket is a request if it has a target ID and a correlation ID
-    */
-   public boolean isRequest()
-   {
-      return targetID != NO_ID_SET && correlationID != NO_CORRELATION_ID;
-   }
-
-   @Override
-   public String toString()
-   {
-      return getParentString() + "]";
-   }
-
-   // Package protected ---------------------------------------------
-
-   protected String getParentString()
-   {
-      return "PACKET[type=" + type
-            + ", correlationID=" + correlationID + ", targetID=" + targetID
-            + ", callbackID=" + callbackID + ", executorID=" + executorID + ", oneWay=" + oneWay;
-   }
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
-}

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/BytesPacket.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/BytesPacket.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/BytesPacket.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class BytesPacket extends AbstractPacket
+public class BytesPacket extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CloseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CloseMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CloseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,41 +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 static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- * 
- * @version <tt>$Revision$</tt>
- */
-public class CloseMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public CloseMessage()
-   {
-      super(CLOSE);
-   }
-   
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionCreateSessionMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class ConnectionCreateSessionMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionCreateSessionResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class ConnectionCreateSessionResponseMessage extends AbstractPacket
+public class ConnectionCreateSessionResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionStartMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionStartMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionStartMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,41 +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 static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_START;
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- */
-public class ConnectionStartMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public ConnectionStartMessage()
-   {
-      super(CONN_START);
-   }
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionStopMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionStopMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConnectionStopMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,41 +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 static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_STOP;
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- */
-public class ConnectionStopMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public ConnectionStopMessage()
-   {
-      super(CONN_STOP);
-   }
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerDeliverMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerDeliverMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerDeliverMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -17,7 +17,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class ConsumerDeliverMessage extends AbstractPacket
+public class ConsumerDeliverMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerFlowTokenMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerFlowTokenMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerFlowTokenMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class ConsumerFlowTokenMessage extends AbstractPacket
+public class ConsumerFlowTokenMessage 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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateConnectionRequest.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class CreateConnectionRequest extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/CreateConnectionResponse.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -15,7 +15,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class CreateConnectionResponse extends AbstractPacket
+public class CreateConnectionResponse extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -16,7 +16,7 @@
  * @version <tt>$Revision$</tt>
  * 
  */
-public class MessagingExceptionMessage extends AbstractPacket
+public class MessagingExceptionMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/NullPacket.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/NullPacket.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/NullPacket.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,40 +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 static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.NULL;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- * 
- * @version <tt>$Revision$</tt>
- */
-public class NullPacket extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public NullPacket()
-   {
-      super(NULL);
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Packet.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Packet.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Packet.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -16,7 +16,7 @@
 
    long getCorrelationID();
 
-   PacketType getType();
+   byte getType();
 
    String getTargetID();
 

Copied: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java (from rev 4016, trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/AbstractPacket.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-04-08 14:55:45 UTC (rev 4022)
@@ -0,0 +1,155 @@
+/*
+ * 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 static org.jboss.messaging.core.remoting.impl.Assert.assertValidID;
+
+import org.jboss.messaging.core.client.impl.RemotingConnection;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
+ * 
+ * @version <tt>$Revision$</tt>
+ */
+public class PacketImpl implements Packet
+{
+   // Constants -----------------------------------------------------
+
+   public static final String NO_ID_SET = "NO_ID_SET";
+
+   public static final long NO_CORRELATION_ID = -1L;
+
+   // Attributes ----------------------------------------------------
+
+   private long correlationID = NO_CORRELATION_ID;
+
+   private String targetID = NO_ID_SET;
+
+   private String callbackID = NO_ID_SET;
+
+   String executorID = NO_ID_SET;
+
+   private final byte type;
+
+   /**
+    * <code>oneWay</code> is <code>true</code> when the packet is sent "one way"
+    * by the client which does not expect any response to it.
+    * 
+    * @see RemotingConnection#sendOneWay(AbstractPacket)
+    */
+   private boolean oneWay = false;
+   
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   public PacketImpl(byte type)
+   {
+      this.type = type;
+   }
+
+   // Public --------------------------------------------------------
+
+   public byte getType()
+   {
+      return type;
+   }
+
+   public void setCorrelationID(long correlationID)
+   {
+      this.correlationID = correlationID;
+   }
+
+   public long getCorrelationID()
+   {
+      return correlationID;
+   }
+
+   public String getTargetID()
+   {
+      return targetID;
+   }
+
+   public void setTargetID(String targetID)
+   {
+      assertValidID(targetID);
+
+      this.targetID = targetID;
+   }
+
+   public void setCallbackID(String callbackID)
+   {
+      assertValidID(callbackID);
+
+      this.callbackID = callbackID;
+   }
+
+   public String getCallbackID()
+   {
+      return callbackID;
+   }
+   
+  public String getExecutorID()
+  {
+     return executorID;
+  }
+  
+  public void setExecutorID(String executorID)
+  {
+     assertValidID(executorID);
+     
+     this.executorID = executorID;
+  }
+
+   public void setOneWay(boolean oneWay)
+   {
+      this.oneWay = oneWay;
+   }
+
+   public boolean isOneWay()
+   {
+      return oneWay;
+   }
+   
+   public void normalize(Packet other)
+   {
+      assert other != null;
+
+      setCorrelationID(other.getCorrelationID());
+      setTargetID(other.getCallbackID());
+   }
+
+   /**
+    * An AbstractPacket is a request if it has a target ID and a correlation ID
+    */
+   public boolean isRequest()
+   {
+      return targetID != NO_ID_SET && correlationID != NO_CORRELATION_ID;
+   }
+
+   @Override
+   public String toString()
+   {
+      return getParentString() + "]";
+   }
+
+   // Package protected ---------------------------------------------
+
+   protected String getParentString()
+   {
+      return "PACKET[type=" + type
+            + ", correlationID=" + correlationID + ", targetID=" + targetID
+            + ", callbackID=" + callbackID + ", executorID=" + executorID + ", oneWay=" + oneWay;
+   }
+
+   // Protected -----------------------------------------------------
+
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
+
+}

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketType.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketType.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketType.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -11,91 +11,78 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public enum PacketType
+public class PacketType
 {
    // System
-   NULL                                ((byte)1),
-   TEXT                                ((byte)2),
-   BYTES                               ((byte)3),
-   PING                                ((byte)4),
-   PONG                                ((byte)5),
-   
-   // Miscellaneous   
-   EXCEPTION                           ((byte)10),
-   CLOSE                               ((byte)11),
-   
+   public static final byte NULL                               = 1;
+   public static final byte TEXT                               = 2;
+   public static final byte BYTES                              = 3;
+   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
-   CREATECONNECTION                    ((byte)20),
-   CREATECONNECTION_RESP               ((byte)21),    
-   
+   public static final byte CREATECONNECTION                   = 20;
+   public static final byte CREATECONNECTION_RESP              = 21;
+
    // Connection
-   CONN_CREATESESSION                  ((byte)30),
-   CONN_CREATESESSION_RESP             ((byte)31),
-   CONN_START                          ((byte)32),
-   CONN_STOP                           ((byte)33),
+   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   
-   SESS_CREATECONSUMER                 ((byte)40),
-   SESS_CREATECONSUMER_RESP            ((byte)41),
-   SESS_CREATEPRODUCER                 ((byte)42),
-   SESS_CREATEPRODUCER_RESP            ((byte)43),
-   SESS_CREATEBROWSER                  ((byte)44),
-   SESS_CREATEBROWSER_RESP             ((byte)45),      
-   SESS_ACKNOWLEDGE                    ((byte)46),
-   SESS_RECOVER                        ((byte)47),
-   SESS_COMMIT                         ((byte)48),
-   SESS_ROLLBACK                       ((byte)49),
-   SESS_CANCEL                         ((byte)50),
-   SESS_QUEUEQUERY                     ((byte)51),
-   SESS_QUEUEQUERY_RESP                ((byte)52),
-   SESS_CREATEQUEUE                    ((byte)53),
-   SESS_DELETE_QUEUE                   ((byte)54),   
-   SESS_ADD_DESTINATION                ((byte)55),
-   SESS_REMOVE_DESTINATION             ((byte)56),
-   SESS_BINDINGQUERY                   ((byte)57),
-   SESS_BINDINGQUERY_RESP              ((byte)58),  
-   SESS_BROWSER_RESET                  ((byte)59),
-   SESS_BROWSER_HASNEXTMESSAGE         ((byte)60),
-   SESS_BROWSER_HASNEXTMESSAGE_RESP    ((byte)61),
-   SESS_BROWSER_NEXTMESSAGEBLOCK       ((byte)62),
-   SESS_BROWSER_NEXTMESSAGEBLOCK_RESP  ((byte)63),
-   SESS_BROWSER_NEXTMESSAGE            ((byte)64),
-   SESS_BROWSER_NEXTMESSAGE_RESP       ((byte)65),      
-   SESS_XA_START                       ((byte)66),
-   SESS_XA_END                         ((byte)67),
-   SESS_XA_COMMIT                      ((byte)68),
-   SESS_XA_PREPARE                     ((byte)69),
-   SESS_XA_RESP                        ((byte)70),
-   SESS_XA_ROLLBACK                    ((byte)71),
-   SESS_XA_JOIN                        ((byte)72),
-   SESS_XA_SUSPEND                     ((byte)73),
-   SESS_XA_RESUME                      ((byte)74),
-   SESS_XA_FORGET                      ((byte)75),
-   SESS_XA_INDOUBT_XIDS                ((byte)76),
-   SESS_XA_INDOUBT_XIDS_RESP           ((byte)77),
-   SESS_XA_SET_TIMEOUT                 ((byte)78),
-   SESS_XA_SET_TIMEOUT_RESP            ((byte)79),
-   SESS_XA_GET_TIMEOUT                 ((byte)80),
-   SESS_XA_GET_TIMEOUT_RESP            ((byte)81),
-       
-   // Consumer 
-   CONS_FLOWTOKEN                      ((byte)90),
-   CONS_DELIVER                        ((byte)91),
-   
-   //Producer
-   PROD_SEND                           ((byte)100),
-   PROD_RECEIVETOKENS                  ((byte)101);
-   
+   // 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_NEXTMESSAGEBLOCK      = 62;
+   public static final byte SESS_BROWSER_NEXTMESSAGEBLOCK_RESP = 63;
+   public static final byte SESS_BROWSER_NEXTMESSAGE           = 64;
+   public static final byte SESS_BROWSER_NEXTMESSAGE_RESP      = 65;
+   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;
 
-   private final byte type;
+   // Consumer
+   public static final byte CONS_FLOWTOKEN                     = 90;
+   public static final byte CONS_DELIVER                       = 91;
 
-   PacketType(byte type)
-   {
-      this.type = type;
-   }
-
-   public byte byteValue()
-   {
-      return type;
-   }
+   // Producer
+   public static final byte PROD_SEND                          = 100;
+   public static final byte PROD_RECEIVETOKENS                 = 101;
 }

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Ping.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -15,7 +15,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class Ping extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/Pong.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -15,7 +15,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class Pong extends AbstractPacket
+public class Pong extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerReceiveTokensMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerReceiveTokensMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerReceiveTokensMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -13,7 +13,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class ProducerReceiveTokensMessage extends AbstractPacket
+public class ProducerReceiveTokensMessage 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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class ProducerSendMessage extends AbstractPacket
+public class ProducerSendMessage 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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -12,7 +12,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionAcknowledgeMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionAddDestinationMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -16,7 +16,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionAddDestinationMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionBindingQueryMessage extends AbstractPacket
+public class SessionBindingQueryMessage extends PacketImpl
 {
    private final String 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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -11,7 +11,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionBindingQueryResponseMessage extends AbstractPacket
+public class SessionBindingQueryResponseMessage extends PacketImpl
 {
    private final boolean exists;
    

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserHasNextMessageMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserHasNextMessageMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserHasNextMessageMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,42 +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 static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_HASNEXTMESSAGE;
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class SessionBrowserHasNextMessageMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public SessionBrowserHasNextMessageMessage()
-   {
-      super(SESS_BROWSER_HASNEXTMESSAGE);
-   }
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserHasNextMessageResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -15,7 +15,7 @@
  * @version <tt>$Revision$</tt>
  * 
  */
-public class SessionBrowserHasNextMessageResponseMessage extends AbstractPacket
+public class SessionBrowserHasNextMessageResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageBlockMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageBlockMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageBlockMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -15,7 +15,7 @@
  * @version <tt>$Revision$</tt>
  *
  */
-public class SessionBrowserNextMessageBlockMessage extends AbstractPacket
+public class SessionBrowserNextMessageBlockMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageBlockResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageBlockResponseMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageBlockResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -18,7 +18,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionBrowserNextMessageBlockResponseMessage extends AbstractPacket
+public class SessionBrowserNextMessageBlockResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,42 +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 static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_NEXTMESSAGE;
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class SessionBrowserNextMessageMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public SessionBrowserNextMessageMessage()
-   {
-      super(SESS_BROWSER_NEXTMESSAGE);
-   }
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageResponseMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionBrowserNextMessageResponseMessage extends AbstractPacket
+public class SessionBrowserNextMessageResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserResetMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserResetMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserResetMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,42 +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 static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_RESET;
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class SessionBrowserResetMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public SessionBrowserResetMessage()
-   {
-      super(SESS_BROWSER_RESET);
-   }
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCancelMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionCancelMessage extends AbstractPacket
+public class SessionCancelMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCommitMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCommitMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCommitMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,40 +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;
-
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * 
- * @version <tt>$Revision$</tt>
- */
-public class SessionCommitMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-   
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public SessionCommitMessage()
-   {
-      super(PacketType.SESS_COMMIT);
-   }
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}
-

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -15,7 +15,7 @@
  * @version <tt>$Revision$</tt>
  * 
  */
-public class SessionCreateBrowserMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateBrowserResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -16,7 +16,7 @@
  * @version <tt>$Revision$</tt>
  * 
  */
-public class SessionCreateBrowserResponseMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -12,7 +12,7 @@
  *
  * @version <tt>$Revision$</tt>
  */
-public class SessionCreateConsumerMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateConsumerResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionCreateConsumerResponseMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -12,7 +12,7 @@
  *
  * @version <tt>$Revision$</tt>
  */
-public class SessionCreateProducerMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionCreateProducerResponseMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateQueueMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
 
  * @version <tt>$Revision$</tt>
  */
-public class SessionCreateQueueMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
 
  * @version <tt>$Revision$</tt>
  */
-public class SessionDeleteQueueMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionQueueQueryMessage extends AbstractPacket
+public class SessionQueueQueryMessage extends PacketImpl
 {
    private final String 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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -9,7 +9,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionQueueQueryResponseMessage extends AbstractPacket
+public class SessionQueueQueryResponseMessage extends PacketImpl
 {
    private final boolean exists;
    

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRecoverMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRecoverMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRecoverMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,42 +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 static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_RECOVER;
-
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * 
- * @version <tt>$Revision$</tt>
- */
-public class SessionRecoverMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public SessionRecoverMessage()
-   {
-      super(SESS_RECOVER);
-   }
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}
-

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRemoveDestinationMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -16,7 +16,7 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public class SessionRemoveDestinationMessage extends AbstractPacket
+public class SessionRemoveDestinationMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRollbackMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRollbackMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionRollbackMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,42 +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 static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ROLLBACK;
-
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * 
- * @version <tt>$Revision$</tt>
- */
-public class SessionRollbackMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-   
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public SessionRollbackMessage()
-   {
-      super(SESS_ROLLBACK);
-   }
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}
-

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXACommitMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXACommitMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAEndMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAEndMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAForgetMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAForgetMessage extends AbstractPacket
+public class SessionXAForgetMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,41 +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;
-
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * 
- * @version <tt>$Revision$</tt>
- */
-public class SessionXAGetInDoubtXidsMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-   
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public SessionXAGetInDoubtXidsMessage()
-   {
-      super(PacketType.SESS_XA_INDOUBT_XIDS);
-   }
-
-   // Public --------------------------------------------------------
-   
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}
-
-

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -16,7 +16,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAGetInDoubtXidsResponseMessage extends AbstractPacket
+public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,41 +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;
-
-
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * 
- * @version <tt>$Revision$</tt>
- */
-public class SessionXAGetTimeoutMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-   
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public SessionXAGetTimeoutMessage()
-   {
-      super(PacketType.SESS_XA_GET_TIMEOUT);
-   }
-   
-   // Public --------------------------------------------------------
-   
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}
-

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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -13,7 +13,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAGetTimeoutResponseMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAJoinMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAJoinMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAPrepareMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAPrepareMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -12,7 +12,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAResponseMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAResumeMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAResumeMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXARollbackMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXARollbackMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -13,7 +13,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXASetTimeoutMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -12,7 +12,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXASetTimeoutResponseMessage extends AbstractPacket
+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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXAStartMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class SessionXAStartMessage extends AbstractPacket
+public class SessionXAStartMessage extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASuspendMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASuspendMessage.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionXASuspendMessage.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -1,40 +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;
-
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * 
- * @version <tt>$Revision$</tt>
- */
-public class SessionXASuspendMessage extends AbstractPacket
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-   
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public SessionXASuspendMessage()
-   {
-      super(PacketType.SESS_XA_SUSPEND);
-   }
-
-   // Public --------------------------------------------------------
-   
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}
-

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/TextPacket.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/TextPacket.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/TextPacket.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -13,7 +13,7 @@
  * 
  * @version <tt>$Revision$</tt>
  */
-public class TextPacket extends AbstractPacket
+public class TextPacket extends PacketImpl
 {
    // Constants -----------------------------------------------------
 

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -29,7 +29,6 @@
 import org.jboss.messaging.core.remoting.PacketSender;
 import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionRequest;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
 import org.jboss.messaging.core.server.MessagingServer;
 
 /**
@@ -67,7 +66,7 @@
    {
       Packet response = null;
      
-      PacketType type = packet.getType();
+      byte type = packet.getType();
       
       if (type == CREATECONNECTION)
       {

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -21,6 +21,12 @@
  */
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.NULL;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_HASNEXTMESSAGE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_NEXTMESSAGE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_RESET;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -34,9 +40,8 @@
 import org.jboss.messaging.core.message.MessageReference;
 import org.jboss.messaging.core.remoting.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageResponseMessage;
 import org.jboss.messaging.core.server.Queue;
@@ -207,7 +212,7 @@
       {
          Packet response = null;
 
-         PacketType type = packet.getType();
+         byte type = packet.getType();
          switch (type)
          {
          case SESS_BROWSER_HASNEXTMESSAGE:
@@ -231,7 +236,7 @@
          // reply if necessary
          if (response == null && packet.isOneWay() == false)
          {
-            response = new NullPacket();               
+            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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -21,12 +21,17 @@
   */
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_CREATESESSION;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_START;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_STOP;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.NULL;
+
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
 import org.jboss.messaging.core.server.ServerConnection;
 
 /**
@@ -55,7 +60,7 @@
    {
       Packet response = null;
 
-      PacketType type = packet.getType();
+      byte type = packet.getType();
       
       switch (type)
       {
@@ -80,7 +85,7 @@
       // reply if necessary
       if (response == null && packet.isOneWay() == false)
       {
-         response = new NullPacket();               
+         response = new 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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -21,12 +21,15 @@
   */
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_FLOWTOKEN;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.NULL;
+
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
 import org.jboss.messaging.core.server.ServerConsumer;
 
 /**
@@ -55,7 +58,7 @@
    {
       Packet response = null;
 
-      PacketType type = packet.getType();
+      byte type = packet.getType();
       switch (type)
       {
       case CONS_FLOWTOKEN:
@@ -73,7 +76,7 @@
       // reply if necessary
       if (response == null && packet.isOneWay() == false)
       {
-         response = new NullPacket();               
+         response = new PacketImpl(NULL);               
       }
       
       return response;

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -21,11 +21,14 @@
   */
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.NULL;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PROD_SEND;
+
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
 import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
 import org.jboss.messaging.core.server.ServerProducer;
 
@@ -54,7 +57,7 @@
    {
       Packet response = null;
 
-      PacketType type = packet.getType();
+      byte type = packet.getType();
       switch (type)
       {
       case PROD_SEND:
@@ -72,7 +75,7 @@
       // reply if necessary
       if (response == null && packet.isOneWay() == false)
       {
-         response = new NullPacket();               
+         response = new 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-04-08 13:29:24 UTC (rev 4021)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -21,6 +21,34 @@
   */
 package org.jboss.messaging.core.server.impl;
 
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.NULL;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ACKNOWLEDGE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ADD_DESTINATION;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BINDINGQUERY;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CANCEL;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_COMMIT;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CREATEBROWSER;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CREATECONSUMER;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CREATEPRODUCER;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CREATEQUEUE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_DELETE_QUEUE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_QUEUEQUERY;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_REMOVE_DESTINATION;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ROLLBACK;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_COMMIT;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_END;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_FORGET;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_GET_TIMEOUT;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_INDOUBT_XIDS;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_JOIN;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_PREPARE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_RESUME;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_ROLLBACK;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_SET_TIMEOUT;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_START;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_SUSPEND;
+
 import java.util.List;
 
 import javax.transaction.xa.Xid;
@@ -28,9 +56,8 @@
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
+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;
@@ -84,7 +111,7 @@
    {
       Packet response = null;
 
-      PacketType type = packet.getType();
+      byte type = packet.getType();
       
       switch (type)
       {
@@ -241,7 +268,7 @@
       // reply if necessary
       if (response == null && packet.isOneWay() == false)
       {
-         response = new NullPacket();
+         response = new PacketImpl(NULL);               
       }
 
       return response;

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/SessionTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/SessionTestBase.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/SessionTestBase.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -23,7 +23,7 @@
 import org.jboss.messaging.core.remoting.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketSender;
 import org.jboss.messaging.core.remoting.impl.mina.integration.test.ReversePacketHandler;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
 import org.jboss.messaging.core.remoting.test.unit.TestPacketHandler;
@@ -162,7 +162,7 @@
       packet.setTargetID(serverHandler.getID());
       packet.setCallbackID(callbackHandler.getID());
 
-      AbstractPacket blockingResponse = (AbstractPacket) session.writeAndBlock(packet, REQRES_TIMEOUT, SECONDS);
+      PacketImpl blockingResponse = (PacketImpl) session.writeAndBlock(packet, REQRES_TIMEOUT, SECONDS);
       assertNotNull(blockingResponse);
       
       assertEquals(0, callbackHandler.getPackets().size());
@@ -182,7 +182,7 @@
       TextPacket request = new TextPacket("testSendBlocking");
       request.setTargetID(serverPacketHandler.getID());
 
-      AbstractPacket receivedPacket = (AbstractPacket) session.writeAndBlock(request, REQRES_TIMEOUT, SECONDS);
+      PacketImpl receivedPacket = (PacketImpl) session.writeAndBlock(request, REQRES_TIMEOUT, SECONDS);
 
       assertNotNull(receivedPacket);
       assertTrue(receivedPacket instanceof TextPacket);
@@ -195,13 +195,13 @@
       TextPacket request = new TextPacket("testSendBlocking");
       request.setTargetID(serverPacketHandler.getID());
 
-      AbstractPacket receivedPacket = (AbstractPacket) session.writeAndBlock(request, REQRES_TIMEOUT, SECONDS);
+      PacketImpl receivedPacket = (PacketImpl) session.writeAndBlock(request, REQRES_TIMEOUT, SECONDS);
       long correlationID = request.getCorrelationID();
       
       assertNotNull(receivedPacket);      
       assertEquals(request.getCorrelationID(), receivedPacket.getCorrelationID());
       
-      receivedPacket = (AbstractPacket) session.writeAndBlock(request, REQRES_TIMEOUT, SECONDS);
+      receivedPacket = (PacketImpl) session.writeAndBlock(request, REQRES_TIMEOUT, SECONDS);
       assertEquals(correlationID + 1, request.getCorrelationID());
       assertEquals(correlationID + 1, receivedPacket.getCorrelationID());      
    }

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -7,14 +7,14 @@
 package org.jboss.messaging.core.remoting.impl.mina.integration.test;
 
 import static org.apache.mina.filter.reqres.ResponseType.WHOLE;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.NULL;
 
 import java.util.UUID;
 
 import junit.framework.TestCase;
 
 import org.jboss.messaging.core.remoting.impl.mina.MinaInspector;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
-import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -49,7 +49,7 @@
 
    public void testGetRequestIdForAbstractPacketWhichIsNotRequest()
    {
-      AbstractPacket packet = new NullPacket();
+      PacketImpl packet = new PacketImpl(NULL);
       packet.setTargetID(UUID.randomUUID().toString());
       assertFalse(packet.isRequest());
 
@@ -58,7 +58,7 @@
 
    public void testGetRequestIdForAbstractPacketWhichIsRequest()
    {
-      AbstractPacket packet = new NullPacket();
+      PacketImpl packet = new PacketImpl(NULL);
       packet.setTargetID(UUID.randomUUID().toString());
       packet.setCorrelationID(System.currentTimeMillis());
       assertTrue(packet.isRequest());
@@ -80,7 +80,7 @@
 
    public void testGetResponseTypeForAbstractPacket()
    {
-      AbstractPacket packet = new NullPacket();
+      PacketImpl packet = new PacketImpl(NULL);
 
       assertEquals(WHOLE, inspector.getResponseType(packet));
    }

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaSessionTest.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaSessionTest.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -17,7 +17,7 @@
 import org.jboss.messaging.core.remoting.impl.SessionTestBase;
 import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
 import org.jboss.messaging.core.remoting.impl.mina.MinaService;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
 
 /**
@@ -45,7 +45,7 @@
    {
       serverPacketHandler.setSleepTime(1000, MILLISECONDS);
 
-      AbstractPacket packet = new TextPacket("testSendBlockingWithTimeout");
+      PacketImpl packet = new TextPacket("testSendBlockingWithTimeout");
       packet.setTargetID(serverPacketHandler.getID());
       
       try

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -9,7 +9,7 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static junit.framework.Assert.fail;
 import static org.jboss.messaging.core.remoting.impl.mina.integration.test.TestSupport.reverse;
-import static org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket.NO_ID_SET;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
 
 import java.util.concurrent.TimeUnit;
 

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/stress/PacketStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/stress/PacketStressTest.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/stress/PacketStressTest.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -24,7 +24,7 @@
 import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
 import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
 import org.jboss.messaging.core.remoting.impl.mina.MinaService;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.BytesPacket;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 
@@ -90,7 +90,7 @@
       NIOSession session = connector.connect();
       
       byte[] payloadBytes = generatePayload(PAYLOAD);
-      AbstractPacket packet = new BytesPacket(payloadBytes);
+      PacketImpl packet = new BytesPacket(payloadBytes);
       packet.setTargetID(handlerID);
 
       long start = System.currentTimeMillis();

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/wireformat/test/unit/PacketTypeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/wireformat/test/unit/PacketTypeTest.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/wireformat/test/unit/PacketTypeTest.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -16,7 +16,7 @@
 import static org.jboss.messaging.core.remoting.impl.mina.BufferWrapper.NULL_BYTE;
 import static org.jboss.messaging.core.remoting.impl.mina.BufferWrapper.NULL_STRING;
 import static org.jboss.messaging.core.remoting.impl.mina.BufferWrapper.UTF_8_ENCODER;
-import static org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket.NO_ID_SET;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.NO_ID_SET;
 import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.BYTES;
 import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
 import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_CREATESESSION;
@@ -141,18 +141,14 @@
 import org.jboss.messaging.core.remoting.impl.codec.TextPacketCodec;
 import org.jboss.messaging.core.remoting.impl.mina.BufferWrapper;
 import org.jboss.messaging.core.remoting.impl.mina.PacketCodecFactory;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.BytesPacket;
-import org.jboss.messaging.core.remoting.impl.wireformat.CloseMessage;
 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.ConnectionStartMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionStopMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionRequest;
 import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionResponse;
-import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
 import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
@@ -163,15 +159,11 @@
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionAddDestinationMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageBlockMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageBlockResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserResetMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionCancelMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionCommitMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionCreateBrowserMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionCreateBrowserResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionCreateConsumerMessage;
@@ -182,15 +174,11 @@
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionDeleteQueueMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionQueueQueryMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionRecoverMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionRemoveDestinationMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionRollbackMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXACommitMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAEndMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAForgetMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetTimeoutMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAGetTimeoutResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAJoinMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAPrepareMessage;
@@ -200,7 +188,6 @@
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASuspendMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
 import org.jboss.messaging.test.unit.RandomUtil;
 import org.jboss.messaging.test.unit.UnitTestCase;
@@ -281,11 +268,11 @@
    }
 
    private static void checkHeader(SimpleRemotingBuffer buffer,
-         AbstractPacket packet) throws Exception
+         PacketImpl packet) throws Exception
    {
       checkHeaderBytes(packet, buffer.buffer().buf());
 
-      assertEquals(buffer.get(), packet.getType().byteValue());
+      assertEquals(buffer.get(), packet.getType());
 
       String targetID = (packet.getTargetID().equals(NO_ID_SET) ? null : packet
             .getTargetID());
@@ -316,7 +303,7 @@
       assertEquals(oneWay, packet.isOneWay());
    }
 
-   private static void checkHeaderBytes(AbstractPacket packet, ByteBuffer actual)
+   private static void checkHeaderBytes(PacketImpl packet, ByteBuffer actual)
    {
       String targetID = (packet.getTargetID().equals(NO_ID_SET) ? null : packet
             .getTargetID());
@@ -329,7 +316,7 @@
             + BOOLEAN_LENGTH;
       ByteBuffer expected = ByteBuffer.allocate(1 + 1 + INT_LENGTH
             + headerLength);
-      expected.put(packet.getType().byteValue());
+      expected.put(packet.getType());
 
       expected.putInt(headerLength);
       expected.putLong(packet.getCorrelationID());
@@ -366,28 +353,25 @@
 
    public void testNullPacket() throws Exception
    {
-      NullPacket packet = new NullPacket();
+      PacketImpl packet = new PacketImpl(NULL);
       packet.setCallbackID(randomString());
       packet.setCorrelationID(randomLong());
       packet.setTargetID(randomString());
       packet.setExecutorID(randomString());
 
-      AbstractPacketCodec<AbstractPacket> codec = PacketCodecFactory
-            .createCodecForEmptyPacket(NULL, NullPacket.class);
+      AbstractPacketCodec<Packet> codec = PacketCodecFactory
+            .createCodecForEmptyPacket(NULL);
       SimpleRemotingBuffer buffer = encode(packet, codec);
       checkHeader(buffer, packet);
       checkBodyIsEmpty(buffer);
       buffer.rewind();
 
-      AbstractPacket decodedPacket = codec.decode(buffer);
+      Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof NullPacket);
-      NullPacket p = (NullPacket) decodedPacket;
-
-      assertEquals(NULL, p.getType());
-      assertEquals(packet.getCallbackID(), p.getCallbackID());
-      assertEquals(packet.getCorrelationID(), p.getCorrelationID());
-      assertEquals(packet.getTargetID(), p.getTargetID());
+      assertEquals(NULL, decodedPacket.getType());
+      assertEquals(packet.getCallbackID(), decodedPacket.getCallbackID());
+      assertEquals(packet.getCorrelationID(), decodedPacket.getCorrelationID());
+      assertEquals(packet.getTargetID(), decodedPacket.getTargetID());
    }
 
    public void testPing() throws Exception
@@ -400,7 +384,7 @@
       checkBody(buffer, ping.getSessionID());
       buffer.rewind();
 
-      AbstractPacket decodedPacket = codec.decode(buffer);
+      Packet decodedPacket = codec.decode(buffer);
 
       assertTrue(decodedPacket instanceof Ping);
       Ping decodedPing = (Ping) decodedPacket;
@@ -418,7 +402,7 @@
       checkBody(buffer, pong.getSessionID(), pong.isSessionFailed());
       buffer.rewind();
 
-      AbstractPacket decodedPacket = codec.decode(buffer);
+      Packet decodedPacket = codec.decode(buffer);
 
       assertTrue(decodedPacket instanceof Pong);
       Pong decodedPong = (Pong) decodedPacket;
@@ -437,7 +421,7 @@
       checkBody(buffer, packet.getText());
       buffer.rewind();
 
-      AbstractPacket decodedPacket = codec.decode(buffer);
+      Packet decodedPacket = codec.decode(buffer);
 
       assertTrue(decodedPacket instanceof TextPacket);
       TextPacket p = (TextPacket) decodedPacket;
@@ -482,7 +466,7 @@
       checkBody(buffer, version, remotingSessionID, clientVMID, username, password);
       buffer.rewind();
 
-      AbstractPacket decodedPacket = codec.decode(buffer);
+      Packet decodedPacket = codec.decode(buffer);
 
       assertTrue(decodedPacket instanceof CreateConnectionRequest);
       CreateConnectionRequest decodedRequest = (CreateConnectionRequest) decodedPacket;
@@ -507,7 +491,7 @@
       checkBody(buffer, response.getConnectionID());
       buffer.rewind();
 
-      AbstractPacket decodedPacket = codec.decode(buffer);
+      Packet decodedPacket = codec.decode(buffer);
 
       assertTrue(decodedPacket instanceof CreateConnectionResponse);
       CreateConnectionResponse decodedResponse = (CreateConnectionResponse) decodedPacket;
@@ -670,10 +654,10 @@
 
    public void testStartConnectionMessage() throws Exception
    {
-      ConnectionStartMessage packet = new ConnectionStartMessage();
+      PacketImpl packet = new PacketImpl(CONN_START);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            CONN_START, ConnectionStartMessage.class);
+            CONN_START);
       SimpleRemotingBuffer buffer = encode(packet, codec);
       checkHeader(buffer, packet);
       checkBodyIsEmpty(buffer);
@@ -681,16 +665,15 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof ConnectionStartMessage);
       assertEquals(CONN_START, decodedPacket.getType());
    }
 
    public void testStopConnectionMessage() throws Exception
    {
-      ConnectionStopMessage packet = new ConnectionStopMessage();
+      PacketImpl packet = new PacketImpl(CONN_STOP);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            CONN_STOP, ConnectionStopMessage.class);
+            CONN_STOP);
       SimpleRemotingBuffer buffer = encode(packet, codec);
       checkHeader(buffer, packet);
       checkBodyIsEmpty(buffer);
@@ -698,7 +681,6 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof ConnectionStopMessage);
       assertEquals(CONN_STOP, decodedPacket.getType());
    }
 
@@ -799,10 +781,10 @@
 
    public void testSessionCommitMessage() throws Exception
    {
-      SessionCommitMessage message = new SessionCommitMessage();
+      PacketImpl message = new PacketImpl(SESS_COMMIT);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            SESS_COMMIT, SessionCommitMessage.class);
+            SESS_COMMIT);
       SimpleRemotingBuffer buffer = encode(message, codec);
       checkHeader(buffer, message);
       checkBodyIsEmpty(buffer);
@@ -811,16 +793,15 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof SessionCommitMessage);
       assertEquals(SESS_COMMIT, decodedPacket.getType());
    }
 
    public void testSessionRollbackMessage() throws Exception
    {
-      SessionRollbackMessage message = new SessionRollbackMessage();
+      PacketImpl message = new PacketImpl(SESS_ROLLBACK);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            SESS_ROLLBACK, SessionRollbackMessage.class);
+            SESS_ROLLBACK);
       SimpleRemotingBuffer buffer = encode(message, codec);
       checkHeader(buffer, message);
       checkBodyIsEmpty(buffer);
@@ -829,16 +810,15 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof SessionRollbackMessage);
       assertEquals(SESS_ROLLBACK, decodedPacket.getType());
    }
    
    public void testSessionRecoverMessage() throws Exception
    {
-      SessionRecoverMessage message = new SessionRecoverMessage();
+      PacketImpl message = new PacketImpl(SESS_RECOVER);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            SESS_RECOVER, SessionRecoverMessage.class);
+            SESS_RECOVER);
       SimpleRemotingBuffer buffer = encode(message, codec);
       checkHeader(buffer, message);
       checkBodyIsEmpty(buffer);
@@ -847,16 +827,15 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof SessionRecoverMessage);
       assertEquals(SESS_RECOVER, decodedPacket.getType());
    }
 
    public void testCloseMessage() throws Exception
    {
-      CloseMessage message = new CloseMessage();
+      PacketImpl message = new PacketImpl(CLOSE);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            CLOSE, CloseMessage.class);
+            CLOSE);
       SimpleRemotingBuffer buffer = encode(message, codec);
       checkHeader(buffer, message);
       checkBodyIsEmpty(buffer);
@@ -864,9 +843,7 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof CloseMessage);
-      CloseMessage decodedMessage = (CloseMessage) decodedPacket;
-      assertEquals(CLOSE, decodedMessage.getType());
+      assertEquals(CLOSE, decodedPacket.getType());
    }
 
 
@@ -911,10 +888,10 @@
 
    public void testBrowserResetMessage() throws Exception
    {
-      SessionBrowserResetMessage message = new SessionBrowserResetMessage();
+      PacketImpl message = new PacketImpl(SESS_BROWSER_RESET);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            SESS_BROWSER_RESET, SessionBrowserResetMessage.class);
+            SESS_BROWSER_RESET);
       SimpleRemotingBuffer buffer = encode(message, codec);
       checkHeader(buffer, message);
       checkBodyIsEmpty(buffer);
@@ -922,16 +899,15 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof SessionBrowserResetMessage);
       assertEquals(SESS_BROWSER_RESET, decodedPacket.getType());
    }
 
    public void testBrowserHasNextMessageRequest() throws Exception
    {
-      SessionBrowserHasNextMessageMessage request = new SessionBrowserHasNextMessageMessage();
+      PacketImpl request = new PacketImpl(SESS_BROWSER_HASNEXTMESSAGE);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            SESS_BROWSER_HASNEXTMESSAGE, SessionBrowserHasNextMessageMessage.class);
+            SESS_BROWSER_HASNEXTMESSAGE);
       SimpleRemotingBuffer buffer = encode(request, codec);
       checkHeader(buffer, request);
       checkBodyIsEmpty(buffer);
@@ -939,7 +915,6 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof SessionBrowserHasNextMessageMessage);
       assertEquals(SESS_BROWSER_HASNEXTMESSAGE, decodedPacket.getType());
    }
 
@@ -963,10 +938,10 @@
 
    public void testBrowserNextMessageRequest() throws Exception
    {
-      SessionBrowserNextMessageMessage request = new SessionBrowserNextMessageMessage();
+      PacketImpl request = new PacketImpl(SESS_BROWSER_NEXTMESSAGE);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            SESS_BROWSER_NEXTMESSAGE, SessionBrowserNextMessageMessage.class);
+            SESS_BROWSER_NEXTMESSAGE);
       SimpleRemotingBuffer buffer = encode(request, codec);
       checkHeader(buffer, request);
       checkBodyIsEmpty(buffer);
@@ -974,7 +949,6 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof SessionBrowserNextMessageMessage);
       assertEquals(SESS_BROWSER_NEXTMESSAGE, decodedPacket.getType());
    }
 
@@ -1114,10 +1088,10 @@
    
    public void testSessionXAGetInDoubtXidsMessage() throws Exception
    {
-      SessionXAGetInDoubtXidsMessage request = new SessionXAGetInDoubtXidsMessage();
+      PacketImpl request = new PacketImpl(SESS_XA_INDOUBT_XIDS);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            SESS_XA_INDOUBT_XIDS, SessionXAGetInDoubtXidsMessage.class);
+            SESS_XA_INDOUBT_XIDS);
       SimpleRemotingBuffer buffer = encode(request, codec);
       checkHeader(buffer, request);
       checkBodyIsEmpty(buffer);
@@ -1125,7 +1099,6 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof SessionXAGetInDoubtXidsMessage);
       assertEquals(SESS_XA_INDOUBT_XIDS, decodedPacket.getType());            
    }
    
@@ -1161,10 +1134,10 @@
    
    public void testSessionXAGetTimeoutMessage() throws Exception
    {
-      SessionXAGetTimeoutMessage message = new SessionXAGetTimeoutMessage();
+      PacketImpl message = new PacketImpl(SESS_XA_GET_TIMEOUT);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            PacketType.SESS_XA_GET_TIMEOUT, SessionXAGetTimeoutMessage.class);
+            PacketType.SESS_XA_GET_TIMEOUT);
       SimpleRemotingBuffer buffer = encode(message, codec);
       checkHeader(buffer, message);
       checkBodyIsEmpty(buffer);
@@ -1172,7 +1145,6 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof SessionXAGetTimeoutMessage);
       assertEquals(SESS_XA_GET_TIMEOUT, decodedPacket.getType());     
    }
    
@@ -1359,10 +1331,10 @@
    
    public void testSessionXASuspendMessage() throws Exception
    {
-      SessionXASuspendMessage message = new SessionXASuspendMessage();
+      PacketImpl message = new PacketImpl(SESS_XA_SUSPEND);
 
       AbstractPacketCodec codec = PacketCodecFactory.createCodecForEmptyPacket(
-            PacketType.SESS_XA_SUSPEND, SessionXASuspendMessage.class);
+            PacketType.SESS_XA_SUSPEND);
       SimpleRemotingBuffer buffer = encode(message, codec);
       checkHeader(buffer, message);
       checkBodyIsEmpty(buffer);
@@ -1370,7 +1342,6 @@
 
       Packet decodedPacket = codec.decode(buffer);
 
-      assertTrue(decodedPacket instanceof SessionXASuspendMessage);
       assertEquals(SESS_XA_SUSPEND, decodedPacket.getType());     
    }
    
@@ -1563,7 +1534,7 @@
 
    // Private -------------------------------------------------------
 
-   private SimpleRemotingBuffer encode(AbstractPacket packet,
+   private SimpleRemotingBuffer encode(PacketImpl packet,
          AbstractPacketCodec codec) throws Exception
    {
       log.debug("encode " + packet);

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/TestPacketHandler.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/TestPacketHandler.java	2008-04-08 13:29:24 UTC (rev 4021)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/TestPacketHandler.java	2008-04-08 14:55:45 UTC (rev 4022)
@@ -14,7 +14,7 @@
 
 import org.jboss.messaging.core.remoting.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
 import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
 import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
 




More information about the jboss-cvs-commits mailing list