updated the C# client to get it compiling and most of the tests working with the latest generated OpenWire code; particularly after the change of Command.CommandId from short to int

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

activemq-dotnet/activemq-dotnet.csproj

@@ -49,6 +49,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ActiveMQTextMessage.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ActiveMQTopic.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BaseCommand.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\BaseDataStructure.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BooleanExpression.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BrokerError.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BrokerId.cs"/>
@@ -74,6 +75,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\Commands\JournalTrace.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\JournalTransaction.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\KeepAliveInfo.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\LastPartialCommand.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\LocalTransactionId.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\MarshallAware.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\Message.cs"/>
@@ -83,6 +85,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\Commands\MessageId.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\MessageReference.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\NetworkBridgeFilter.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\PartialCommand.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ProducerId.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ProducerInfo.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\RemoveInfo.cs"/>
@@ -149,6 +152,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\JournalTraceMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\JournalTransactionMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\KeepAliveInfoMarshaller.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\LastPartialCommandMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\LocalTransactionIdMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\MarshallerFactory.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\MessageAckMarshaller.cs"/>
@@ -157,6 +161,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\MessageIdMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\MessageMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\NetworkBridgeFilterMarshaller.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\PartialCommandMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\ProducerIdMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\ProducerInfoMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\RemoveInfoMarshaller.cs"/>

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs

@@ -21,12 +21,11 @@ using ActiveMQ.OpenWire;
 namespace ActiveMQ.Commands
 {
     
-	/// <summary>
+    /// <summary>
-	/// Summary description for AbstractCommand.
+    /// Summary description for AbstractCommand.
-	/// </summary>
+    /// </summary>
-	public abstract class AbstractCommand : Command
+    public abstract class AbstractCommand
     {
-        private short commandId;
         private bool responseRequired;
         
         
@@ -48,121 +47,13 @@ namespace ActiveMQ.Commands
         
         // Properties
         
-        public short CommandId
-        {
-            get { return commandId; }
-            set { this.commandId = value; }
-        }
-        
         public bool ResponseRequired
         {
             get { return responseRequired; }
             set { this.responseRequired = value; }
         }
         
-        public static String GetDataStructureTypeAsString(int type)
-        {
-            String packetTypeStr = "";
-            switch (type)
-            {
-                case ActiveMQMessage.ID_ActiveMQMessage :
-                    packetTypeStr = "ACTIVEMQ_MESSAGE";
-                    break;
-                case ActiveMQTextMessage.ID_ActiveMQTextMessage :
-                    packetTypeStr = "ACTIVEMQ_TEXT_MESSAGE";
-                    break;
-                case ActiveMQObjectMessage.ID_ActiveMQObjectMessage:
-                    packetTypeStr = "ACTIVEMQ_OBJECT_MESSAGE";
-                    break;
-                case ActiveMQBytesMessage.ID_ActiveMQBytesMessage :
-                    packetTypeStr = "ACTIVEMQ_BYTES_MESSAGE";
-                    break;
-                case ActiveMQStreamMessage.ID_ActiveMQStreamMessage :
-                    packetTypeStr = "ACTIVEMQ_STREAM_MESSAGE";
-                    break;
-                case ActiveMQMapMessage.ID_ActiveMQMapMessage :
-                    packetTypeStr = "ACTIVEMQ_MAP_MESSAGE";
-                    break;
-                case MessageAck.ID_MessageAck :
-                    packetTypeStr = "ACTIVEMQ_MSG_ACK";
-                    break;
-                case Response.ID_Response :
-                    packetTypeStr = "RESPONSE";
-                    break;
-                case ConsumerInfo.ID_ConsumerInfo :
-                    packetTypeStr = "CONSUMER_INFO";
-                    break;
-                case ProducerInfo.ID_ProducerInfo :
-                    packetTypeStr = "PRODUCER_INFO";
-                    break;
-                case TransactionInfo.ID_TransactionInfo :
-                    packetTypeStr = "TRANSACTION_INFO";
-                    break;
-                case BrokerInfo.ID_BrokerInfo :
-                    packetTypeStr = "BROKER_INFO";
-                    break;
-                case ConnectionInfo.ID_ConnectionInfo :
-                    packetTypeStr = "CONNECTION_INFO";
-                    break;
-                case SessionInfo.ID_SessionInfo :
-                    packetTypeStr = "SESSION_INFO";
-                    break;
-                case RemoveSubscriptionInfo.ID_RemoveSubscriptionInfo :
-                    packetTypeStr = "DURABLE_UNSUBSCRIBE";
-                    break;
-                case IntegerResponse.ID_IntegerResponse :
-                    packetTypeStr = "INT_RESPONSE_RECEIPT_INFO";
-                    break;
-                case WireFormatInfo.ID_WireFormatInfo :
-                    packetTypeStr = "WIRE_FORMAT_INFO";
-                    break;
-                case RemoveInfo.ID_RemoveInfo :
-                    packetTypeStr = "REMOVE_INFO";
-                    break;
-                case KeepAliveInfo.ID_KeepAliveInfo :
-                    packetTypeStr = "KEEP_ALIVE";
-                    break;
-            }
-            return packetTypeStr;
-        }
 
-        // Helper methods
-        public int HashCode(object value)
-        {
-            if (value != null)
-            {
-                return value.GetHashCode();
-            }
-            else
-            {
-                return -1;
-            }
-        }
-		
-		public virtual void BeforeMarshall(OpenWireFormat wireFormat)
-		{
-		}
-		
-		public virtual void AfterMarshall(OpenWireFormat wireFormat)
-		{
-		}
-		
-		public virtual void BeforeUnmarshall(OpenWireFormat wireFormat)
-		{
-		}
-		
-		public virtual void AfterUnmarshall(OpenWireFormat wireFormat)
-		{
-		}
-		
-		public virtual void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data)
-		{
-		}
-		
-		public virtual byte[] GetMarshalledForm(OpenWireFormat wireFormat)
-		{
-			return null;
-		}
         
     }
 }

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQDestination.cs

@@ -19,10 +19,10 @@ using System;
 namespace ActiveMQ.Commands
 {
     
-	/// <summary>
+    /// <summary>
-	/// Summary description for ActiveMQDestination.
+    /// Summary description for ActiveMQDestination.
-	/// </summary>
+    /// </summary>
-	public abstract class ActiveMQDestination : AbstractCommand, IDestination
+    public abstract class ActiveMQDestination : BaseDataStructure, IDestination
     {
         
         /**
@@ -68,14 +68,9 @@ namespace ActiveMQ.Commands
          */
         public const String DEFAULT_ORDERED_TARGET = "coordinator";
         
-        private const int NULL_DESTINATION = 10;
-        
         private const String TEMP_PREFIX = "{TD{";
         private const String TEMP_POSTFIX = "}TD}";
         private const String COMPOSITE_SEPARATOR = ",";
-        private const String QUEUE_PREFIX = "queue://";
-        private const String TOPIC_PREFIX = "topic://";
-        
         
         private String physicalName = "";
         

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BaseCommand.cs

@@ -7,15 +7,23 @@
 //        activemq-openwire module
 //
 
-using ActiveMQ.Commands;
+using ActiveMQ.OpenWire;
 using System;
 
 
 
 namespace ActiveMQ.Commands
 {
-	public abstract class BaseCommand : AbstractCommand
+    public abstract class BaseCommand : BaseDataStructure, Command
     {
+        private int commandId;
+        
+        public int CommandId
+        {
+            get { return commandId; }
+            set { this.commandId = value; }
+        }
+        
         
         public override int GetHashCode()
         {
@@ -43,6 +51,71 @@ namespace ActiveMQ.Commands
             return answer + ": id = " + CommandId;
         }
         
+        public static String GetDataStructureTypeAsString(int type)
+        {
+            String packetTypeStr = "";
+            switch (type)
+            {
+                case ActiveMQMessage.ID_ActiveMQMessage :
+                    packetTypeStr = "ACTIVEMQ_MESSAGE";
+                    break;
+                case ActiveMQTextMessage.ID_ActiveMQTextMessage :
+                    packetTypeStr = "ACTIVEMQ_TEXT_MESSAGE";
+                    break;
+                case ActiveMQObjectMessage.ID_ActiveMQObjectMessage:
+                    packetTypeStr = "ACTIVEMQ_OBJECT_MESSAGE";
+                    break;
+                case ActiveMQBytesMessage.ID_ActiveMQBytesMessage :
+                    packetTypeStr = "ACTIVEMQ_BYTES_MESSAGE";
+                    break;
+                case ActiveMQStreamMessage.ID_ActiveMQStreamMessage :
+                    packetTypeStr = "ACTIVEMQ_STREAM_MESSAGE";
+                    break;
+                case ActiveMQMapMessage.ID_ActiveMQMapMessage :
+                    packetTypeStr = "ACTIVEMQ_MAP_MESSAGE";
+                    break;
+                case MessageAck.ID_MessageAck :
+                    packetTypeStr = "ACTIVEMQ_MSG_ACK";
+                    break;
+                case Response.ID_Response :
+                    packetTypeStr = "RESPONSE";
+                    break;
+                case ConsumerInfo.ID_ConsumerInfo :
+                    packetTypeStr = "CONSUMER_INFO";
+                    break;
+                case ProducerInfo.ID_ProducerInfo :
+                    packetTypeStr = "PRODUCER_INFO";
+                    break;
+                case TransactionInfo.ID_TransactionInfo :
+                    packetTypeStr = "TRANSACTION_INFO";
+                    break;
+                case BrokerInfo.ID_BrokerInfo :
+                    packetTypeStr = "BROKER_INFO";
+                    break;
+                case ConnectionInfo.ID_ConnectionInfo :
+                    packetTypeStr = "CONNECTION_INFO";
+                    break;
+                case SessionInfo.ID_SessionInfo :
+                    packetTypeStr = "SESSION_INFO";
+                    break;
+                case RemoveSubscriptionInfo.ID_RemoveSubscriptionInfo :
+                    packetTypeStr = "DURABLE_UNSUBSCRIBE";
+                    break;
+                case IntegerResponse.ID_IntegerResponse :
+                    packetTypeStr = "INT_RESPONSE_RECEIPT_INFO";
+                    break;
+                case WireFormatInfo.ID_WireFormatInfo :
+                    packetTypeStr = "WIRE_FORMAT_INFO";
+                    break;
+                case RemoveInfo.ID_RemoveInfo :
+                    packetTypeStr = "REMOVE_INFO";
+                    break;
+                case KeepAliveInfo.ID_KeepAliveInfo :
+                    packetTypeStr = "KEEP_ALIVE";
+                    break;
+            }
+            return packetTypeStr;
+        }
         
     }
 }

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BaseDataStructure.cs

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using ActiveMQ.Commands;
+using System;
+using ActiveMQ.OpenWire;
+
+namespace ActiveMQ.Commands
+{
+    
+    /// <summary>
+    /// Base class for all DataStructure implementations
+    /// </summary>
+    public abstract class BaseDataStructure : DataStructure
+    {
+        private bool responseRequired;
+        
+        public virtual byte GetDataStructureType()
+        {
+            return 0;
+        }
+        
+        public bool ResponseRequired
+        {
+            get { return responseRequired; }
+            set { this.responseRequired = value; }
+        }
+        
+        public virtual bool IsMarshallAware()
+        {
+            return false;
+        }
+        
+        
+        public virtual void BeforeMarshall(OpenWireFormat wireFormat)
+        {
+        }
+        
+        public virtual void AfterMarshall(OpenWireFormat wireFormat)
+        {
+        }
+        
+        public virtual void BeforeUnmarshall(OpenWireFormat wireFormat)
+        {
+        }
+        
+        public virtual void AfterUnmarshall(OpenWireFormat wireFormat)
+        {
+        }
+        
+        public virtual void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data)
+        {
+        }
+        
+        public virtual byte[] GetMarshalledForm(OpenWireFormat wireFormat)
+        {
+            return null;
+        }
+        
+        // Helper methods
+        public int HashCode(object value)
+        {
+            if (value != null)
+            {
+                return value.GetHashCode();
+            }
+            else
+            {
+                return -1;
+            }
+        }
+    }
+}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ BrokerId Command
	/// </summary>
    public class BrokerId : AbstractCommand, DataStructure
    {
        public const byte ID_BrokerId = 124;
    			
        string value;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(Value);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is BrokerId) {
	    	    return Equals((BrokerId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(BrokerId that) {
            if (! Equals(this.Value, that.Value)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " Value=" + Value
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_BrokerId;
        }


        // Properties

        public string Value
        {
            get { return value; }
            set { this.value = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ BrokerId Command
	/// </summary>
    public class BrokerId : BaseDataStructure, DataStructure
    {
        public const byte ID_BrokerId = 124;
    			
        string value;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(Value);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is BrokerId) {
	    	    return Equals((BrokerId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(BrokerId that) {
            if (! Equals(this.Value, that.Value)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " Value=" + Value
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_BrokerId;
        }


        // Properties

        public string Value
        {
            get { return value; }
            set { this.value = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Command.cs

@@ -19,12 +19,12 @@ using ActiveMQ.Commands;
 namespace ActiveMQ.Commands
 {
     
-	/// <summary>
+    /// <summary>
-	/// An OpenWire command
+    /// An OpenWire command
-	/// </summary>
+    /// </summary>
-	public interface Command : DataStructure
+    public interface Command : DataStructure
     {
-        short CommandId
+        int CommandId
         {
             get;
             set;

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ ConnectionId Command
	/// </summary>
    public class ConnectionId : AbstractCommand, DataStructure
    {
        public const byte ID_ConnectionId = 120;
    			
        string value;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(Value);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is ConnectionId) {
	    	    return Equals((ConnectionId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(ConnectionId that) {
            if (! Equals(this.Value, that.Value)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " Value=" + Value
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_ConnectionId;
        }


        // Properties

        public string Value
        {
            get { return value; }
            set { this.value = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ ConnectionId Command
	/// </summary>
    public class ConnectionId : BaseDataStructure, DataStructure
    {
        public const byte ID_ConnectionId = 120;
    			
        string value;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(Value);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is ConnectionId) {
	    	    return Equals((ConnectionId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(ConnectionId that) {
            if (! Equals(this.Value, that.Value)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " Value=" + Value
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_ConnectionId;
        }


        // Properties

        public string Value
        {
            get { return value; }
            set { this.value = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ ConsumerId Command
	/// </summary>
    public class ConsumerId : AbstractCommand, DataStructure
    {
        public const byte ID_ConsumerId = 122;
    			
        string connectionId;
        long sessionId;
        long value;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(ConnectionId);
            answer = (answer * 37) + HashCode(SessionId);
            answer = (answer * 37) + HashCode(Value);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is ConsumerId) {
	    	    return Equals((ConsumerId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(ConsumerId that) {
            if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
            if (! Equals(this.SessionId, that.SessionId)) return false;
            if (! Equals(this.Value, that.Value)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " ConnectionId=" + ConnectionId
                + " SessionId=" + SessionId
                + " Value=" + Value
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_ConsumerId;
        }


        // Properties

        public string ConnectionId
        {
            get { return connectionId; }
            set { this.connectionId = value; }            
        }

        public long SessionId
        {
            get { return sessionId; }
            set { this.sessionId = value; }            
        }

        public long Value
        {
            get { return value; }
            set { this.value = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ ConsumerId Command
	/// </summary>
    public class ConsumerId : BaseDataStructure, DataStructure
    {
        public const byte ID_ConsumerId = 122;
    			
        string connectionId;
        long sessionId;
        long value;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(ConnectionId);
            answer = (answer * 37) + HashCode(SessionId);
            answer = (answer * 37) + HashCode(Value);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is ConsumerId) {
	    	    return Equals((ConsumerId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(ConsumerId that) {
            if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
            if (! Equals(this.SessionId, that.SessionId)) return false;
            if (! Equals(this.Value, that.Value)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " ConnectionId=" + ConnectionId
                + " SessionId=" + SessionId
                + " Value=" + Value
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_ConsumerId;
        }


        // Properties

        public string ConnectionId
        {
            get { return connectionId; }
            set { this.connectionId = value; }            
        }

        public long SessionId
        {
            get { return sessionId; }
            set { this.sessionId = value; }            
        }

        public long Value
        {
            get { return value; }
            set { this.value = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ DiscoveryEvent Command
	/// </summary>
    public class DiscoveryEvent : AbstractCommand, DataStructure
    {
        public const byte ID_DiscoveryEvent = 40;
    			
        string serviceName;
        string brokerName;

		public override string ToString() {
            return GetType().Name + "["
                + " ServiceName=" + ServiceName
                + " BrokerName=" + BrokerName
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_DiscoveryEvent;
        }


        // Properties

        public string ServiceName
        {
            get { return serviceName; }
            set { this.serviceName = value; }            
        }

        public string BrokerName
        {
            get { return brokerName; }
            set { this.brokerName = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ DiscoveryEvent Command
	/// </summary>
    public class DiscoveryEvent : BaseDataStructure, DataStructure
    {
        public const byte ID_DiscoveryEvent = 40;
    			
        string serviceName;
        string brokerName;

		public override string ToString() {
            return GetType().Name + "["
                + " ServiceName=" + ServiceName
                + " BrokerName=" + BrokerName
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_DiscoveryEvent;
        }


        // Properties

        public string ServiceName
        {
            get { return serviceName; }
            set { this.serviceName = value; }            
        }

        public string BrokerName
        {
            get { return brokerName; }
            set { this.brokerName = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ JournalQueueAck Command
	/// </summary>
    public class JournalQueueAck : AbstractCommand, DataStructure
    {
        public const byte ID_JournalQueueAck = 52;
    			
        ActiveMQDestination destination;
        MessageAck messageAck;

		public override string ToString() {
            return GetType().Name + "["
                + " Destination=" + Destination
                + " MessageAck=" + MessageAck
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_JournalQueueAck;
        }


        // Properties

        public ActiveMQDestination Destination
        {
            get { return destination; }
            set { this.destination = value; }            
        }

        public MessageAck MessageAck
        {
            get { return messageAck; }
            set { this.messageAck = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ JournalQueueAck Command
	/// </summary>
    public class JournalQueueAck : BaseDataStructure, DataStructure
    {
        public const byte ID_JournalQueueAck = 52;
    			
        ActiveMQDestination destination;
        MessageAck messageAck;

		public override string ToString() {
            return GetType().Name + "["
                + " Destination=" + Destination
                + " MessageAck=" + MessageAck
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_JournalQueueAck;
        }


        // Properties

        public ActiveMQDestination Destination
        {
            get { return destination; }
            set { this.destination = value; }            
        }

        public MessageAck MessageAck
        {
            get { return messageAck; }
            set { this.messageAck = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ JournalTopicAck Command
	/// </summary>
    public class JournalTopicAck : AbstractCommand, DataStructure
    {
        public const byte ID_JournalTopicAck = 50;
    			
        ActiveMQDestination destination;
        MessageId messageId;
        long messageSequenceId;
        string subscritionName;
        string clientId;
        TransactionId transactionId;

		public override string ToString() {
            return GetType().Name + "["
                + " Destination=" + Destination
                + " MessageId=" + MessageId
                + " MessageSequenceId=" + MessageSequenceId
                + " SubscritionName=" + SubscritionName
                + " ClientId=" + ClientId
                + " TransactionId=" + TransactionId
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_JournalTopicAck;
        }


        // Properties

        public ActiveMQDestination Destination
        {
            get { return destination; }
            set { this.destination = value; }            
        }

        public MessageId MessageId
        {
            get { return messageId; }
            set { this.messageId = value; }            
        }

        public long MessageSequenceId
        {
            get { return messageSequenceId; }
            set { this.messageSequenceId = value; }            
        }

        public string SubscritionName
        {
            get { return subscritionName; }
            set { this.subscritionName = value; }            
        }

        public string ClientId
        {
            get { return clientId; }
            set { this.clientId = value; }            
        }

        public TransactionId TransactionId
        {
            get { return transactionId; }
            set { this.transactionId = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ JournalTopicAck Command
	/// </summary>
    public class JournalTopicAck : BaseDataStructure, DataStructure
    {
        public const byte ID_JournalTopicAck = 50;
    			
        ActiveMQDestination destination;
        MessageId messageId;
        long messageSequenceId;
        string subscritionName;
        string clientId;
        TransactionId transactionId;

		public override string ToString() {
            return GetType().Name + "["
                + " Destination=" + Destination
                + " MessageId=" + MessageId
                + " MessageSequenceId=" + MessageSequenceId
                + " SubscritionName=" + SubscritionName
                + " ClientId=" + ClientId
                + " TransactionId=" + TransactionId
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_JournalTopicAck;
        }


        // Properties

        public ActiveMQDestination Destination
        {
            get { return destination; }
            set { this.destination = value; }            
        }

        public MessageId MessageId
        {
            get { return messageId; }
            set { this.messageId = value; }            
        }

        public long MessageSequenceId
        {
            get { return messageSequenceId; }
            set { this.messageSequenceId = value; }            
        }

        public string SubscritionName
        {
            get { return subscritionName; }
            set { this.subscritionName = value; }            
        }

        public string ClientId
        {
            get { return clientId; }
            set { this.clientId = value; }            
        }

        public TransactionId TransactionId
        {
            get { return transactionId; }
            set { this.transactionId = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ JournalTrace Command
	/// </summary>
    public class JournalTrace : AbstractCommand, DataStructure
    {
        public const byte ID_JournalTrace = 53;
    			
        string message;

		public override string ToString() {
            return GetType().Name + "["
                + " Message=" + Message
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_JournalTrace;
        }


        // Properties

        public string Message
        {
            get { return message; }
            set { this.message = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ JournalTrace Command
	/// </summary>
    public class JournalTrace : BaseDataStructure, DataStructure
    {
        public const byte ID_JournalTrace = 53;
    			
        string message;

		public override string ToString() {
            return GetType().Name + "["
                + " Message=" + Message
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_JournalTrace;
        }


        // Properties

        public string Message
        {
            get { return message; }
            set { this.message = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ JournalTransaction Command
	/// </summary>
    public class JournalTransaction : AbstractCommand, DataStructure
    {
        public const byte ID_JournalTransaction = 54;
    			
        TransactionId transactionId;
        byte type;
        bool wasPrepared;

		public override string ToString() {
            return GetType().Name + "["
                + " TransactionId=" + TransactionId
                + " Type=" + Type
                + " WasPrepared=" + WasPrepared
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_JournalTransaction;
        }


        // Properties

        public TransactionId TransactionId
        {
            get { return transactionId; }
            set { this.transactionId = value; }            
        }

        public byte Type
        {
            get { return type; }
            set { this.type = value; }            
        }

        public bool WasPrepared
        {
            get { return wasPrepared; }
            set { this.wasPrepared = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ JournalTransaction Command
	/// </summary>
    public class JournalTransaction : BaseDataStructure, DataStructure
    {
        public const byte ID_JournalTransaction = 54;
    			
        TransactionId transactionId;
        byte type;
        bool wasPrepared;

		public override string ToString() {
            return GetType().Name + "["
                + " TransactionId=" + TransactionId
                + " Type=" + Type
                + " WasPrepared=" + WasPrepared
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_JournalTransaction;
        }


        // Properties

        public TransactionId TransactionId
        {
            get { return transactionId; }
            set { this.transactionId = value; }            
        }

        public byte Type
        {
            get { return type; }
            set { this.type = value; }            
        }

        public bool WasPrepared
        {
            get { return wasPrepared; }
            set { this.wasPrepared = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs

@@ -1 +1,56 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ KeepAliveInfo Command
	/// </summary>
    public class KeepAliveInfo : AbstractCommand, Command
    {
        public const byte ID_KeepAliveInfo = 10;
    			

		public override string ToString() {
            return GetType().Name + "["
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_KeepAliveInfo;
        }


        // Properties

    }
}
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+//
+//  NOTE!: This file is autogenerated - do not modify!
+//         if you need to make a change, please see the Groovy scripts in the
+//         activemq-core module
+//
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+
+namespace ActiveMQ.Commands
+{
+    /// <summary>
+    ///  The ActiveMQ KeepAliveInfo Command
+    /// </summary>
+    public class KeepAliveInfo : BaseCommand, Command
+    {
+        public const byte ID_KeepAliveInfo = 10;
+                
+
+        public override string ToString() {
+            return GetType().Name + "["
+                + " ]";
+
+        }
+    
+
+
+        public override byte GetDataStructureType() {
+            return ID_KeepAliveInfo;
+        }
+
+
+        // Properties
+
+    }
+}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ MessageId Command
	/// </summary>
    public class MessageId : AbstractCommand, DataStructure
    {
        public const byte ID_MessageId = 110;
    			
        ProducerId producerId;
        long producerSequenceId;
        long brokerSequenceId;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(ProducerId);
            answer = (answer * 37) + HashCode(ProducerSequenceId);
            answer = (answer * 37) + HashCode(BrokerSequenceId);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is MessageId) {
	    	    return Equals((MessageId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(MessageId that) {
            if (! Equals(this.ProducerId, that.ProducerId)) return false;
            if (! Equals(this.ProducerSequenceId, that.ProducerSequenceId)) return false;
            if (! Equals(this.BrokerSequenceId, that.BrokerSequenceId)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " ProducerId=" + ProducerId
                + " ProducerSequenceId=" + ProducerSequenceId
                + " BrokerSequenceId=" + BrokerSequenceId
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_MessageId;
        }


        // Properties

        public ProducerId ProducerId
        {
            get { return producerId; }
            set { this.producerId = value; }            
        }

        public long ProducerSequenceId
        {
            get { return producerSequenceId; }
            set { this.producerSequenceId = value; }            
        }

        public long BrokerSequenceId
        {
            get { return brokerSequenceId; }
            set { this.brokerSequenceId = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ MessageId Command
	/// </summary>
    public class MessageId : BaseDataStructure, DataStructure
    {
        public const byte ID_MessageId = 110;
    			
        ProducerId producerId;
        long producerSequenceId;
        long brokerSequenceId;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(ProducerId);
            answer = (answer * 37) + HashCode(ProducerSequenceId);
            answer = (answer * 37) + HashCode(BrokerSequenceId);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is MessageId) {
	    	    return Equals((MessageId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(MessageId that) {
            if (! Equals(this.ProducerId, that.ProducerId)) return false;
            if (! Equals(this.ProducerSequenceId, that.ProducerSequenceId)) return false;
            if (! Equals(this.BrokerSequenceId, that.BrokerSequenceId)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " ProducerId=" + ProducerId
                + " ProducerSequenceId=" + ProducerSequenceId
                + " BrokerSequenceId=" + BrokerSequenceId
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_MessageId;
        }


        // Properties

        public ProducerId ProducerId
        {
            get { return producerId; }
            set { this.producerId = value; }            
        }

        public long ProducerSequenceId
        {
            get { return producerSequenceId; }
            set { this.producerSequenceId = value; }            
        }

        public long BrokerSequenceId
        {
            get { return brokerSequenceId; }
            set { this.brokerSequenceId = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ NetworkBridgeFilter Command
	/// </summary>
    public class NetworkBridgeFilter : AbstractCommand, DataStructure, BooleanExpression
    {
        public const byte ID_NetworkBridgeFilter = 91;
    			
        int networkTTL;
        BrokerId networkBrokerId;

		public override string ToString() {
            return GetType().Name + "["
                + " NetworkTTL=" + NetworkTTL
                + " NetworkBrokerId=" + NetworkBrokerId
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_NetworkBridgeFilter;
        }


        // Properties

        public int NetworkTTL
        {
            get { return networkTTL; }
            set { this.networkTTL = value; }            
        }

        public BrokerId NetworkBrokerId
        {
            get { return networkBrokerId; }
            set { this.networkBrokerId = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ NetworkBridgeFilter Command
	/// </summary>
    public class NetworkBridgeFilter : BaseDataStructure, DataStructure, BooleanExpression
    {
        public const byte ID_NetworkBridgeFilter = 91;
    			
        int networkTTL;
        BrokerId networkBrokerId;

		public override string ToString() {
            return GetType().Name + "["
                + " NetworkTTL=" + NetworkTTL
                + " NetworkBrokerId=" + NetworkBrokerId
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_NetworkBridgeFilter;
        }


        // Properties

        public int NetworkTTL
        {
            get { return networkTTL; }
            set { this.networkTTL = value; }            
        }

        public BrokerId NetworkBrokerId
        {
            get { return networkBrokerId; }
            set { this.networkBrokerId = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/PartialCommand.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ PartialCommand Command
	/// </summary>
    public class PartialCommand : AbstractCommand, Command
    {
        public const byte ID_PartialCommand = 60;
    			
        int commandId;
        byte[] data;

		public override string ToString() {
            return GetType().Name + "["
                + " CommandId=" + CommandId
                + " Data=" + Data
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_PartialCommand;
        }


        // Properties

        public int CommandId
        {
            get { return commandId; }
            set { this.commandId = value; }            
        }

        public byte[] Data
        {
            get { return data; }
            set { this.data = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ PartialCommand Command
	/// </summary>
    public class PartialCommand : BaseDataStructure, Command
    {
        public const byte ID_PartialCommand = 60;
    			
        int commandId;
        byte[] data;

		public override string ToString() {
            return GetType().Name + "["
                + " CommandId=" + CommandId
                + " Data=" + Data
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_PartialCommand;
        }


        // Properties

        public int CommandId
        {
            get { return commandId; }
            set { this.commandId = value; }            
        }

        public byte[] Data
        {
            get { return data; }
            set { this.data = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ ProducerId Command
	/// </summary>
    public class ProducerId : AbstractCommand, DataStructure
    {
        public const byte ID_ProducerId = 123;
    			
        string connectionId;
        long value;
        long sessionId;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(ConnectionId);
            answer = (answer * 37) + HashCode(Value);
            answer = (answer * 37) + HashCode(SessionId);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is ProducerId) {
	    	    return Equals((ProducerId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(ProducerId that) {
            if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
            if (! Equals(this.Value, that.Value)) return false;
            if (! Equals(this.SessionId, that.SessionId)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " ConnectionId=" + ConnectionId
                + " Value=" + Value
                + " SessionId=" + SessionId
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_ProducerId;
        }


        // Properties

        public string ConnectionId
        {
            get { return connectionId; }
            set { this.connectionId = value; }            
        }

        public long Value
        {
            get { return value; }
            set { this.value = value; }            
        }

        public long SessionId
        {
            get { return sessionId; }
            set { this.sessionId = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ ProducerId Command
	/// </summary>
    public class ProducerId : BaseDataStructure, DataStructure
    {
        public const byte ID_ProducerId = 123;
    			
        string connectionId;
        long value;
        long sessionId;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(ConnectionId);
            answer = (answer * 37) + HashCode(Value);
            answer = (answer * 37) + HashCode(SessionId);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is ProducerId) {
	    	    return Equals((ProducerId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(ProducerId that) {
            if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
            if (! Equals(this.Value, that.Value)) return false;
            if (! Equals(this.SessionId, that.SessionId)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " ConnectionId=" + ConnectionId
                + " Value=" + Value
                + " SessionId=" + SessionId
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_ProducerId;
        }


        // Properties

        public string ConnectionId
        {
            get { return connectionId; }
            set { this.connectionId = value; }            
        }

        public long Value
        {
            get { return value; }
            set { this.value = value; }            
        }

        public long SessionId
        {
            get { return sessionId; }
            set { this.sessionId = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ SessionId Command
	/// </summary>
    public class SessionId : AbstractCommand, DataStructure
    {
        public const byte ID_SessionId = 121;
    			
        string connectionId;
        long value;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(ConnectionId);
            answer = (answer * 37) + HashCode(Value);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is SessionId) {
	    	    return Equals((SessionId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(SessionId that) {
            if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
            if (! Equals(this.Value, that.Value)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " ConnectionId=" + ConnectionId
                + " Value=" + Value
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_SessionId;
        }


        // Properties

        public string ConnectionId
        {
            get { return connectionId; }
            set { this.connectionId = value; }            
        }

        public long Value
        {
            get { return value; }
            set { this.value = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ SessionId Command
	/// </summary>
    public class SessionId : BaseDataStructure, DataStructure
    {
        public const byte ID_SessionId = 121;
    			
        string connectionId;
        long value;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(ConnectionId);
            answer = (answer * 37) + HashCode(Value);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is SessionId) {
	    	    return Equals((SessionId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(SessionId that) {
            if (! Equals(this.ConnectionId, that.ConnectionId)) return false;
            if (! Equals(this.Value, that.Value)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " ConnectionId=" + ConnectionId
                + " Value=" + Value
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_SessionId;
        }


        // Properties

        public string ConnectionId
        {
            get { return connectionId; }
            set { this.connectionId = value; }            
        }

        public long Value
        {
            get { return value; }
            set { this.value = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ SubscriptionInfo Command
	/// </summary>
    public class SubscriptionInfo : AbstractCommand, DataStructure
    {
        public const byte ID_SubscriptionInfo = 55;
    			
        string clientId;
        ActiveMQDestination destination;
        string selector;
        string subcriptionName;

		public override string ToString() {
            return GetType().Name + "["
                + " ClientId=" + ClientId
                + " Destination=" + Destination
                + " Selector=" + Selector
                + " SubcriptionName=" + SubcriptionName
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_SubscriptionInfo;
        }


        // Properties

        public string ClientId
        {
            get { return clientId; }
            set { this.clientId = value; }            
        }

        public ActiveMQDestination Destination
        {
            get { return destination; }
            set { this.destination = value; }            
        }

        public string Selector
        {
            get { return selector; }
            set { this.selector = value; }            
        }

        public string SubcriptionName
        {
            get { return subcriptionName; }
            set { this.subcriptionName = value; }            
        }

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ SubscriptionInfo Command
	/// </summary>
    public class SubscriptionInfo : BaseDataStructure, DataStructure
    {
        public const byte ID_SubscriptionInfo = 55;
    			
        string clientId;
        ActiveMQDestination destination;
        string selector;
        string subcriptionName;

		public override string ToString() {
            return GetType().Name + "["
                + " ClientId=" + ClientId
                + " Destination=" + Destination
                + " Selector=" + Selector
                + " SubcriptionName=" + SubcriptionName
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_SubscriptionInfo;
        }


        // Properties

        public string ClientId
        {
            get { return clientId; }
            set { this.clientId = value; }            
        }

        public ActiveMQDestination Destination
        {
            get { return destination; }
            set { this.destination = value; }            
        }

        public string Selector
        {
            get { return selector; }
            set { this.selector = value; }            
        }

        public string SubcriptionName
        {
            get { return subcriptionName; }
            set { this.subcriptionName = value; }            
        }

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs

@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ TransactionId Command
	/// </summary>
    public class TransactionId : AbstractCommand, DataStructure
    {
        public const byte ID_TransactionId = 0;
    			

		public override int GetHashCode() {
            int answer = 0;
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is TransactionId) {
	    	    return Equals((TransactionId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(TransactionId that) {
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_TransactionId;
        }


        // Properties

    }
}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

//
//  NOTE!: This file is autogenerated - do not modify!
//         if you need to make a change, please see the Groovy scripts in the
//         activemq-core module
//

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
	/// <summary>
    ///  The ActiveMQ TransactionId Command
	/// </summary>
    public class TransactionId : BaseDataStructure, DataStructure
    {
        public const byte ID_TransactionId = 0;
    			

		public override int GetHashCode() {
            int answer = 0;
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is TransactionId) {
	    	    return Equals((TransactionId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(TransactionId that) {
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_TransactionId;
        }


        // Properties

    }
}

activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs

@@ -24,18 +24,18 @@ namespace ActiveMQ.Commands
     //  Marshalling code for Open Wire Format for WireFormatInfo
     //
     //
-    public class WireFormatInfo : AbstractCommand, Command, MarshallAware
+    public class WireFormatInfo : BaseCommand, Command, MarshallAware
     {
         public const byte ID_WireFormatInfo = 1;
-		static private byte[] MAGIC = new byte[] {
+        static private byte[] MAGIC = new byte[] {
-			'A'&0xFF,
+            'A'&0xFF,
-			'c'&0xFF,
+            'c'&0xFF,
-			't'&0xFF,
+            't'&0xFF,
-			'i'&0xFF,
+            'i'&0xFF,
-			'v'&0xFF,
+            'v'&0xFF,
-			'e'&0xFF,
+            'e'&0xFF,
-			'M'&0xFF,
+            'M'&0xFF,
-			'Q'&0xFF };
+            'Q'&0xFF };
         
         byte[] magic = MAGIC;
         int version;
@@ -44,14 +44,14 @@ namespace ActiveMQ.Commands
         protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper();
         private PrimitiveMap properties;
         
-		public override string ToString() {
+        public override string ToString() {
             return GetType().Name + "["
                 + " Magic=" + Magic
                 + " Version=" + Version
                 + " MarshalledProperties=" + MarshalledProperties
                 + " ]";
 
-		}
+        }
     
         public override byte GetDataStructureType() {
             return ID_WireFormatInfo;
@@ -77,7 +77,7 @@ namespace ActiveMQ.Commands
             set { this.marshalledProperties = value; }
         }
         
-		public IPrimitiveMap Properties
+        public IPrimitiveMap Properties
         {
             get {
                 if (properties == null)
@@ -114,7 +114,7 @@ namespace ActiveMQ.Commands
             set { Properties["CacheEnabled"] = value; }
         }
         
-		// MarshallAware interface
+        // MarshallAware interface
         public override bool IsMarshallAware()
         {
             return true;

activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs

@@ -205,34 +205,34 @@ namespace ActiveMQ.OpenWire
             {
                 int strlen = value.Length;
                 
-				int utflen = 0;
+                int utflen = 0;
-				int c = 0;
+                int c = 0;
-				bool isOnlyAscii = true;
+                bool isOnlyAscii = true;
-				char[] charr = value.ToCharArray();
+                char[] charr = value.ToCharArray();
-				for (int i = 0; i < strlen; i++)
+                for (int i = 0; i < strlen; i++)
-				{
+                {
-					c = charr[i];
+                    c = charr[i];
-					if ((c >= 0x0001) && (c <= 0x007F))
+                    if ((c >= 0x0001) && (c <= 0x007F))
-					{
+                    {
-						utflen++;
+                        utflen++;
-					}
+                    }
-					else if (c > 0x07FF)
+                    else if (c > 0x07FF)
-					{
+                    {
-						utflen += 3;
+                        utflen += 3;
-						isOnlyAscii = false;
+                        isOnlyAscii = false;
-					}
+                    }
-					else
+                    else
-					{
+                    {
-						isOnlyAscii = false;
+                        isOnlyAscii = false;
-						utflen += 2;
+                        utflen += 2;
-					}
+                    }
-				}
+                }
                 
-				if (utflen >= Int16.MaxValue)
+                if (utflen >= Int16.MaxValue)
-					throw new IOException("Encountered a String value that is too long to encode.");
+                    throw new IOException("Encountered a String value that is too long to encode.");
                 
-				bs.WriteBoolean(isOnlyAscii);
+                bs.WriteBoolean(isOnlyAscii);
-				return utflen + 2;
+                return utflen + 2;
             }
             else
             {
@@ -560,7 +560,7 @@ namespace ActiveMQ.OpenWire
         {
             if (dataIn.ReadBoolean())
             {
-				return dataIn.ReadString();
+                return dataIn.ReadString();
             }
             else
             {
@@ -574,7 +574,7 @@ namespace ActiveMQ.OpenWire
             dataOut.Write(value != null);
             if (value != null)
             {
-				dataOut.Write(value);
+                dataOut.Write(value);
             }
         }
                 
@@ -583,12 +583,12 @@ namespace ActiveMQ.OpenWire
             long o,
             BinaryWriter dataOut)
         {
-			dataOut.Write(o);
+            dataOut.Write(o);
         }
         
         public virtual long LooseUnmarshalLong(OpenWireFormat wireFormat, BinaryReader dataIn)
         {
-			return dataIn.ReadInt64();
+            return dataIn.ReadInt64();
         }
                 
         protected virtual void LooseMarshalObjectArray(
@@ -596,7 +596,7 @@ namespace ActiveMQ.OpenWire
             DataStructure[] objects,
             BinaryWriter dataOut)
         {
-			dataOut.Write(objects!=null);
+            dataOut.Write(objects!=null);
             if (objects!=null)
             {
                 dataOut.Write((short) objects.Length);
@@ -646,7 +646,7 @@ namespace ActiveMQ.OpenWire
             BrokerError o,
             BinaryWriter dataOut)
         {
-			dataOut.Write(o!=null);
+            dataOut.Write(o!=null);
             if (o!=null)
             {
                 LooseMarshalString(o.ExceptionClass, dataOut);
@@ -669,7 +669,7 @@ namespace ActiveMQ.OpenWire
             }
         }
         
-		protected virtual byte[] ReadBytes(BinaryReader dataIn, bool flag)
+        protected virtual byte[] ReadBytes(BinaryReader dataIn, bool flag)
         {
             if (flag)
             {
@@ -699,7 +699,7 @@ namespace ActiveMQ.OpenWire
             dataOut.Write(command);
         }
         
-		protected virtual String ReadAsciiString(BinaryReader dataIn)
+        protected virtual String ReadAsciiString(BinaryReader dataIn)
         {
             int size = dataIn.ReadInt16();
             byte[] data = new byte[size];
@@ -729,6 +729,7 @@ namespace ActiveMQ.OpenWire
                 return memoryStream.GetBuffer();
             }
         }
+        
         public static void MarshalPrimitiveMap(IDictionary map, BinaryWriter dataOut)
         {
             if (map == null)

activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs

@@ -2,15 +2,15 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
-// <autogenerated>
+//  <autogenerated>
-//     This code was generated by a tool.
+//      This code was generated by a tool.
-//     Runtime Version: 1.1.4322.2032
+//      Mono Runtime Version: 1.1.4322.2032
 // 
-//     Changes to this file may cause incorrect behavior and will be lost if 
+//      Changes to this file may cause incorrect behavior and will be lost if 
-//     the code is regenerated.
+//      the code is regenerated.
-// </autogenerated>
+//  </autogenerated>
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 [assembly: ComVisibleAttribute(false)]
 [assembly: CLSCompliantAttribute(true)]
@@ -22,6 +22,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2006 Apache Software Foundation")]
 [assembly: AssemblyTrademarkAttribute("")]
 [assembly: AssemblyCultureAttribute("")]
-[assembly: AssemblyVersionAttribute("4.0.2259.0")]
+[assembly: AssemblyVersionAttribute("4.0.2266.0")]
 [assembly: AssemblyInformationalVersionAttribute("4.0")]
 

activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/EndianTest.cs

@@ -21,7 +21,7 @@ using System.IO;
 
 namespace ActiveMQ.OpenWire
 {
-	[TestFixture]
+    [TestFixture]
     public class EndianTest
     {
         
@@ -47,6 +47,16 @@ namespace ActiveMQ.OpenWire
             Assert.AreEqual(value, actual);
         }
         
+        [Test]
+        public void TestCharEndian()
+        {
+            char value = 'J';
+            char newValue = EndianSupport.SwitchEndian(value);
+            Console.WriteLine("New value: " + newValue);
+            char actual = EndianSupport.SwitchEndian(newValue);
+            Assert.AreEqual(value, actual);
+        }
+
         [Test]
         public void TestShortEndian()
         {
@@ -88,41 +98,41 @@ namespace ActiveMQ.OpenWire
             Assert.AreEqual(value, actual);
         }
         
-		[Test]
+        [Test]
         public void TestFloatDontNeedEndianSwitch()
         {
             float value = -1.223F;
             Console.WriteLine("value: " + value);
             
-			// Convert to int so we can compare to Java version.
+            // Convert to int so we can compare to Java version.
-			MemoryStream ms = new MemoryStream(4);
+            MemoryStream ms = new MemoryStream(4);
-			BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter bw = new BinaryWriter(ms);
-			bw.Write(value);
+            bw.Write(value);
-			bw.Close();
+            bw.Close();
-			ms = new MemoryStream(ms.ToArray());
+            ms = new MemoryStream(ms.ToArray());
-			BinaryReader br = new BinaryReader(ms);
+            BinaryReader br = new BinaryReader(ms);
                         
-			// System.out.println(Integer.toString(Float.floatToIntBits(-1.223F), 16));
+            // System.out.println(Integer.toString(Float.floatToIntBits(-1.223F), 16));
             Assert.AreEqual(-0x406374bc, br.ReadInt32());
             
         }
         
-		[Test]
+        [Test]
         public void TestDoublDontNeedEndianSwitch()
         {
             double value = -1.223D;
             Console.WriteLine("New value: " + value);
             
-			// Convert to int so we can compare to Java version.
+            // Convert to int so we can compare to Java version.
-			MemoryStream ms = new MemoryStream(4);
+            MemoryStream ms = new MemoryStream(4);
-			BinaryWriter bw = new BinaryWriter(ms);
+            BinaryWriter bw = new BinaryWriter(ms);
-			bw.Write(value);
+            bw.Write(value);
-			bw.Close();
+            bw.Close();
-			ms = new MemoryStream(ms.ToArray());
+            ms = new MemoryStream(ms.ToArray());
-			BinaryReader br = new BinaryReader(ms);
+            BinaryReader br = new BinaryReader(ms);
-			long longVersion = br.ReadInt64();
+            long longVersion = br.ReadInt64();
             
-			// System.out.println(Long.toString(Double.doubleToLongBits(-1.223D), 16));
+            // System.out.println(Long.toString(Double.doubleToLongBits(-1.223D), 16));
             Assert.AreEqual(-0x400c6e978d4fdf3b, longVersion);
         }
     }

activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs

@@ -2,15 +2,15 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
-// <autogenerated>
+//  <autogenerated>
-//     This code was generated by a tool.
+//      This code was generated by a tool.
-//     Runtime Version: 1.1.4322.2032
+//      Mono Runtime Version: 1.1.4322.2032
 // 
-//     Changes to this file may cause incorrect behavior and will be lost if 
+//      Changes to this file may cause incorrect behavior and will be lost if 
-//     the code is regenerated.
+//      the code is regenerated.
-// </autogenerated>
+//  </autogenerated>
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 [assembly: ComVisibleAttribute(false)]
 [assembly: CLSCompliantAttribute(false)]
@@ -22,6 +22,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2006 Apache Software Foundation")]
 [assembly: AssemblyTrademarkAttribute("")]
 [assembly: AssemblyCultureAttribute("")]
-[assembly: AssemblyVersionAttribute("4.0.2259.0")]
+[assembly: AssemblyVersionAttribute("4.0.2266.0")]
 [assembly: AssemblyInformationalVersionAttribute("4.0")]
 

activemq-dotnet/src/test/csharp/NMS/JMSPropertyTest.cs

@@ -23,7 +23,7 @@ using System;
 
 namespace NMS
 {
-	[ TestFixture ]
+    [ TestFixture ]
     public class JMSPropertyTest : JMSTestSupport
     {
         // standard JMS properties
@@ -45,16 +45,16 @@ namespace NMS
         long custom5 = 0x1234567812345678;
         char custom6 = 'J';
         
-		[SetUp]
+        [SetUp]
         override public void SetUp()
         {
-			base.SetUp();
+            base.SetUp();
         }
         
         [TearDown]
         override public void TearDown()
         {
-			base.TearDown();
+            base.TearDown();
         }
         
         [ Test ]
@@ -116,14 +116,18 @@ namespace NMS
             Assert.AreEqual(custom4, message.Properties["custom4"], "custom4");
             // TODO
             Assert.AreEqual(custom5, message.Properties["custom5"], "custom5");
-            Assert.AreEqual(custom6, message.Properties["custom6"], "custom6");
+            Object value6 = message.Properties["custom6"];
+            Object expected6 = custom6;
+            Console.WriteLine("actual type is: " + value6.GetType() + " value: " + value6);
+            Console.WriteLine("expected type is: " + expected6.GetType() + " value: " + expected6);
+            Assert.AreEqual(custom6, value6, "custom6 which is of type: " + value6.GetType());
             
             Assert.AreEqual(custom1, message.Properties.GetBool("custom1"), "custom1");
             Assert.AreEqual(custom2, message.Properties.GetByte("custom2"), "custom2");
             Assert.AreEqual(custom3, message.Properties.GetShort("custom3"), "custom3");
             Assert.AreEqual(custom4, message.Properties.GetInt("custom4"), "custom4");
             Assert.AreEqual(custom5, message.Properties.GetLong("custom5"), "custom5");
-            Assert.AreEqual(custom6, message.Properties.GetChar("custom6"), "custom6");
+            //Assert.AreEqual(custom6, message.Properties.GetChar("custom6"), "custom6");
             
             // lets now look at some standard JMS headers
             Console.WriteLine("JMSExpiration: " + message.NMSExpiration);