Get it to compile after refactor

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

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

@@ -17,10 +17,9 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     public class ActiveMQBytesMessage : ActiveMQMessage, IBytesMessage
     {

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

@@ -15,10 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     
     /// <summary>
@@ -427,7 +425,7 @@ namespace OpenWire.Client.Commands
             return physicalName.IndexOf(COMPOSITE_SEPARATOR) > 0;
         }
         
-        /**
+        /*
          * Returns a list of child destinations if this destination represents a composite
          * destination.
          *
@@ -470,7 +468,6 @@ namespace OpenWire.Client.Commands
         /**
          * @return hashCode for this instance
          */
-        
         public override int GetHashCode()
         {
             int answer = 37;
@@ -492,7 +489,6 @@ namespace OpenWire.Client.Commands
          * @param obj the object to compare
          * @return true if this instance and obj are equivalent
          */
-        
         public override bool Equals(Object obj)
         {
             bool result = this == obj;

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

@@ -17,10 +17,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ;
+using ActiveMQ.OpenWire;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     public class ActiveMQMapMessage : ActiveMQMessage, IMapMessage
     {

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

@@ -17,10 +17,7 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
-
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     public delegate void AcknowledgeHandler(ActiveMQMessage message);
     

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ActiveMQObjectMessage

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

@@ -15,11 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     /// <summary>
     /// Summary description for ActiveMQQueue.

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

@@ -17,10 +17,7 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
-
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     public class ActiveMQStreamMessage : ActiveMQMessage
     {

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

@@ -18,10 +18,7 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
-
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ActiveMQTempDestination

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

@@ -15,11 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     /// <summary>
     /// A Temporary Queue

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

@@ -15,11 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     /// <summary>
     /// A Temporary Topic

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

@@ -17,10 +17,7 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
-
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     public class ActiveMQTextMessage : ActiveMQMessage, ITextMessage
     {

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

@@ -15,11 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     /// <summary>
     /// Summary description for ActiveMQTopic.

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

@@ -10,10 +10,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     
     public abstract class BaseCommand : AbstractCommand

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for BrokerId

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for BrokerInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConnectionError

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConnectionId

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConnectionInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConsumerId

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConsumerInfo
@@ -39,6 +39,7 @@ namespace OpenWire.Client.Commands
         bool browser;
         ActiveMQDestination destination;
         int prefetchSize;
+        int maximumPendingMessageLimit;
         bool dispatchAsync;
         string selector;
         string subcriptionName;
@@ -55,6 +56,7 @@ namespace OpenWire.Client.Commands
                 + " Browser=" + Browser
                 + " Destination=" + Destination
                 + " PrefetchSize=" + PrefetchSize
+                + " MaximumPendingMessageLimit=" + MaximumPendingMessageLimit
                 + " DispatchAsync=" + DispatchAsync
                 + " Selector=" + Selector
                 + " SubcriptionName=" + SubcriptionName
@@ -101,6 +103,12 @@ namespace OpenWire.Client.Commands
             set { this.prefetchSize = value; }            
         }
 
+        public int MaximumPendingMessageLimit
+        {
+            get { return maximumPendingMessageLimit; }
+            set { this.maximumPendingMessageLimit = value; }            
+        }
+
         public bool DispatchAsync
         {
             get { return dispatchAsync; }

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ControlCommand

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DataArrayResponse

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DataResponse

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DestinationInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DiscoveryEvent

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ExceptionResponse

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for FlushCommand

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for IntegerResponse

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalQueueAck

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalTopicAck

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalTrace

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalTransaction

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for KeepAliveInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for LocalTransactionId

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for Message

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageAck

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageDispatch

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageDispatchNotification

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageId

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ProducerId

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ProducerInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for RemoveInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for RemoveSubscriptionInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for Response

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for SessionId

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for SessionInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ShutdownInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for SubscriptionInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for TransactionId

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for TransactionInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for WireFormatInfo

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

@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for XATransactionId