Close to compiling OpenWire.Net

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366724 13f79535-47bb-0310-9956-ffa450edef68

openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs

@@ -1,6 +1,9 @@
 using System;
 using System.IO;
 
+using OpenWire.Core.Commands;
+using OpenWire.Core.IO;
+
 namespace OpenWire.Core
 {
 	/// <summary>
@@ -11,6 +14,13 @@ namespace OpenWire.Core
 
         public abstract Command CreateCommand();
 
+        public virtual Command ReadCommand(BinaryReader dataIn) 
+        {
+            Command command = CreateCommand();
+            BuildCommand(command, dataIn);
+            return command;
+        }
+        
         public virtual void BuildCommand(Command command, BinaryReader dataIn) 
         {
         }
@@ -19,14 +29,76 @@ namespace OpenWire.Core
         {
         }
         
-        protected virtual BrokerId ReadBrokerId(BinaryReader dataIn)
+        protected virtual BrokerId[] ReadBrokerIds(BinaryReader dataIn)
         {
-        	   return brokerIDMarshaller.ReadCommand();
+            int size = dataIn.ReadInt32();
+            BrokerId[] answer = new BrokerId[size];
+            for (int i = 0; i < size; i++) {
+                answer[i] = (BrokerId) CommandMarshallerRegistry.BrokerIdMarshaller.ReadCommand(dataIn);
+            }
+            return answer;
         }
 
-        protected virtual void WriteBrokerId(BrokerId command, BinaryWriter dataOut)
+        protected virtual void WriteBrokerIds(BrokerId[] commands, BinaryWriter dataOut)
         {
-            brokerIDMarshaller.WriteCommand(command, dataOut);
+            int size = commands.Length;
+            dataOut.Write(size);
+            for (int i = 0; i < size; i++) {
+                CommandMarshallerRegistry.BrokerIdMarshaller.WriteCommand(commands[i], dataOut);
+            }
+        }
+
+	        
+        protected virtual BrokerInfo[] ReadBrokerInfos(BinaryReader dataIn)
+        {
+            int size = dataIn.ReadInt32();
+            BrokerInfo[] answer = new BrokerInfo[size];
+            for (int i = 0; i < size; i++) {
+                answer[i] = (BrokerInfo) CommandMarshallerRegistry.BrokerInfoMarshaller.ReadCommand(dataIn);
+            }
+            return answer;
+        }
+
+        protected virtual void WriteBrokerInfos(BrokerInfo[] commands, BinaryWriter dataOut)
+        {
+            int size = commands.Length;
+            dataOut.Write(size);
+            for (int i = 0; i < size; i++) {
+                CommandMarshallerRegistry.BrokerInfoMarshaller.WriteCommand(commands[i], dataOut);
+            }
+        }
+
+	        
+        protected virtual DataStructure[] ReadDataStructures(BinaryReader dataIn)
+        {
+            int size = dataIn.ReadInt32();
+            DataStructure[] answer = new DataStructure[size];
+            for (int i = 0; i < size; i++) {
+                answer[i] = (DataStructure) CommandMarshallerRegistry.ReadCommand(dataIn);
+            }
+            return answer;
+        }
+
+        protected virtual void WriteDataStructures(DataStructure[] commands, BinaryWriter dataOut)
+        {
+            int size = commands.Length;
+            dataOut.Write(size);
+            for (int i = 0; i < size; i++) {
+                CommandMarshallerRegistry.WriteCommand((Command) commands[i], dataOut);
+            }
+        }
+
+	        
+        protected virtual byte[] ReadBytes(BinaryReader dataIn)
+        {
+            int size = dataIn.ReadInt32();
+        	   return dataIn.ReadBytes(size);
+        }
+        
+        protected virtual void WriteBytes(byte[] command, BinaryWriter dataOut)
+        {
+        	  dataOut.Write(command.Length);
+        	  dataOut.Write(command);
         }
         
 	}

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQBytesMessage.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQBytesMessage : ActiveMQMessage
     {
+    			public const int ID_ActiveMQBytesMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQBytesMessage;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQDestination.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQDestination : AbstractCommand
     {
+    			public const int ID_ActiveMQDestination = 1;
+    			
         string physicalName;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQDestination;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMapMessage.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQMapMessage : ActiveMQMessage
     {
+    			public const int ID_ActiveMQMapMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQMapMessage;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMessage.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQMessage : AbstractCommand
     {
+    			public const int ID_ActiveMQMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQMessage;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQObjectMessage.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQObjectMessage : ActiveMQMessage
     {
+    			public const int ID_ActiveMQObjectMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQObjectMessage;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQQueue.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQQueue : AbstractCommand
     {
+    			public const int ID_ActiveMQQueue = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQQueue;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQStreamMessage.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQStreamMessage : ActiveMQMessage
     {
+    			public const int ID_ActiveMQStreamMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQStreamMessage;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempDestination.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQTempDestination : AbstractCommand
     {
+    			public const int ID_ActiveMQTempDestination = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQTempDestination;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempQueue.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQTempQueue : AbstractCommand
     {
+    			public const int ID_ActiveMQTempQueue = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQTempQueue;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempTopic.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQTempTopic : AbstractCommand
     {
+    			public const int ID_ActiveMQTempTopic = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQTempTopic;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTextMessage.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQTextMessage : ActiveMQMessage
     {
+    			public const int ID_ActiveMQTextMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQTextMessage;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTopic.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ActiveMQTopic : AbstractCommand
     {
+    			public const int ID_ActiveMQTopic = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQTopic;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class BaseCommand : AbstractCommand
     {
+    			public const int ID_BaseCommand = 1;
+    			
         short commandId;
         bool responseRequired;
 
@@ -27,7 +29,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_BaseCommand;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class BrokerId : AbstractCommand
     {
+    			public const int ID_BrokerId = 1;
+    			
         string brokerId;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_BrokerId;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class BrokerInfo : AbstractCommand
     {
+    			public const int ID_BrokerInfo = 1;
+    			
         BrokerId brokerId;
         string brokerURL;
         BrokerInfo[] peerBrokerInfos;
@@ -29,7 +31,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_BrokerInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ConnectionId : AbstractCommand
     {
+    			public const int ID_ConnectionId = 1;
+    			
         string connectionId;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ConnectionId;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ConnectionInfo : AbstractCommand
     {
+    			public const int ID_ConnectionInfo = 1;
+    			
         ConnectionId connectionId;
         string clientId;
         string password;
@@ -30,7 +32,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ConnectionInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ConsumerId : AbstractCommand
     {
+    			public const int ID_ConsumerId = 1;
+    			
         string connectionId;
         long sessionId;
         long consumerId;
@@ -28,7 +30,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ConsumerId;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ConsumerInfo : AbstractCommand
     {
+    			public const int ID_ConsumerInfo = 1;
+    			
         ConsumerId consumerId;
         bool browser;
         ActiveMQDestination destination;
@@ -38,7 +40,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ConsumerInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ControlCommand : AbstractCommand
     {
+    			public const int ID_ControlCommand = 1;
+    			
         string command;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ControlCommand;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class DataArrayResponse : AbstractCommand
     {
+    			public const int ID_DataArrayResponse = 1;
+    			
         Command[] data;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_DataArrayResponse;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class DataResponse : AbstractCommand
     {
+    			public const int ID_DataResponse = 1;
+    			
         Command data;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_DataResponse;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class DestinationInfo : AbstractCommand
     {
+    			public const int ID_DestinationInfo = 1;
+    			
         ConnectionId connectionId;
         ActiveMQDestination destination;
         byte operationType;
@@ -30,7 +32,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_DestinationInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ExceptionResponse : AbstractCommand
     {
+    			public const int ID_ExceptionResponse = 1;
+    			
         string exception;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ExceptionResponse;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/FlushCommand.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class FlushCommand : AbstractCommand
     {
+    			public const int ID_FlushCommand = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_FlushCommand;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class IntegerResponse : AbstractCommand
     {
+    			public const int ID_IntegerResponse = 1;
+    			
         int result;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_IntegerResponse;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/JournalQueueAck.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class JournalQueueAck : AbstractCommand
     {
+    			public const int ID_JournalQueueAck = 1;
+    			
         ActiveMQDestination destination;
         MessageAck messageAck;
 
@@ -27,7 +29,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_JournalQueueAck;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/JournalTopicAck.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class JournalTopicAck : AbstractCommand
     {
+    			public const int ID_JournalTopicAck = 1;
+    			
         ActiveMQDestination destination;
         MessageId messageId;
         long messageSequenceId;
@@ -31,7 +33,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_JournalTopicAck;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/JournalTrace.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class JournalTrace : AbstractCommand
     {
+    			public const int ID_JournalTrace = 1;
+    			
         string message;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_JournalTrace;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/JournalTransaction.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class JournalTransaction : AbstractCommand
     {
+    			public const int ID_JournalTransaction = 1;
+    			
         TransactionId transactionId;
         byte type;
         bool wasPrepared;
@@ -28,7 +30,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_JournalTransaction;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/KeepAliveInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class KeepAliveInfo : AbstractCommand
     {
+    			public const int ID_KeepAliveInfo = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_KeepAliveInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/LocalTransactionId.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class LocalTransactionId : AbstractCommand
     {
+    			public const int ID_LocalTransactionId = 1;
+    			
         long transactionId;
         ConnectionId connectionId;
 
@@ -27,7 +29,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_LocalTransactionId;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/Message.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class Message : AbstractCommand
     {
+    			public const int ID_Message = 1;
+    			
         ProducerId producerId;
         ActiveMQDestination destination;
         TransactionId transactionId;
@@ -50,7 +52,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_Message;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/MessageAck.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class MessageAck : AbstractCommand
     {
+    			public const int ID_MessageAck = 1;
+    			
         ActiveMQDestination destination;
         TransactionId transactionId;
         ConsumerId consumerId;
@@ -32,7 +34,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_MessageAck;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/MessageDispatch.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class MessageDispatch : AbstractCommand
     {
+    			public const int ID_MessageDispatch = 1;
+    			
         ConsumerId consumerId;
         ActiveMQDestination destination;
         Message message;
@@ -29,7 +31,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_MessageDispatch;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/MessageId.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class MessageId : AbstractCommand
     {
+    			public const int ID_MessageId = 1;
+    			
         ProducerId producerId;
         long producerSequenceId;
         long brokerSequenceId;
@@ -28,7 +30,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_MessageId;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ProducerId.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ProducerId : AbstractCommand
     {
+    			public const int ID_ProducerId = 1;
+    			
         string connectionId;
         long producerId;
         long sessionId;
@@ -28,7 +30,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ProducerId;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ProducerInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ProducerInfo : AbstractCommand
     {
+    			public const int ID_ProducerInfo = 1;
+    			
         ProducerId producerId;
         ActiveMQDestination destination;
         BrokerId[] brokerPath;
@@ -28,7 +30,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ProducerInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/RemoveInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class RemoveInfo : AbstractCommand
     {
+    			public const int ID_RemoveInfo = 1;
+    			
         Command objectId;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_RemoveInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/RemoveSubscriptionInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class RemoveSubscriptionInfo : AbstractCommand
     {
+    			public const int ID_RemoveSubscriptionInfo = 1;
+    			
         ConnectionId connectionId;
         string subcriptionName;
         string clientId;
@@ -28,7 +30,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_RemoveSubscriptionInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/Response.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class Response : AbstractCommand
     {
+    			public const int ID_Response = 1;
+    			
         short correlationId;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_Response;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/SessionId.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class SessionId : AbstractCommand
     {
+    			public const int ID_SessionId = 1;
+    			
         string connectionId;
         long sessionId;
 
@@ -27,7 +29,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_SessionId;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/SessionInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class SessionInfo : AbstractCommand
     {
+    			public const int ID_SessionInfo = 1;
+    			
         SessionId sessionId;
 
 
@@ -26,7 +28,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_SessionInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/ShutdownInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class ShutdownInfo : AbstractCommand
     {
+    			public const int ID_ShutdownInfo = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ShutdownInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/SubscriptionInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class SubscriptionInfo : AbstractCommand
     {
+    			public const int ID_SubscriptionInfo = 1;
+    			
         string clientId;
         ActiveMQDestination destination;
         string selector;
@@ -29,7 +31,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_SubscriptionInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/TransactionId.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class TransactionId : AbstractCommand
     {
+    			public const int ID_TransactionId = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_TransactionId;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/TransactionInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class TransactionInfo : AbstractCommand
     {
+    			public const int ID_TransactionInfo = 1;
+    			
         ConnectionId connectionId;
         TransactionId transactionId;
         byte type;
@@ -28,7 +30,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_TransactionInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/WireFormatInfo.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class WireFormatInfo : AbstractCommand
     {
+    			public const int ID_WireFormatInfo = 1;
+    			
         byte[] magic;
         int version;
         int options;
@@ -28,7 +30,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_WireFormatInfo;
         }
 
 

openwire-dotnet/src/OpenWire.Core/Commands/XATransactionId.cs

@@ -16,6 +16,8 @@ namespace OpenWire.Core.Commands
 {
     public class XATransactionId : AbstractCommand
     {
+    			public const int ID_XATransactionId = 1;
+    			
         int formatId;
         byte[] globalTransactionId;
         byte[] branchQualifier;
@@ -28,7 +30,7 @@ namespace OpenWire.Core.Commands
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_XATransactionId;
         }
 
 

openwire-dotnet/src/OpenWire.Core/DataStructure.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace OpenWire.Core
+{
+	/// <summary>
+	/// An OpenWire command
+	/// </summary>
+	public interface DataStructure {
+	
+        int GetCommandType();
+        
+	}
+}
+

openwire-dotnet/src/OpenWire.Core/IO/BrokerInfoMarshaller.cs

@@ -29,9 +29,9 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             BrokerInfo info = (BrokerInfo) command;
-            info.BrokerId = ReadBrokerId(dataIn);
+            info.BrokerId = (BrokerId) CommandMarshallerRegistry.BrokerIdMarshaller.ReadCommand(dataIn);
             info.BrokerURL = dataIn.ReadString();
-            info.PeerBrokerInfos = ReadBrokerInfo[](dataIn);
+            info.PeerBrokerInfos = ReadBrokerInfos(dataIn);
             info.BrokerName = dataIn.ReadString();
 
         }
@@ -40,9 +40,9 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             BrokerInfo info = (BrokerInfo) command;
-            WriteBrokerId(info.BrokerId, dataOut);
+            CommandMarshallerRegistry.BrokerIdMarshaller.WriteCommand(info.BrokerId, dataOut);
             dataOut.Write(info.BrokerURL);
-            WriteBrokerInfo[](info.PeerBrokerInfos, dataOut);
+            WriteBrokerInfos(info.PeerBrokerInfos, dataOut);
             dataOut.Write(info.BrokerName);
 
         }

openwire-dotnet/src/OpenWire.Core/IO/ConnectionInfoMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             ConnectionInfo info = (ConnectionInfo) command;
-            info.ConnectionId = ReadConnectionId(dataIn);
+            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
             info.ClientId = dataIn.ReadString();
             info.Password = dataIn.ReadString();
             info.UserName = dataIn.ReadString();
@@ -41,11 +41,11 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             ConnectionInfo info = (ConnectionInfo) command;
-            WriteConnectionId(info.ConnectionId, dataOut);
+            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId, dataOut);
             dataOut.Write(info.ClientId);
             dataOut.Write(info.Password);
             dataOut.Write(info.UserName);
-            dataOut.WriteBrokerIds(info.BrokerPath);
+            WriteBrokerIds(info.BrokerPath, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/ConsumerInfoMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             ConsumerInfo info = (ConsumerInfo) command;
-            info.ConsumerId = ReadConsumerId(dataIn);
+            info.ConsumerId = (ConsumerId) CommandMarshallerRegistry.ConsumerIdMarshaller.ReadCommand(dataIn);
             info.Browser = dataIn.ReadBoolean();
             info.Destination = ReadDestination(dataIn);
             info.PrefetchSize = dataIn.ReadInt32();
@@ -49,7 +49,7 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             ConsumerInfo info = (ConsumerInfo) command;
-            WriteConsumerId(info.ConsumerId, dataOut);
+            CommandMarshallerRegistry.ConsumerIdMarshaller.WriteCommand(info.ConsumerId, dataOut);
             dataOut.Write(info.Browser);
             WriteDestination(info.Destination, dataOut);
             dataOut.Write(info.PrefetchSize);
@@ -60,7 +60,7 @@ namespace OpenWire.Core.IO
             dataOut.Write(info.Exclusive);
             dataOut.Write(info.Retroactive);
             dataOut.Write(info.Priority);
-            dataOut.WriteBrokerIds(info.BrokerPath);
+            WriteBrokerIds(info.BrokerPath, dataOut);
             dataOut.Write(info.NetworkSubscription);
 
         }

openwire-dotnet/src/OpenWire.Core/IO/DataArrayResponseMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             DataArrayResponse info = (DataArrayResponse) command;
-            info.Data = ReadDataStructure[](dataIn);
+            info.Data = ReadDataStructures(dataIn);
 
         }
 
@@ -37,7 +37,7 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             DataArrayResponse info = (DataArrayResponse) command;
-            WriteDataStructure[](info.Data, dataOut);
+            WriteDataStructures(info.Data, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/DataResponseMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             DataResponse info = (DataResponse) command;
-            info.Data = ReadDataStructure(dataIn);
+            info.Data = (DataStructure) CommandMarshallerRegistry.DataStructureMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -37,7 +37,7 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             DataResponse info = (DataResponse) command;
-            WriteDataStructure(info.Data, dataOut);
+            CommandMarshallerRegistry.DataStructureMarshaller.WriteCommand(info.Data, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/DestinationInfoMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             DestinationInfo info = (DestinationInfo) command;
-            info.ConnectionId = ReadConnectionId(dataIn);
+            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
             info.Destination = ReadDestination(dataIn);
             info.OperationType = dataIn.ReadByte();
             info.Timeout = dataIn.ReadInt64();
@@ -41,11 +41,11 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             DestinationInfo info = (DestinationInfo) command;
-            WriteConnectionId(info.ConnectionId, dataOut);
+            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId, dataOut);
             WriteDestination(info.Destination, dataOut);
             dataOut.Write(info.OperationType);
             dataOut.Write(info.Timeout);
-            dataOut.WriteBrokerIds(info.BrokerPath);
+            WriteBrokerIds(info.BrokerPath, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/ExceptionResponseMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             ExceptionResponse info = (ExceptionResponse) command;
-            info.Exception = ReadThrowable(dataIn);
+            info.Exception = (Throwable) CommandMarshallerRegistry.ThrowableMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -37,7 +37,7 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             ExceptionResponse info = (ExceptionResponse) command;
-            WriteThrowable(info.Exception, dataOut);
+            CommandMarshallerRegistry.ThrowableMarshaller.WriteCommand(info.Exception, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/JournalQueueAckMarshaller.cs

@@ -30,7 +30,7 @@ namespace OpenWire.Core.IO
 
             JournalQueueAck info = (JournalQueueAck) command;
             info.Destination = ReadDestination(dataIn);
-            info.MessageAck = ReadMessageAck(dataIn);
+            info.MessageAck = (MessageAck) CommandMarshallerRegistry.MessageAckMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -39,7 +39,7 @@ namespace OpenWire.Core.IO
 
             JournalQueueAck info = (JournalQueueAck) command;
             WriteDestination(info.Destination, dataOut);
-            WriteMessageAck(info.MessageAck, dataOut);
+            CommandMarshallerRegistry.MessageAckMarshaller.WriteCommand(info.MessageAck, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/JournalTopicAckMarshaller.cs

@@ -30,11 +30,11 @@ namespace OpenWire.Core.IO
 
             JournalTopicAck info = (JournalTopicAck) command;
             info.Destination = ReadDestination(dataIn);
-            info.MessageId = ReadMessageId(dataIn);
+            info.MessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
             info.MessageSequenceId = dataIn.ReadInt64();
             info.SubscritionName = dataIn.ReadString();
             info.ClientId = dataIn.ReadString();
-            info.TransactionId = ReadTransactionId(dataIn);
+            info.TransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -43,11 +43,11 @@ namespace OpenWire.Core.IO
 
             JournalTopicAck info = (JournalTopicAck) command;
             WriteDestination(info.Destination, dataOut);
-            WriteMessageId(info.MessageId, dataOut);
+            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.MessageId, dataOut);
             dataOut.Write(info.MessageSequenceId);
             dataOut.Write(info.SubscritionName);
             dataOut.Write(info.ClientId);
-            WriteTransactionId(info.TransactionId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.TransactionId, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/JournalTransactionMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             JournalTransaction info = (JournalTransaction) command;
-            info.TransactionId = ReadTransactionId(dataIn);
+            info.TransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
             info.Type = dataIn.ReadByte();
             info.WasPrepared = dataIn.ReadBoolean();
 
@@ -39,7 +39,7 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             JournalTransaction info = (JournalTransaction) command;
-            WriteTransactionId(info.TransactionId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.TransactionId, dataOut);
             dataOut.Write(info.Type);
             dataOut.Write(info.WasPrepared);
 

openwire-dotnet/src/OpenWire.Core/IO/LocalTransactionIdMarshaller.cs

@@ -30,7 +30,7 @@ namespace OpenWire.Core.IO
 
             LocalTransactionId info = (LocalTransactionId) command;
             info.TransactionId = dataIn.ReadInt64();
-            info.ConnectionId = ReadConnectionId(dataIn);
+            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -39,7 +39,7 @@ namespace OpenWire.Core.IO
 
             LocalTransactionId info = (LocalTransactionId) command;
             dataOut.Write(info.TransactionId);
-            WriteConnectionId(info.ConnectionId, dataOut);
+            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/MessageAckMarshaller.cs

@@ -30,11 +30,11 @@ namespace OpenWire.Core.IO
 
             MessageAck info = (MessageAck) command;
             info.Destination = ReadDestination(dataIn);
-            info.TransactionId = ReadTransactionId(dataIn);
-            info.ConsumerId = ReadConsumerId(dataIn);
+            info.TransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
+            info.ConsumerId = (ConsumerId) CommandMarshallerRegistry.ConsumerIdMarshaller.ReadCommand(dataIn);
             info.AckType = dataIn.ReadByte();
-            info.FirstMessageId = ReadMessageId(dataIn);
-            info.LastMessageId = ReadMessageId(dataIn);
+            info.FirstMessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
+            info.LastMessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
             info.MessageCount = dataIn.ReadInt32();
 
         }
@@ -44,11 +44,11 @@ namespace OpenWire.Core.IO
 
             MessageAck info = (MessageAck) command;
             WriteDestination(info.Destination, dataOut);
-            WriteTransactionId(info.TransactionId, dataOut);
-            WriteConsumerId(info.ConsumerId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.TransactionId, dataOut);
+            CommandMarshallerRegistry.ConsumerIdMarshaller.WriteCommand(info.ConsumerId, dataOut);
             dataOut.Write(info.AckType);
-            WriteMessageId(info.FirstMessageId, dataOut);
-            WriteMessageId(info.LastMessageId, dataOut);
+            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.FirstMessageId, dataOut);
+            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.LastMessageId, dataOut);
             dataOut.Write(info.MessageCount);
 
         }

openwire-dotnet/src/OpenWire.Core/IO/MessageDispatchMarshaller.cs

@@ -29,9 +29,9 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             MessageDispatch info = (MessageDispatch) command;
-            info.ConsumerId = ReadConsumerId(dataIn);
+            info.ConsumerId = (ConsumerId) CommandMarshallerRegistry.ConsumerIdMarshaller.ReadCommand(dataIn);
             info.Destination = ReadDestination(dataIn);
-            info.Message = ReadMessage(dataIn);
+            info.Message = (Message) CommandMarshallerRegistry.MessageMarshaller.ReadCommand(dataIn);
             info.RedeliveryCounter = dataIn.ReadInt32();
 
         }
@@ -40,9 +40,9 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             MessageDispatch info = (MessageDispatch) command;
-            WriteConsumerId(info.ConsumerId, dataOut);
+            CommandMarshallerRegistry.ConsumerIdMarshaller.WriteCommand(info.ConsumerId, dataOut);
             WriteDestination(info.Destination, dataOut);
-            WriteMessage(info.Message, dataOut);
+            CommandMarshallerRegistry.MessageMarshaller.WriteCommand(info.Message, dataOut);
             dataOut.Write(info.RedeliveryCounter);
 
         }

openwire-dotnet/src/OpenWire.Core/IO/MessageIdMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             MessageId info = (MessageId) command;
-            info.ProducerId = ReadProducerId(dataIn);
+            info.ProducerId = (ProducerId) CommandMarshallerRegistry.ProducerIdMarshaller.ReadCommand(dataIn);
             info.ProducerSequenceId = dataIn.ReadInt64();
             info.BrokerSequenceId = dataIn.ReadInt64();
 
@@ -39,7 +39,7 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             MessageId info = (MessageId) command;
-            WriteProducerId(info.ProducerId, dataOut);
+            CommandMarshallerRegistry.ProducerIdMarshaller.WriteCommand(info.ProducerId, dataOut);
             dataOut.Write(info.ProducerSequenceId);
             dataOut.Write(info.BrokerSequenceId);
 

openwire-dotnet/src/OpenWire.Core/IO/MessageMarshaller.cs

@@ -29,12 +29,12 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             Message info = (Message) command;
-            info.ProducerId = ReadProducerId(dataIn);
+            info.ProducerId = (ProducerId) CommandMarshallerRegistry.ProducerIdMarshaller.ReadCommand(dataIn);
             info.Destination = ReadDestination(dataIn);
-            info.TransactionId = ReadTransactionId(dataIn);
+            info.TransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
             info.OriginalDestination = ReadDestination(dataIn);
-            info.MessageId = ReadMessageId(dataIn);
-            info.OriginalTransactionId = ReadTransactionId(dataIn);
+            info.MessageId = (MessageId) CommandMarshallerRegistry.MessageIdMarshaller.ReadCommand(dataIn);
+            info.OriginalTransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
             info.GroupID = dataIn.ReadString();
             info.GroupSequence = dataIn.ReadInt32();
             info.CorrelationId = dataIn.ReadString();
@@ -44,10 +44,10 @@ namespace OpenWire.Core.IO
             info.ReplyTo = ReadDestination(dataIn);
             info.Timestamp = dataIn.ReadInt64();
             info.Type = dataIn.ReadString();
-            info.Content = ReadByteSequence(dataIn);
-            info.MarshalledProperties = ReadByteSequence(dataIn);
-            info.DataStructure = ReadDataStructure(dataIn);
-            info.TargetConsumerId = ReadConsumerId(dataIn);
+            info.Content = (ByteSequence) CommandMarshallerRegistry.ByteSequenceMarshaller.ReadCommand(dataIn);
+            info.MarshalledProperties = (ByteSequence) CommandMarshallerRegistry.ByteSequenceMarshaller.ReadCommand(dataIn);
+            info.DataStructure = (DataStructure) CommandMarshallerRegistry.DataStructureMarshaller.ReadCommand(dataIn);
+            info.TargetConsumerId = (ConsumerId) CommandMarshallerRegistry.ConsumerIdMarshaller.ReadCommand(dataIn);
             info.Compressed = dataIn.ReadBoolean();
             info.RedeliveryCounter = dataIn.ReadInt32();
             info.BrokerPath = ReadBrokerIds(dataIn);
@@ -61,12 +61,12 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             Message info = (Message) command;
-            WriteProducerId(info.ProducerId, dataOut);
+            CommandMarshallerRegistry.ProducerIdMarshaller.WriteCommand(info.ProducerId, dataOut);
             WriteDestination(info.Destination, dataOut);
-            WriteTransactionId(info.TransactionId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.TransactionId, dataOut);
             WriteDestination(info.OriginalDestination, dataOut);
-            WriteMessageId(info.MessageId, dataOut);
-            WriteTransactionId(info.OriginalTransactionId, dataOut);
+            CommandMarshallerRegistry.MessageIdMarshaller.WriteCommand(info.MessageId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.OriginalTransactionId, dataOut);
             dataOut.Write(info.GroupID);
             dataOut.Write(info.GroupSequence);
             dataOut.Write(info.CorrelationId);
@@ -76,13 +76,13 @@ namespace OpenWire.Core.IO
             WriteDestination(info.ReplyTo, dataOut);
             dataOut.Write(info.Timestamp);
             dataOut.Write(info.Type);
-            WriteByteSequence(info.Content, dataOut);
-            WriteByteSequence(info.MarshalledProperties, dataOut);
-            WriteDataStructure(info.DataStructure, dataOut);
-            WriteConsumerId(info.TargetConsumerId, dataOut);
+            CommandMarshallerRegistry.ByteSequenceMarshaller.WriteCommand(info.Content, dataOut);
+            CommandMarshallerRegistry.ByteSequenceMarshaller.WriteCommand(info.MarshalledProperties, dataOut);
+            CommandMarshallerRegistry.DataStructureMarshaller.WriteCommand(info.DataStructure, dataOut);
+            CommandMarshallerRegistry.ConsumerIdMarshaller.WriteCommand(info.TargetConsumerId, dataOut);
             dataOut.Write(info.Compressed);
             dataOut.Write(info.RedeliveryCounter);
-            dataOut.WriteBrokerIds(info.BrokerPath);
+            WriteBrokerIds(info.BrokerPath, dataOut);
             dataOut.Write(info.Arrival);
             dataOut.Write(info.UserID);
             dataOut.Write(info.RecievedByDFBridge);

openwire-dotnet/src/OpenWire.Core/IO/ProducerInfoMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             ProducerInfo info = (ProducerInfo) command;
-            info.ProducerId = ReadProducerId(dataIn);
+            info.ProducerId = (ProducerId) CommandMarshallerRegistry.ProducerIdMarshaller.ReadCommand(dataIn);
             info.Destination = ReadDestination(dataIn);
             info.BrokerPath = ReadBrokerIds(dataIn);
 
@@ -39,9 +39,9 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             ProducerInfo info = (ProducerInfo) command;
-            WriteProducerId(info.ProducerId, dataOut);
+            CommandMarshallerRegistry.ProducerIdMarshaller.WriteCommand(info.ProducerId, dataOut);
             WriteDestination(info.Destination, dataOut);
-            dataOut.WriteBrokerIds(info.BrokerPath);
+            WriteBrokerIds(info.BrokerPath, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/RemoveInfoMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             RemoveInfo info = (RemoveInfo) command;
-            info.ObjectId = ReadDataStructure(dataIn);
+            info.ObjectId = (DataStructure) CommandMarshallerRegistry.DataStructureMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -37,7 +37,7 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             RemoveInfo info = (RemoveInfo) command;
-            WriteDataStructure(info.ObjectId, dataOut);
+            CommandMarshallerRegistry.DataStructureMarshaller.WriteCommand(info.ObjectId, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/RemoveSubscriptionInfoMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) command;
-            info.ConnectionId = ReadConnectionId(dataIn);
+            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
             info.SubcriptionName = dataIn.ReadString();
             info.ClientId = dataIn.ReadString();
 
@@ -39,7 +39,7 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) command;
-            WriteConnectionId(info.ConnectionId, dataOut);
+            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId, dataOut);
             dataOut.Write(info.SubcriptionName);
             dataOut.Write(info.ClientId);
 

openwire-dotnet/src/OpenWire.Core/IO/SessionInfoMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             SessionInfo info = (SessionInfo) command;
-            info.SessionId = ReadSessionId(dataIn);
+            info.SessionId = (SessionId) CommandMarshallerRegistry.SessionIdMarshaller.ReadCommand(dataIn);
 
         }
 
@@ -37,7 +37,7 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             SessionInfo info = (SessionInfo) command;
-            WriteSessionId(info.SessionId, dataOut);
+            CommandMarshallerRegistry.SessionIdMarshaller.WriteCommand(info.SessionId, dataOut);
 
         }
     }

openwire-dotnet/src/OpenWire.Core/IO/TransactionInfoMarshaller.cs

@@ -29,8 +29,8 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             TransactionInfo info = (TransactionInfo) command;
-            info.ConnectionId = ReadConnectionId(dataIn);
-            info.TransactionId = ReadTransactionId(dataIn);
+            info.ConnectionId = (ConnectionId) CommandMarshallerRegistry.ConnectionIdMarshaller.ReadCommand(dataIn);
+            info.TransactionId = (TransactionId) CommandMarshallerRegistry.TransactionIdMarshaller.ReadCommand(dataIn);
             info.Type = dataIn.ReadByte();
 
         }
@@ -39,8 +39,8 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             TransactionInfo info = (TransactionInfo) command;
-            WriteConnectionId(info.ConnectionId, dataOut);
-            WriteTransactionId(info.TransactionId, dataOut);
+            CommandMarshallerRegistry.ConnectionIdMarshaller.WriteCommand(info.ConnectionId, dataOut);
+            CommandMarshallerRegistry.TransactionIdMarshaller.WriteCommand(info.TransactionId, dataOut);
             dataOut.Write(info.Type);
 
         }

openwire-dotnet/src/OpenWire.Core/IO/WireFormatInfoMarshaller.cs

@@ -29,7 +29,7 @@ namespace OpenWire.Core.IO
             base.BuildCommand(command, dataIn);
 
             WireFormatInfo info = (WireFormatInfo) command;
-            info.Magic = Readbyte[](dataIn);
+            info.Magic = ReadBytes(dataIn);
             info.Version = dataIn.ReadInt32();
             info.Options = dataIn.ReadInt32();
 
@@ -39,7 +39,7 @@ namespace OpenWire.Core.IO
             base.WriteCommand(command, dataOut);
 
             WireFormatInfo info = (WireFormatInfo) command;
-            Writebyte[](info.Magic, dataOut);
+            WriteBytes(info.Magic, dataOut);
             dataOut.Write(info.Version);
             dataOut.Write(info.Options);
 

openwire-dotnet/src/OpenWire.Core/IO/XATransactionIdMarshaller.cs

@@ -30,8 +30,8 @@ namespace OpenWire.Core.IO
 
             XATransactionId info = (XATransactionId) command;
             info.FormatId = dataIn.ReadInt32();
-            info.GlobalTransactionId = Readbyte[](dataIn);
-            info.BranchQualifier = Readbyte[](dataIn);
+            info.GlobalTransactionId = ReadBytes(dataIn);
+            info.BranchQualifier = ReadBytes(dataIn);
 
         }
 
@@ -40,8 +40,8 @@ namespace OpenWire.Core.IO
 
             XATransactionId info = (XATransactionId) command;
             dataOut.Write(info.FormatId);
-            Writebyte[](info.GlobalTransactionId, dataOut);
-            Writebyte[](info.BranchQualifier, dataOut);
+            WriteBytes(info.GlobalTransactionId, dataOut);
+            WriteBytes(info.BranchQualifier, dataOut);
 
         }
     }