Some more refactors:

Moving the jms type interfaces to the JMS namespace, hopefully this will be come a standardized set of interfaces
 for dotnet in the furture.



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

openwire-dotnet/src/ActiveMQ/BrokerException.cs

@@ -1,53 +0,0 @@
-/*
- * 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 System;
-using System.Collections;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
-
-namespace ActiveMQ
-{
-    /// <summary>
-    /// Exception thrown when the broker returns an error
-    /// </summary>
-    public class BrokerException : OpenWireException
-    {
-        
-        private BrokerError brokerError;
-        
-        public BrokerException(BrokerError brokerError) : base(
-            brokerError.ExceptionClass + " : " + brokerError.Message)
-        {
-            this.brokerError = brokerError;
-        }
-        
-        public BrokerError BrokerError {
-            get {
-                return brokerError;
-            }
-        }
-        
-        public virtual string JavaStackTrace
-        {
-            get {
-                return brokerError.StackTrace;
-            }
-        }
-        
-    }
-}

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQBytesMessage.cs

@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using System;
-using System.Collections;
+using ActiveMQ.Commands;
+using JMS;
 
-using ActiveMQ;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
 	public class ActiveMQBytesMessage : ActiveMQMessage, IBytesMessage
     {
@@ -32,3 +31,4 @@ namespace ActiveMQ.OpenWire.Commands
         }
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs

@@ -14,14 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ;
+using ActiveMQ.Commands;
+using ActiveMQ.OpenWire;
+using JMS;
 using System;
 
-namespace ActiveMQ.OpenWire.Commands
-{
 
-    /// <summary>
-    /// Summary description for ActiveMQDestination.
-    /// </summary>
+
+/// <summary>
+/// Summary description for ActiveMQDestination.
+/// </summary>
+namespace ActiveMQ.Commands
+{
 	public abstract class ActiveMQDestination : AbstractCommand, IDestination
     {
         
@@ -524,3 +529,4 @@ namespace ActiveMQ.OpenWire.Commands
         public abstract ActiveMQDestination CreateDestination(String name);
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMapMessage.cs

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using System;
-using System.Collections;
-
-using ActiveMQ;
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
+using JMS;
+using System;
 
-namespace ActiveMQ.OpenWire.Commands
+
+namespace ActiveMQ.Commands
 {
 	public class ActiveMQMapMessage : ActiveMQMessage, IMapMessage
     {
@@ -63,3 +63,4 @@ namespace ActiveMQ.OpenWire.Commands
         
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs

@@ -14,13 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using System;
-using System.Collections;
+using ActiveMQ;
+using ActiveMQ.Commands;
+using ActiveMQ.OpenWire;
+using JMS;
 
-namespace ActiveMQ.OpenWire.Commands
+
+namespace ActiveMQ.Commands
 {
 	public delegate void AcknowledgeHandler(ActiveMQMessage message);
+}
 
+namespace ActiveMQ.Commands
+{
 	public class ActiveMQMessage : Message, IMessage, MarshallAware
     {
         public const byte ID_ActiveMQMessage = 23;
@@ -47,9 +53,12 @@ namespace ActiveMQ.OpenWire.Commands
         
         public void Acknowledge()
         {
-            if (Acknowledger == null){
-                throw new OpenWireException("No Acknowledger has been associated with this message: " + this);}
-            else {
+            if (Acknowledger == null)
+			{
+                throw new OpenWireException("No Acknowledger has been associated with this message: " + this);
+			}
+            else
+			{
                 Acknowledger(this);
             }
         }
@@ -306,3 +315,4 @@ namespace ActiveMQ.OpenWire.Commands
         
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQObjectMessage.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ActiveMQObjectMessage

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQQueue.cs

@@ -14,13 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
+using JMS;
 using System;
 
-namespace ActiveMQ.OpenWire.Commands
+
+/// <summary>
+/// Summary description for ActiveMQQueue.
+/// </summary>
+namespace ActiveMQ.Commands
 {
-    /// <summary>
-    /// Summary description for ActiveMQQueue.
-    /// </summary>
 	public class ActiveMQQueue : ActiveMQDestination, IQueue
     {
         public const byte ID_ActiveMQQueue = 100;
@@ -53,3 +56,4 @@ namespace ActiveMQ.OpenWire.Commands
         }
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQStreamMessage.cs

@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using System;
-using System.Collections;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+
+namespace ActiveMQ.Commands
 {
 	public class ActiveMQStreamMessage : ActiveMQMessage
     {
@@ -31,7 +31,8 @@ namespace ActiveMQ.OpenWire.Commands
         // TODO generate ToString method
 		
 		
-        public override byte GetDataStructureType() {
+        public override byte GetDataStructureType()
+		{
             return ID_ActiveMQStreamMessage;
         }
 		
@@ -40,3 +41,4 @@ namespace ActiveMQ.OpenWire.Commands
 		
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempDestination.cs

@@ -15,19 +15,20 @@
  * limitations under the License.
  */
 
+using ActiveMQ.Commands;
 using System;
-using System.Collections;
 
-namespace ActiveMQ.OpenWire.Commands
+
+//
+//  Marshalling code for Open Wire Format for ActiveMQTempDestination
+//
+//
+//  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
+//
+namespace ActiveMQ.Commands
 {
-    //
-    //  Marshalling code for Open Wire Format for ActiveMQTempDestination
-    //
-    //
-    //  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
-    //
 	public abstract class ActiveMQTempDestination : ActiveMQDestination
     {
         public const byte ID_ActiveMQTempDestination = 0;
@@ -46,3 +47,4 @@ namespace ActiveMQ.OpenWire.Commands
         }
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempQueue.cs

@@ -14,13 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
+using JMS;
 using System;
 
-namespace ActiveMQ.OpenWire.Commands
+
+/// <summary>
+/// A Temporary Queue
+/// </summary>
+namespace ActiveMQ.Commands
 {
-    /// <summary>
-    /// A Temporary Queue
-    /// </summary>
 	public class ActiveMQTempQueue : ActiveMQTempDestination, ITemporaryQueue
     {
         public const byte ID_ActiveMQTempQueue = 102;
@@ -54,3 +57,4 @@ namespace ActiveMQ.OpenWire.Commands
         }
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempTopic.cs

@@ -14,13 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
+using JMS;
 using System;
 
-namespace ActiveMQ.OpenWire.Commands
+
+/// <summary>
+/// A Temporary Topic
+/// </summary>
+namespace ActiveMQ.Commands
 {
-    /// <summary>
-    /// A Temporary Topic
-    /// </summary>
 	public class ActiveMQTempTopic : ActiveMQTempDestination, ITemporaryTopic
     {
         public const byte ID_ActiveMQTempTopic = 103;
@@ -54,3 +57,4 @@ namespace ActiveMQ.OpenWire.Commands
         }
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTextMessage.cs

@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
+using JMS;
 using System;
-using System.Collections;
 
-namespace ActiveMQ.OpenWire.Commands
+
+namespace ActiveMQ.Commands
 {
 	public class ActiveMQTextMessage : ActiveMQMessage, ITextMessage
     {
@@ -89,3 +91,4 @@ namespace ActiveMQ.OpenWire.Commands
         }
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTopic.cs

@@ -14,13 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
+using JMS;
 using System;
 
-namespace ActiveMQ.OpenWire.Commands
+
+/// <summary>
+/// Summary description for ActiveMQTopic.
+/// </summary>
+namespace ActiveMQ.Commands
 {
-    /// <summary>
-    /// Summary description for ActiveMQTopic.
-    /// </summary>
 	public class ActiveMQTopic : ActiveMQDestination, ITopic
     {
         public const byte ID_ActiveMQTopic = 101;
@@ -53,3 +56,4 @@ namespace ActiveMQ.OpenWire.Commands
         }
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs

@@ -7,15 +7,14 @@
 //        activemq-openwire module
 //
 
-using System;
-using System.Collections;
-
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using System;
 
-namespace ActiveMQ.OpenWire.Commands
+
+
+namespace ActiveMQ.Commands
 {
-    
 	public abstract class BaseCommand : AbstractCommand
     {
         
@@ -48,3 +47,4 @@ namespace ActiveMQ.OpenWire.Commands
         
     }
 }
+

openwire-dotnet/src/ActiveMQ/Commands/BrokerId.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for BrokerId

openwire-dotnet/src/ActiveMQ/Commands/BrokerInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for BrokerInfo

openwire-dotnet/src/ActiveMQ/Commands/ConnectionError.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConnectionError

openwire-dotnet/src/ActiveMQ/Commands/ConnectionId.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConnectionId

openwire-dotnet/src/ActiveMQ/Commands/ConnectionInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConnectionInfo

openwire-dotnet/src/ActiveMQ/Commands/ConsumerId.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConsumerId

openwire-dotnet/src/ActiveMQ/Commands/ConsumerInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConsumerInfo

openwire-dotnet/src/ActiveMQ/Commands/ControlCommand.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ControlCommand

openwire-dotnet/src/ActiveMQ/Commands/DataArrayResponse.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DataArrayResponse

openwire-dotnet/src/ActiveMQ/Commands/DataResponse.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DataResponse

openwire-dotnet/src/ActiveMQ/Commands/DestinationInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DestinationInfo

openwire-dotnet/src/ActiveMQ/Commands/DiscoveryEvent.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DiscoveryEvent

openwire-dotnet/src/ActiveMQ/Commands/ExceptionResponse.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ExceptionResponse

openwire-dotnet/src/ActiveMQ/Commands/FlushCommand.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for FlushCommand

openwire-dotnet/src/ActiveMQ/Commands/IntegerResponse.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for IntegerResponse

openwire-dotnet/src/ActiveMQ/Commands/JournalQueueAck.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalQueueAck

openwire-dotnet/src/ActiveMQ/Commands/JournalTopicAck.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalTopicAck

openwire-dotnet/src/ActiveMQ/Commands/JournalTrace.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalTrace

openwire-dotnet/src/ActiveMQ/Commands/JournalTransaction.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalTransaction

openwire-dotnet/src/ActiveMQ/Commands/KeepAliveInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for KeepAliveInfo

openwire-dotnet/src/ActiveMQ/Commands/LocalTransactionId.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for LocalTransactionId

openwire-dotnet/src/ActiveMQ/Commands/Message.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for Message

openwire-dotnet/src/ActiveMQ/Commands/MessageAck.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageAck

openwire-dotnet/src/ActiveMQ/Commands/MessageDispatch.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageDispatch

openwire-dotnet/src/ActiveMQ/Commands/MessageDispatchNotification.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageDispatchNotification

openwire-dotnet/src/ActiveMQ/Commands/MessageId.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageId

openwire-dotnet/src/ActiveMQ/Commands/ProducerId.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ProducerId

openwire-dotnet/src/ActiveMQ/Commands/ProducerInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ProducerInfo

openwire-dotnet/src/ActiveMQ/Commands/RemoveInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for RemoveInfo

openwire-dotnet/src/ActiveMQ/Commands/RemoveSubscriptionInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for RemoveSubscriptionInfo

openwire-dotnet/src/ActiveMQ/Commands/Response.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for Response

openwire-dotnet/src/ActiveMQ/Commands/SessionId.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for SessionId

openwire-dotnet/src/ActiveMQ/Commands/SessionInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for SessionInfo

openwire-dotnet/src/ActiveMQ/Commands/ShutdownInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ShutdownInfo

openwire-dotnet/src/ActiveMQ/Commands/SubscriptionInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for SubscriptionInfo

openwire-dotnet/src/ActiveMQ/Commands/TransactionId.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for TransactionId

openwire-dotnet/src/ActiveMQ/Commands/TransactionInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for TransactionInfo

openwire-dotnet/src/ActiveMQ/Commands/WireFormatInfo.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for WireFormatInfo

openwire-dotnet/src/ActiveMQ/Commands/XATransactionId.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
 
-namespace ActiveMQ.OpenWire.Commands
+namespace ActiveMQ.Commands
 {
     //
     //  Marshalling code for Open Wire Format for XATransactionId

openwire-dotnet/src/ActiveMQ/Connection.cs

@@ -1,9 +1,9 @@
+using ActiveMQ.Commands;
+using ActiveMQ.OpenWire;
+using ActiveMQ.Transport;
+using JMS;
 using System;
 using System.Collections;
-using System.Threading;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 
 namespace ActiveMQ
 {

openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs

@@ -18,7 +18,6 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 
 namespace ActiveMQ
 {

openwire-dotnet/src/ActiveMQ/ConnectionFactory.cs

@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
+using ActiveMQ.Transport;
+using JMS;
 using System;
-using System.Collections;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 
 namespace ActiveMQ
 {

openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs

@@ -18,7 +18,6 @@ using System;
 using System.Collections;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 
 namespace ActiveMQ
 {

openwire-dotnet/src/ActiveMQ/DestinationFilter.cs

@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
 using System;
 
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
-
 namespace ActiveMQ
 {
 	/// <summary>

openwire-dotnet/src/ActiveMQ/MessageConsumer.cs

@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using System;
-using System.Collections;
-using System.Threading;
-
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using JMS;
+using System.Threading;
 
 namespace ActiveMQ
 {

openwire-dotnet/src/ActiveMQ/MessageProducer.cs

@@ -14,10 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using System;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.Commands;
+using JMS;
 
 namespace ActiveMQ
 {

openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs

@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
 using System;
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 
 namespace ActiveMQ.OpenWire
 {

openwire-dotnet/src/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs

@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
 using System;
-using System.IO;
-using System.Net;
-using System.Text;
 using System.Collections;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
+using System.IO;
+using System.Text;
 
 namespace ActiveMQ.OpenWire
 

openwire-dotnet/src/ActiveMQ/OpenWire/BooleanStream.cs

@@ -18,7 +18,6 @@ using System;
 using System.IO;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 
 namespace ActiveMQ.OpenWire
 

openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs

@@ -17,7 +17,6 @@
 using System;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 
 namespace ActiveMQ.OpenWire
 {

openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs

@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using System.Collections;
+using ActiveMQ.Commands;
+using JMS;
 using System;
+using System.Collections;
 using System.Threading;
 
-using ActiveMQ.OpenWire.Commands;
-
 namespace ActiveMQ.OpenWire
 {
     /// <summary>

openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs

@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
 using System;
 using System.Threading;
 
-using ActiveMQ.OpenWire.Commands;
-
 namespace ActiveMQ.OpenWire
 {
     /// <summary>

openwire-dotnet/src/ActiveMQ/OpenWire/MessagePropertyHelper.cs

@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-using System;
+using ActiveMQ.Commands;
 using System.Collections;
 
-using ActiveMQ.OpenWire.Commands;
-
 namespace ActiveMQ.OpenWire
 {
     public delegate object PropertyGetter(ActiveMQMessage message);

openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireFormat.cs

@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+using ActiveMQ.Commands;
+using ActiveMQ.OpenWire.V1;
 using System;
 using System.IO;
 
-using ActiveMQ.OpenWire.Commands;
-using ActiveMQ.OpenWire.V1;
-
 namespace ActiveMQ.OpenWire
 {
     /// <summary>

openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs

@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
+using JMS;
 using System;
 using System.Collections;
 

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs

@@ -20,7 +20,6 @@ using System.Collections;
 using System.IO;
 
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1

openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs

@@ -19,8 +19,8 @@ using System;
 using System.Collections;
 using System.IO;
 
+using ActiveMQ.Commands;
 using ActiveMQ.OpenWire;
-using ActiveMQ.OpenWire.Commands;
 using ActiveMQ.OpenWire.V1;
 
 namespace ActiveMQ.OpenWire.V1