You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2006/01/07 14:48:13 UTC

svn commit: r366724 [1/2] - in /incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core: ./ Commands/ IO/

Author: jstrachan
Date: Sat Jan  7 05:47:39 2006
New Revision: 366724

URL: http://svn.apache.org/viewcvs?rev=366724&view=rev
Log:
Close to compiling OpenWire.Net

Added:
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/DataStructure.cs   (with props)
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/CommandMarshallerRegistry.cs
Modified:
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQBytesMessage.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQDestination.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMapMessage.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMessage.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQObjectMessage.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQQueue.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQStreamMessage.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempDestination.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempQueue.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempTopic.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTextMessage.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTopic.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/FlushCommand.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalQueueAck.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTopicAck.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTrace.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTransaction.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/KeepAliveInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/LocalTransactionId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Message.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageAck.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageDispatch.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveSubscriptionInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Response.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ShutdownInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SubscriptionInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/WireFormatInfo.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/XATransactionId.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/BrokerInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ConnectionInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ConsumerInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DataArrayResponseMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DataResponseMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DestinationInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ExceptionResponseMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalQueueAckMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalTopicAckMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/JournalTransactionMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/LocalTransactionIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageAckMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageDispatchMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/MessageMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ProducerInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/RemoveInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/RemoveSubscriptionInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/SessionInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/TransactionInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/WireFormatInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/XATransactionIdMarshaller.cs

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/AbstractCommandMarshaller.cs Sat Jan  7 05:47:39 2006
@@ -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 @@
 
         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 @@
         {
         }
         
-        protected virtual BrokerId ReadBrokerId(BinaryReader dataIn)
+        protected virtual BrokerId[] ReadBrokerIds(BinaryReader dataIn)
+        {
+            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 WriteBrokerIds(BrokerId[] commands, BinaryWriter 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)
         {
-        	   return brokerIDMarshaller.ReadCommand();
+            int size = dataIn.ReadInt32();
+        	   return dataIn.ReadBytes(size);
         }
         
-        protected virtual void WriteBrokerId(BrokerId command, BinaryWriter dataOut)
+        protected virtual void WriteBytes(byte[] command, BinaryWriter dataOut)
         {
-            brokerIDMarshaller.WriteCommand(command, dataOut);
+        	  dataOut.Write(command.Length);
+        	  dataOut.Write(command);
         }
         
 	}

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQBytesMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQBytesMessage.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQBytesMessage.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQBytesMessage.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQBytesMessage : ActiveMQMessage
     {
+    			public const int ID_ActiveMQBytesMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQBytesMessage;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQDestination.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQDestination.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQDestination.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQDestination.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQDestination : AbstractCommand
     {
+    			public const int ID_ActiveMQDestination = 1;
+    			
         string physicalName;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQDestination;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMapMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMapMessage.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMapMessage.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMapMessage.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQMapMessage : ActiveMQMessage
     {
+    			public const int ID_ActiveMQMapMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQMapMessage;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMessage.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMessage.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQMessage.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQMessage : AbstractCommand
     {
+    			public const int ID_ActiveMQMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQMessage;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQObjectMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQObjectMessage.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQObjectMessage.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQObjectMessage.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQObjectMessage : ActiveMQMessage
     {
+    			public const int ID_ActiveMQObjectMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQObjectMessage;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQQueue.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQQueue.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQQueue.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQQueue.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQQueue : AbstractCommand
     {
+    			public const int ID_ActiveMQQueue = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQQueue;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQStreamMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQStreamMessage.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQStreamMessage.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQStreamMessage.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQStreamMessage : ActiveMQMessage
     {
+    			public const int ID_ActiveMQStreamMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQStreamMessage;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempDestination.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempDestination.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempDestination.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempDestination.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQTempDestination : AbstractCommand
     {
+    			public const int ID_ActiveMQTempDestination = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQTempDestination;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempQueue.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempQueue.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempQueue.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempQueue.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQTempQueue : AbstractCommand
     {
+    			public const int ID_ActiveMQTempQueue = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQTempQueue;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempTopic.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempTopic.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempTopic.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTempTopic.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQTempTopic : AbstractCommand
     {
+    			public const int ID_ActiveMQTempTopic = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQTempTopic;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTextMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTextMessage.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTextMessage.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTextMessage.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQTextMessage : ActiveMQMessage
     {
+    			public const int ID_ActiveMQTextMessage = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQTextMessage;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTopic.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTopic.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTopic.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ActiveMQTopic.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ActiveMQTopic : AbstractCommand
     {
+    			public const int ID_ActiveMQTopic = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ActiveMQTopic;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BaseCommand.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class BaseCommand : AbstractCommand
     {
+    			public const int ID_BaseCommand = 1;
+    			
         short commandId;
         bool responseRequired;
 
@@ -27,7 +29,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_BaseCommand;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerId.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class BrokerId : AbstractCommand
     {
+    			public const int ID_BrokerId = 1;
+    			
         string brokerId;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_BrokerId;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/BrokerInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class BrokerInfo : AbstractCommand
     {
+    			public const int ID_BrokerInfo = 1;
+    			
         BrokerId brokerId;
         string brokerURL;
         BrokerInfo[] peerBrokerInfos;
@@ -29,7 +31,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_BrokerInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionId.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ConnectionId : AbstractCommand
     {
+    			public const int ID_ConnectionId = 1;
+    			
         string connectionId;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ConnectionId;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConnectionInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ConnectionInfo : AbstractCommand
     {
+    			public const int ID_ConnectionInfo = 1;
+    			
         ConnectionId connectionId;
         string clientId;
         string password;
@@ -30,7 +32,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ConnectionInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerId.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ConsumerId : AbstractCommand
     {
+    			public const int ID_ConsumerId = 1;
+    			
         string connectionId;
         long sessionId;
         long consumerId;
@@ -28,7 +30,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ConsumerId;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ConsumerInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ConsumerInfo : AbstractCommand
     {
+    			public const int ID_ConsumerInfo = 1;
+    			
         ConsumerId consumerId;
         bool browser;
         ActiveMQDestination destination;
@@ -38,7 +40,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ConsumerInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ControlCommand.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ControlCommand : AbstractCommand
     {
+    			public const int ID_ControlCommand = 1;
+    			
         string command;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ControlCommand;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataArrayResponse.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class DataArrayResponse : AbstractCommand
     {
+    			public const int ID_DataArrayResponse = 1;
+    			
         Command[] data;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_DataArrayResponse;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DataResponse.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class DataResponse : AbstractCommand
     {
+    			public const int ID_DataResponse = 1;
+    			
         Command data;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_DataResponse;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/DestinationInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class DestinationInfo : AbstractCommand
     {
+    			public const int ID_DestinationInfo = 1;
+    			
         ConnectionId connectionId;
         ActiveMQDestination destination;
         byte operationType;
@@ -30,7 +32,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_DestinationInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ExceptionResponse.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ExceptionResponse : AbstractCommand
     {
+    			public const int ID_ExceptionResponse = 1;
+    			
         string exception;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ExceptionResponse;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/FlushCommand.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/FlushCommand.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/FlushCommand.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/FlushCommand.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class FlushCommand : AbstractCommand
     {
+    			public const int ID_FlushCommand = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_FlushCommand;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/IntegerResponse.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class IntegerResponse : AbstractCommand
     {
+    			public const int ID_IntegerResponse = 1;
+    			
         int result;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_IntegerResponse;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalQueueAck.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalQueueAck.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalQueueAck.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalQueueAck.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class JournalQueueAck : AbstractCommand
     {
+    			public const int ID_JournalQueueAck = 1;
+    			
         ActiveMQDestination destination;
         MessageAck messageAck;
 
@@ -27,7 +29,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_JournalQueueAck;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTopicAck.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTopicAck.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTopicAck.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTopicAck.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class JournalTopicAck : AbstractCommand
     {
+    			public const int ID_JournalTopicAck = 1;
+    			
         ActiveMQDestination destination;
         MessageId messageId;
         long messageSequenceId;
@@ -31,7 +33,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_JournalTopicAck;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTrace.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTrace.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTrace.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTrace.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class JournalTrace : AbstractCommand
     {
+    			public const int ID_JournalTrace = 1;
+    			
         string message;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_JournalTrace;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTransaction.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTransaction.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTransaction.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/JournalTransaction.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class JournalTransaction : AbstractCommand
     {
+    			public const int ID_JournalTransaction = 1;
+    			
         TransactionId transactionId;
         byte type;
         bool wasPrepared;
@@ -28,7 +30,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_JournalTransaction;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/KeepAliveInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/KeepAliveInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/KeepAliveInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/KeepAliveInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class KeepAliveInfo : AbstractCommand
     {
+    			public const int ID_KeepAliveInfo = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_KeepAliveInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/LocalTransactionId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/LocalTransactionId.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/LocalTransactionId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/LocalTransactionId.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class LocalTransactionId : AbstractCommand
     {
+    			public const int ID_LocalTransactionId = 1;
+    			
         long transactionId;
         ConnectionId connectionId;
 
@@ -27,7 +29,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_LocalTransactionId;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Message.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Message.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Message.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Message.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class Message : AbstractCommand
     {
+    			public const int ID_Message = 1;
+    			
         ProducerId producerId;
         ActiveMQDestination destination;
         TransactionId transactionId;
@@ -50,7 +52,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_Message;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageAck.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageAck.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageAck.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageAck.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class MessageAck : AbstractCommand
     {
+    			public const int ID_MessageAck = 1;
+    			
         ActiveMQDestination destination;
         TransactionId transactionId;
         ConsumerId consumerId;
@@ -32,7 +34,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_MessageAck;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageDispatch.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageDispatch.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageDispatch.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageDispatch.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class MessageDispatch : AbstractCommand
     {
+    			public const int ID_MessageDispatch = 1;
+    			
         ConsumerId consumerId;
         ActiveMQDestination destination;
         Message message;
@@ -29,7 +31,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_MessageDispatch;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageId.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/MessageId.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class MessageId : AbstractCommand
     {
+    			public const int ID_MessageId = 1;
+    			
         ProducerId producerId;
         long producerSequenceId;
         long brokerSequenceId;
@@ -28,7 +30,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_MessageId;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerId.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerId.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ProducerId : AbstractCommand
     {
+    			public const int ID_ProducerId = 1;
+    			
         string connectionId;
         long producerId;
         long sessionId;
@@ -28,7 +30,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ProducerId;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ProducerInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ProducerInfo : AbstractCommand
     {
+    			public const int ID_ProducerInfo = 1;
+    			
         ProducerId producerId;
         ActiveMQDestination destination;
         BrokerId[] brokerPath;
@@ -28,7 +30,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ProducerInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class RemoveInfo : AbstractCommand
     {
+    			public const int ID_RemoveInfo = 1;
+    			
         Command objectId;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_RemoveInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveSubscriptionInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveSubscriptionInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveSubscriptionInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/RemoveSubscriptionInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class RemoveSubscriptionInfo : AbstractCommand
     {
+    			public const int ID_RemoveSubscriptionInfo = 1;
+    			
         ConnectionId connectionId;
         string subcriptionName;
         string clientId;
@@ -28,7 +30,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_RemoveSubscriptionInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Response.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Response.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Response.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/Response.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class Response : AbstractCommand
     {
+    			public const int ID_Response = 1;
+    			
         short correlationId;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_Response;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionId.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionId.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class SessionId : AbstractCommand
     {
+    			public const int ID_SessionId = 1;
+    			
         string connectionId;
         long sessionId;
 
@@ -27,7 +29,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_SessionId;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SessionInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class SessionInfo : AbstractCommand
     {
+    			public const int ID_SessionInfo = 1;
+    			
         SessionId sessionId;
 
 
@@ -26,7 +28,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_SessionInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ShutdownInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ShutdownInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ShutdownInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/ShutdownInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class ShutdownInfo : AbstractCommand
     {
+    			public const int ID_ShutdownInfo = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_ShutdownInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SubscriptionInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SubscriptionInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SubscriptionInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/SubscriptionInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class SubscriptionInfo : AbstractCommand
     {
+    			public const int ID_SubscriptionInfo = 1;
+    			
         string clientId;
         ActiveMQDestination destination;
         string selector;
@@ -29,7 +31,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_SubscriptionInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionId.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionId.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class TransactionId : AbstractCommand
     {
+    			public const int ID_TransactionId = 1;
+    			
 
 
 
@@ -25,7 +27,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_TransactionId;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/TransactionInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class TransactionInfo : AbstractCommand
     {
+    			public const int ID_TransactionInfo = 1;
+    			
         ConnectionId connectionId;
         TransactionId transactionId;
         byte type;
@@ -28,7 +30,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_TransactionInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/WireFormatInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/WireFormatInfo.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/WireFormatInfo.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/WireFormatInfo.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class WireFormatInfo : AbstractCommand
     {
+    			public const int ID_WireFormatInfo = 1;
+    			
         byte[] magic;
         int version;
         int options;
@@ -28,7 +30,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_WireFormatInfo;
         }
 
 

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/XATransactionId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/XATransactionId.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/XATransactionId.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/Commands/XATransactionId.cs Sat Jan  7 05:47:39 2006
@@ -16,6 +16,8 @@
 {
     public class XATransactionId : AbstractCommand
     {
+    			public const int ID_XATransactionId = 1;
+    			
         int formatId;
         byte[] globalTransactionId;
         byte[] branchQualifier;
@@ -28,7 +30,7 @@
 
 
         public override int GetCommandType() {
-            return 1;
+            return ID_XATransactionId;
         }
 
 

Added: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/DataStructure.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/DataStructure.cs?rev=366724&view=auto
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/DataStructure.cs (added)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/DataStructure.cs Sat Jan  7 05:47:39 2006
@@ -0,0 +1,14 @@
+using System;
+
+namespace OpenWire.Core
+{
+	/// <summary>
+	/// An OpenWire command
+	/// </summary>
+	public interface DataStructure {
+	
+        int GetCommandType();
+        
+	}
+}
+

Propchange: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/DataStructure.cs
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/BrokerInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/BrokerInfoMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/BrokerInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/BrokerInfoMarshaller.cs Sat Jan  7 05:47:39 2006
@@ -29,9 +29,9 @@
             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 @@
             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);
 
         }

Added: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/CommandMarshallerRegistry.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/CommandMarshallerRegistry.cs?rev=366724&view=auto
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/CommandMarshallerRegistry.cs (added)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/CommandMarshallerRegistry.cs Sat Jan  7 05:47:39 2006
@@ -0,0 +1,1011 @@
+//
+// Marshalling code for Open Wire Format for ExceptionResponse
+//
+//
+// NOTE!: This file is autogenerated - do not modify!
+//        if you need to make a change, please see the Groovy scripts in the
+//        activemq-openwire module
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+using OpenWire.Core;
+using OpenWire.Core.Commands;
+using OpenWire.Core.IO;
+
+namespace OpenWire.Core.IO
+{
+    public class CommandMarshallerRegistry
+    {
+				public static Command ReadCommand(BinaryReader dataIn) 
+				{
+						byte commandID = dataIn.ReadByte();
+						switch (commandID) 
+						{
+
+				case MessageId.ID_MessageId:
+						return messageIdMarshaller.ReadCommand(dataIn);
+						
+
+				case BrokerInfo.ID_BrokerInfo:
+						return brokerInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQTempQueue.ID_ActiveMQTempQueue:
+						return activeMQTempQueueMarshaller.ReadCommand(dataIn);
+						
+
+				case LocalTransactionId.ID_LocalTransactionId:
+						return localTransactionIdMarshaller.ReadCommand(dataIn);
+						
+
+				case RemoveSubscriptionInfo.ID_RemoveSubscriptionInfo:
+						return removeSubscriptionInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case IntegerResponse.ID_IntegerResponse:
+						return integerResponseMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQQueue.ID_ActiveMQQueue:
+						return activeMQQueueMarshaller.ReadCommand(dataIn);
+						
+
+				case DestinationInfo.ID_DestinationInfo:
+						return destinationInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQBytesMessage.ID_ActiveMQBytesMessage:
+						return activeMQBytesMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case ShutdownInfo.ID_ShutdownInfo:
+						return shutdownInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case DataResponse.ID_DataResponse:
+						return dataResponseMarshaller.ReadCommand(dataIn);
+						
+
+				case SessionId.ID_SessionId:
+						return sessionIdMarshaller.ReadCommand(dataIn);
+						
+
+				case DataArrayResponse.ID_DataArrayResponse:
+						return dataArrayResponseMarshaller.ReadCommand(dataIn);
+						
+
+				case JournalQueueAck.ID_JournalQueueAck:
+						return journalQueueAckMarshaller.ReadCommand(dataIn);
+						
+
+				case WireFormatInfo.ID_WireFormatInfo:
+						return wireFormatInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case TransactionId.ID_TransactionId:
+						return transactionIdMarshaller.ReadCommand(dataIn);
+						
+
+				case Response.ID_Response:
+						return responseMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQObjectMessage.ID_ActiveMQObjectMessage:
+						return activeMQObjectMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case ConsumerInfo.ID_ConsumerInfo:
+						return consumerInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ConnectionId.ID_ConnectionId:
+						return connectionIdMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQTempTopic.ID_ActiveMQTempTopic:
+						return activeMQTempTopicMarshaller.ReadCommand(dataIn);
+						
+
+				case ConnectionInfo.ID_ConnectionInfo:
+						return connectionInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case KeepAliveInfo.ID_KeepAliveInfo:
+						return keepAliveInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case Message.ID_Message:
+						return messageMarshaller.ReadCommand(dataIn);
+						
+
+				case BaseCommand.ID_BaseCommand:
+						return baseCommandMarshaller.ReadCommand(dataIn);
+						
+
+				case XATransactionId.ID_XATransactionId:
+						return xATransactionIdMarshaller.ReadCommand(dataIn);
+						
+
+				case JournalTrace.ID_JournalTrace:
+						return journalTraceMarshaller.ReadCommand(dataIn);
+						
+
+				case FlushCommand.ID_FlushCommand:
+						return flushCommandMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQTempDestination.ID_ActiveMQTempDestination:
+						return activeMQTempDestinationMarshaller.ReadCommand(dataIn);
+						
+
+				case ConsumerId.ID_ConsumerId:
+						return consumerIdMarshaller.ReadCommand(dataIn);
+						
+
+				case JournalTopicAck.ID_JournalTopicAck:
+						return journalTopicAckMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQTextMessage.ID_ActiveMQTextMessage:
+						return activeMQTextMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case BrokerId.ID_BrokerId:
+						return brokerIdMarshaller.ReadCommand(dataIn);
+						
+
+				case MessageDispatch.ID_MessageDispatch:
+						return messageDispatchMarshaller.ReadCommand(dataIn);
+						
+
+				case ProducerInfo.ID_ProducerInfo:
+						return producerInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case SubscriptionInfo.ID_SubscriptionInfo:
+						return subscriptionInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQMapMessage.ID_ActiveMQMapMessage:
+						return activeMQMapMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case SessionInfo.ID_SessionInfo:
+						return sessionInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQMessage.ID_ActiveMQMessage:
+						return activeMQMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case TransactionInfo.ID_TransactionInfo:
+						return transactionInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQStreamMessage.ID_ActiveMQStreamMessage:
+						return activeMQStreamMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case MessageAck.ID_MessageAck:
+						return messageAckMarshaller.ReadCommand(dataIn);
+						
+
+				case ProducerId.ID_ProducerId:
+						return producerIdMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQTopic.ID_ActiveMQTopic:
+						return activeMQTopicMarshaller.ReadCommand(dataIn);
+						
+
+				case JournalTransaction.ID_JournalTransaction:
+						return journalTransactionMarshaller.ReadCommand(dataIn);
+						
+
+				case RemoveInfo.ID_RemoveInfo:
+						return removeInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ControlCommand.ID_ControlCommand:
+						return controlCommandMarshaller.ReadCommand(dataIn);
+						
+
+				case ExceptionResponse.ID_ExceptionResponse:
+						return exceptionResponseMarshaller.ReadCommand(dataIn);
+						
+						
+								default:
+										throw new Exception("Unknown command type: " + commandID);
+						}
+				}
+
+
+				public static void WriteCommand(Command command, BinaryWriter dataOut) 
+				{
+				    int commandID = command.CommandType;
+						dataOut.Write(commandID);
+						switch (commandID) 
+						{
+
+				case MessageId.ID_MessageId:
+						return messageIdMarshaller.ReadCommand(dataIn);
+						
+
+				case BrokerInfo.ID_BrokerInfo:
+						return brokerInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQTempQueue.ID_ActiveMQTempQueue:
+						return activeMQTempQueueMarshaller.ReadCommand(dataIn);
+						
+
+				case LocalTransactionId.ID_LocalTransactionId:
+						return localTransactionIdMarshaller.ReadCommand(dataIn);
+						
+
+				case RemoveSubscriptionInfo.ID_RemoveSubscriptionInfo:
+						return removeSubscriptionInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case IntegerResponse.ID_IntegerResponse:
+						return integerResponseMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQQueue.ID_ActiveMQQueue:
+						return activeMQQueueMarshaller.ReadCommand(dataIn);
+						
+
+				case DestinationInfo.ID_DestinationInfo:
+						return destinationInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQBytesMessage.ID_ActiveMQBytesMessage:
+						return activeMQBytesMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case ShutdownInfo.ID_ShutdownInfo:
+						return shutdownInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case DataResponse.ID_DataResponse:
+						return dataResponseMarshaller.ReadCommand(dataIn);
+						
+
+				case SessionId.ID_SessionId:
+						return sessionIdMarshaller.ReadCommand(dataIn);
+						
+
+				case DataArrayResponse.ID_DataArrayResponse:
+						return dataArrayResponseMarshaller.ReadCommand(dataIn);
+						
+
+				case JournalQueueAck.ID_JournalQueueAck:
+						return journalQueueAckMarshaller.ReadCommand(dataIn);
+						
+
+				case WireFormatInfo.ID_WireFormatInfo:
+						return wireFormatInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case TransactionId.ID_TransactionId:
+						return transactionIdMarshaller.ReadCommand(dataIn);
+						
+
+				case Response.ID_Response:
+						return responseMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQObjectMessage.ID_ActiveMQObjectMessage:
+						return activeMQObjectMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case ConsumerInfo.ID_ConsumerInfo:
+						return consumerInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ConnectionId.ID_ConnectionId:
+						return connectionIdMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQTempTopic.ID_ActiveMQTempTopic:
+						return activeMQTempTopicMarshaller.ReadCommand(dataIn);
+						
+
+				case ConnectionInfo.ID_ConnectionInfo:
+						return connectionInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case KeepAliveInfo.ID_KeepAliveInfo:
+						return keepAliveInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case Message.ID_Message:
+						return messageMarshaller.ReadCommand(dataIn);
+						
+
+				case BaseCommand.ID_BaseCommand:
+						return baseCommandMarshaller.ReadCommand(dataIn);
+						
+
+				case XATransactionId.ID_XATransactionId:
+						return xATransactionIdMarshaller.ReadCommand(dataIn);
+						
+
+				case JournalTrace.ID_JournalTrace:
+						return journalTraceMarshaller.ReadCommand(dataIn);
+						
+
+				case FlushCommand.ID_FlushCommand:
+						return flushCommandMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQTempDestination.ID_ActiveMQTempDestination:
+						return activeMQTempDestinationMarshaller.ReadCommand(dataIn);
+						
+
+				case ConsumerId.ID_ConsumerId:
+						return consumerIdMarshaller.ReadCommand(dataIn);
+						
+
+				case JournalTopicAck.ID_JournalTopicAck:
+						return journalTopicAckMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQTextMessage.ID_ActiveMQTextMessage:
+						return activeMQTextMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case BrokerId.ID_BrokerId:
+						return brokerIdMarshaller.ReadCommand(dataIn);
+						
+
+				case MessageDispatch.ID_MessageDispatch:
+						return messageDispatchMarshaller.ReadCommand(dataIn);
+						
+
+				case ProducerInfo.ID_ProducerInfo:
+						return producerInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case SubscriptionInfo.ID_SubscriptionInfo:
+						return subscriptionInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQMapMessage.ID_ActiveMQMapMessage:
+						return activeMQMapMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case SessionInfo.ID_SessionInfo:
+						return sessionInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQMessage.ID_ActiveMQMessage:
+						return activeMQMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case TransactionInfo.ID_TransactionInfo:
+						return transactionInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQStreamMessage.ID_ActiveMQStreamMessage:
+						return activeMQStreamMessageMarshaller.ReadCommand(dataIn);
+						
+
+				case MessageAck.ID_MessageAck:
+						return messageAckMarshaller.ReadCommand(dataIn);
+						
+
+				case ProducerId.ID_ProducerId:
+						return producerIdMarshaller.ReadCommand(dataIn);
+						
+
+				case ActiveMQTopic.ID_ActiveMQTopic:
+						return activeMQTopicMarshaller.ReadCommand(dataIn);
+						
+
+				case JournalTransaction.ID_JournalTransaction:
+						return journalTransactionMarshaller.ReadCommand(dataIn);
+						
+
+				case RemoveInfo.ID_RemoveInfo:
+						return removeInfoMarshaller.ReadCommand(dataIn);
+						
+
+				case ControlCommand.ID_ControlCommand:
+						return controlCommandMarshaller.ReadCommand(dataIn);
+						
+
+				case ExceptionResponse.ID_ExceptionResponse:
+						return exceptionResponseMarshaller.ReadCommand(dataIn);
+						
+						
+								default:
+										throw new Exception("Unknown command type: " + commandID);
+						}
+				}
+
+
+				// Properties     
+
+	            
+	      private static MessageIdMarshaller messageIdMarshaller = new MessageIdMarshaller();
+	      
+        public static MessageIdMarshaller MessageIdMarshaller
+        {
+            get
+            {
+                return messageIdMarshaller;
+            }
+        }
+
+
+	            
+	      private static BrokerInfoMarshaller brokerInfoMarshaller = new BrokerInfoMarshaller();
+	      
+        public static BrokerInfoMarshaller BrokerInfoMarshaller
+        {
+            get
+            {
+                return brokerInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQTempQueueMarshaller activeMQTempQueueMarshaller = new ActiveMQTempQueueMarshaller();
+	      
+        public static ActiveMQTempQueueMarshaller ActiveMQTempQueueMarshaller
+        {
+            get
+            {
+                return activeMQTempQueueMarshaller;
+            }
+        }
+
+
+	            
+	      private static LocalTransactionIdMarshaller localTransactionIdMarshaller = new LocalTransactionIdMarshaller();
+	      
+        public static LocalTransactionIdMarshaller LocalTransactionIdMarshaller
+        {
+            get
+            {
+                return localTransactionIdMarshaller;
+            }
+        }
+
+
+	            
+	      private static RemoveSubscriptionInfoMarshaller removeSubscriptionInfoMarshaller = new RemoveSubscriptionInfoMarshaller();
+	      
+        public static RemoveSubscriptionInfoMarshaller RemoveSubscriptionInfoMarshaller
+        {
+            get
+            {
+                return removeSubscriptionInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static IntegerResponseMarshaller integerResponseMarshaller = new IntegerResponseMarshaller();
+	      
+        public static IntegerResponseMarshaller IntegerResponseMarshaller
+        {
+            get
+            {
+                return integerResponseMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQQueueMarshaller activeMQQueueMarshaller = new ActiveMQQueueMarshaller();
+	      
+        public static ActiveMQQueueMarshaller ActiveMQQueueMarshaller
+        {
+            get
+            {
+                return activeMQQueueMarshaller;
+            }
+        }
+
+
+	            
+	      private static DestinationInfoMarshaller destinationInfoMarshaller = new DestinationInfoMarshaller();
+	      
+        public static DestinationInfoMarshaller DestinationInfoMarshaller
+        {
+            get
+            {
+                return destinationInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQBytesMessageMarshaller activeMQBytesMessageMarshaller = new ActiveMQBytesMessageMarshaller();
+	      
+        public static ActiveMQBytesMessageMarshaller ActiveMQBytesMessageMarshaller
+        {
+            get
+            {
+                return activeMQBytesMessageMarshaller;
+            }
+        }
+
+
+	            
+	      private static ShutdownInfoMarshaller shutdownInfoMarshaller = new ShutdownInfoMarshaller();
+	      
+        public static ShutdownInfoMarshaller ShutdownInfoMarshaller
+        {
+            get
+            {
+                return shutdownInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static DataResponseMarshaller dataResponseMarshaller = new DataResponseMarshaller();
+	      
+        public static DataResponseMarshaller DataResponseMarshaller
+        {
+            get
+            {
+                return dataResponseMarshaller;
+            }
+        }
+
+
+	            
+	      private static SessionIdMarshaller sessionIdMarshaller = new SessionIdMarshaller();
+	      
+        public static SessionIdMarshaller SessionIdMarshaller
+        {
+            get
+            {
+                return sessionIdMarshaller;
+            }
+        }
+
+
+	            
+	      private static DataArrayResponseMarshaller dataArrayResponseMarshaller = new DataArrayResponseMarshaller();
+	      
+        public static DataArrayResponseMarshaller DataArrayResponseMarshaller
+        {
+            get
+            {
+                return dataArrayResponseMarshaller;
+            }
+        }
+
+
+	            
+	      private static JournalQueueAckMarshaller journalQueueAckMarshaller = new JournalQueueAckMarshaller();
+	      
+        public static JournalQueueAckMarshaller JournalQueueAckMarshaller
+        {
+            get
+            {
+                return journalQueueAckMarshaller;
+            }
+        }
+
+
+	            
+	      private static WireFormatInfoMarshaller wireFormatInfoMarshaller = new WireFormatInfoMarshaller();
+	      
+        public static WireFormatInfoMarshaller WireFormatInfoMarshaller
+        {
+            get
+            {
+                return wireFormatInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static TransactionIdMarshaller transactionIdMarshaller = new TransactionIdMarshaller();
+	      
+        public static TransactionIdMarshaller TransactionIdMarshaller
+        {
+            get
+            {
+                return transactionIdMarshaller;
+            }
+        }
+
+
+	            
+	      private static ResponseMarshaller responseMarshaller = new ResponseMarshaller();
+	      
+        public static ResponseMarshaller ResponseMarshaller
+        {
+            get
+            {
+                return responseMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQObjectMessageMarshaller activeMQObjectMessageMarshaller = new ActiveMQObjectMessageMarshaller();
+	      
+        public static ActiveMQObjectMessageMarshaller ActiveMQObjectMessageMarshaller
+        {
+            get
+            {
+                return activeMQObjectMessageMarshaller;
+            }
+        }
+
+
+	            
+	      private static ConsumerInfoMarshaller consumerInfoMarshaller = new ConsumerInfoMarshaller();
+	      
+        public static ConsumerInfoMarshaller ConsumerInfoMarshaller
+        {
+            get
+            {
+                return consumerInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static ConnectionIdMarshaller connectionIdMarshaller = new ConnectionIdMarshaller();
+	      
+        public static ConnectionIdMarshaller ConnectionIdMarshaller
+        {
+            get
+            {
+                return connectionIdMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQTempTopicMarshaller activeMQTempTopicMarshaller = new ActiveMQTempTopicMarshaller();
+	      
+        public static ActiveMQTempTopicMarshaller ActiveMQTempTopicMarshaller
+        {
+            get
+            {
+                return activeMQTempTopicMarshaller;
+            }
+        }
+
+
+	            
+	      private static ConnectionInfoMarshaller connectionInfoMarshaller = new ConnectionInfoMarshaller();
+	      
+        public static ConnectionInfoMarshaller ConnectionInfoMarshaller
+        {
+            get
+            {
+                return connectionInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static KeepAliveInfoMarshaller keepAliveInfoMarshaller = new KeepAliveInfoMarshaller();
+	      
+        public static KeepAliveInfoMarshaller KeepAliveInfoMarshaller
+        {
+            get
+            {
+                return keepAliveInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static MessageMarshaller messageMarshaller = new MessageMarshaller();
+	      
+        public static MessageMarshaller MessageMarshaller
+        {
+            get
+            {
+                return messageMarshaller;
+            }
+        }
+
+
+	            
+	      private static BaseCommandMarshaller baseCommandMarshaller = new BaseCommandMarshaller();
+	      
+        public static BaseCommandMarshaller BaseCommandMarshaller
+        {
+            get
+            {
+                return baseCommandMarshaller;
+            }
+        }
+
+
+	            
+	      private static XATransactionIdMarshaller xATransactionIdMarshaller = new XATransactionIdMarshaller();
+	      
+        public static XATransactionIdMarshaller XATransactionIdMarshaller
+        {
+            get
+            {
+                return xATransactionIdMarshaller;
+            }
+        }
+
+
+	            
+	      private static JournalTraceMarshaller journalTraceMarshaller = new JournalTraceMarshaller();
+	      
+        public static JournalTraceMarshaller JournalTraceMarshaller
+        {
+            get
+            {
+                return journalTraceMarshaller;
+            }
+        }
+
+
+	            
+	      private static FlushCommandMarshaller flushCommandMarshaller = new FlushCommandMarshaller();
+	      
+        public static FlushCommandMarshaller FlushCommandMarshaller
+        {
+            get
+            {
+                return flushCommandMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQTempDestinationMarshaller activeMQTempDestinationMarshaller = new ActiveMQTempDestinationMarshaller();
+	      
+        public static ActiveMQTempDestinationMarshaller ActiveMQTempDestinationMarshaller
+        {
+            get
+            {
+                return activeMQTempDestinationMarshaller;
+            }
+        }
+
+
+	            
+	      private static ConsumerIdMarshaller consumerIdMarshaller = new ConsumerIdMarshaller();
+	      
+        public static ConsumerIdMarshaller ConsumerIdMarshaller
+        {
+            get
+            {
+                return consumerIdMarshaller;
+            }
+        }
+
+
+	            
+	      private static JournalTopicAckMarshaller journalTopicAckMarshaller = new JournalTopicAckMarshaller();
+	      
+        public static JournalTopicAckMarshaller JournalTopicAckMarshaller
+        {
+            get
+            {
+                return journalTopicAckMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQTextMessageMarshaller activeMQTextMessageMarshaller = new ActiveMQTextMessageMarshaller();
+	      
+        public static ActiveMQTextMessageMarshaller ActiveMQTextMessageMarshaller
+        {
+            get
+            {
+                return activeMQTextMessageMarshaller;
+            }
+        }
+
+
+	            
+	      private static BrokerIdMarshaller brokerIdMarshaller = new BrokerIdMarshaller();
+	      
+        public static BrokerIdMarshaller BrokerIdMarshaller
+        {
+            get
+            {
+                return brokerIdMarshaller;
+            }
+        }
+
+
+	            
+	      private static MessageDispatchMarshaller messageDispatchMarshaller = new MessageDispatchMarshaller();
+	      
+        public static MessageDispatchMarshaller MessageDispatchMarshaller
+        {
+            get
+            {
+                return messageDispatchMarshaller;
+            }
+        }
+
+
+	            
+	      private static ProducerInfoMarshaller producerInfoMarshaller = new ProducerInfoMarshaller();
+	      
+        public static ProducerInfoMarshaller ProducerInfoMarshaller
+        {
+            get
+            {
+                return producerInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static SubscriptionInfoMarshaller subscriptionInfoMarshaller = new SubscriptionInfoMarshaller();
+	      
+        public static SubscriptionInfoMarshaller SubscriptionInfoMarshaller
+        {
+            get
+            {
+                return subscriptionInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQMapMessageMarshaller activeMQMapMessageMarshaller = new ActiveMQMapMessageMarshaller();
+	      
+        public static ActiveMQMapMessageMarshaller ActiveMQMapMessageMarshaller
+        {
+            get
+            {
+                return activeMQMapMessageMarshaller;
+            }
+        }
+
+
+	            
+	      private static SessionInfoMarshaller sessionInfoMarshaller = new SessionInfoMarshaller();
+	      
+        public static SessionInfoMarshaller SessionInfoMarshaller
+        {
+            get
+            {
+                return sessionInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQMessageMarshaller activeMQMessageMarshaller = new ActiveMQMessageMarshaller();
+	      
+        public static ActiveMQMessageMarshaller ActiveMQMessageMarshaller
+        {
+            get
+            {
+                return activeMQMessageMarshaller;
+            }
+        }
+
+
+	            
+	      private static TransactionInfoMarshaller transactionInfoMarshaller = new TransactionInfoMarshaller();
+	      
+        public static TransactionInfoMarshaller TransactionInfoMarshaller
+        {
+            get
+            {
+                return transactionInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQStreamMessageMarshaller activeMQStreamMessageMarshaller = new ActiveMQStreamMessageMarshaller();
+	      
+        public static ActiveMQStreamMessageMarshaller ActiveMQStreamMessageMarshaller
+        {
+            get
+            {
+                return activeMQStreamMessageMarshaller;
+            }
+        }
+
+
+	            
+	      private static MessageAckMarshaller messageAckMarshaller = new MessageAckMarshaller();
+	      
+        public static MessageAckMarshaller MessageAckMarshaller
+        {
+            get
+            {
+                return messageAckMarshaller;
+            }
+        }
+
+
+	            
+	      private static ProducerIdMarshaller producerIdMarshaller = new ProducerIdMarshaller();
+	      
+        public static ProducerIdMarshaller ProducerIdMarshaller
+        {
+            get
+            {
+                return producerIdMarshaller;
+            }
+        }
+
+
+	            
+	      private static ActiveMQTopicMarshaller activeMQTopicMarshaller = new ActiveMQTopicMarshaller();
+	      
+        public static ActiveMQTopicMarshaller ActiveMQTopicMarshaller
+        {
+            get
+            {
+                return activeMQTopicMarshaller;
+            }
+        }
+
+
+	            
+	      private static JournalTransactionMarshaller journalTransactionMarshaller = new JournalTransactionMarshaller();
+	      
+        public static JournalTransactionMarshaller JournalTransactionMarshaller
+        {
+            get
+            {
+                return journalTransactionMarshaller;
+            }
+        }
+
+
+	            
+	      private static RemoveInfoMarshaller removeInfoMarshaller = new RemoveInfoMarshaller();
+	      
+        public static RemoveInfoMarshaller RemoveInfoMarshaller
+        {
+            get
+            {
+                return removeInfoMarshaller;
+            }
+        }
+
+
+	            
+	      private static ControlCommandMarshaller controlCommandMarshaller = new ControlCommandMarshaller();
+	      
+        public static ControlCommandMarshaller ControlCommandMarshaller
+        {
+            get
+            {
+                return controlCommandMarshaller;
+            }
+        }
+
+
+	            
+	      private static ExceptionResponseMarshaller exceptionResponseMarshaller = new ExceptionResponseMarshaller();
+	      
+        public static ExceptionResponseMarshaller ExceptionResponseMarshaller
+        {
+            get
+            {
+                return exceptionResponseMarshaller;
+            }
+        }
+
+
+		
+    }
+}

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ConnectionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ConnectionInfoMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ConnectionInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ConnectionInfoMarshaller.cs Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             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 @@
             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);
 
         }
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ConsumerInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ConsumerInfoMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ConsumerInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/ConsumerInfoMarshaller.cs Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             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 @@
             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 @@
             dataOut.Write(info.Exclusive);
             dataOut.Write(info.Retroactive);
             dataOut.Write(info.Priority);
-            dataOut.WriteBrokerIds(info.BrokerPath);
+            WriteBrokerIds(info.BrokerPath, dataOut);
             dataOut.Write(info.NetworkSubscription);
 
         }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DataArrayResponseMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DataArrayResponseMarshaller.cs?rev=366724&r1=366723&r2=366724&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DataArrayResponseMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Core/IO/DataArrayResponseMarshaller.cs Sat Jan  7 05:47:39 2006
@@ -29,7 +29,7 @@
             base.BuildCommand(command, dataIn);
 
             DataArrayResponse info = (DataArrayResponse) command;
-            info.Data = ReadDataStructure[](dataIn);
+            info.Data = ReadDataStructures(dataIn);
 
         }
 
@@ -37,7 +37,7 @@
             base.WriteCommand(command, dataOut);
 
             DataArrayResponse info = (DataArrayResponse) command;
-            WriteDataStructure[](info.Data, dataOut);
+            WriteDataStructures(info.Data, dataOut);
 
         }
     }