Get it to compile after refactor

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

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQBytesMessage

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQDestination

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQMapMessage

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQMessage

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQObjectMessage

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQQueue

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQStreamMessage

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQTempDestination

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQTempQueue

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQTempTopic

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQTextMessage

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ActiveMQTopic

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for BaseCommand

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for BrokerId

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for BrokerInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ConnectionError

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ConnectionId

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ConnectionInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ConsumerId

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ConsumerInfo
@@ -60,6 +59,7 @@ namespace OpenWire.Client.IO
         info.Browser = bs.ReadBoolean();
         info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
         info.PrefetchSize = BaseDataStreamMarshaller.ReadInt(dataIn);
+        info.MaximumPendingMessageLimit = BaseDataStreamMarshaller.ReadInt(dataIn);
         info.DispatchAsync = bs.ReadBoolean();
         info.Selector = TightUnmarshalString(dataIn, bs);
         info.SubcriptionName = TightUnmarshalString(dataIn, bs);
@@ -94,7 +94,7 @@ namespace OpenWire.Client.IO
     rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs);
     bs.WriteBoolean(info.Browser);
     rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
-        bs.WriteBoolean(info.DispatchAsync);
+            bs.WriteBoolean(info.DispatchAsync);
     rc += TightMarshalString1(info.Selector, bs);
     rc += TightMarshalString1(info.SubcriptionName, bs);
     bs.WriteBoolean(info.NoLocal);
@@ -103,7 +103,7 @@ namespace OpenWire.Client.IO
         rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
     bs.WriteBoolean(info.NetworkSubscription);
 
-        return rc + 5;
+        return rc + 9;
     }
 
     // 
@@ -117,6 +117,7 @@ namespace OpenWire.Client.IO
     bs.ReadBoolean();
     TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
     BaseDataStreamMarshaller.WriteInt(info.PrefetchSize, dataOut);
+    BaseDataStreamMarshaller.WriteInt(info.MaximumPendingMessageLimit, dataOut);
     bs.ReadBoolean();
     TightMarshalString2(info.Selector, dataOut, bs);
     TightMarshalString2(info.SubcriptionName, dataOut, bs);

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ControlCommand

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for DataArrayResponse

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for DataResponse

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

@@ -1,69 +1,68 @@
-//
-//
-// Copyright 2005-2006 The Apache Software Foundation
-//
-// 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 System.IO;
-
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
-
-namespace OpenWire.Client.IO
-{
-  //
-  //  Marshalling code for Open Wire Format for DataStructureSupport
-  //
-  //
-  //  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 DataStructureSupportMarshaller : BaseDataStreamMarshaller
-  {
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-    }
-
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        DataStructureSupport info = (DataStructureSupport)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-  }
-}
+//
+//
+// Copyright 2005-2006 The Apache Software Foundation
+//
+// 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 System.IO;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
+
+namespace ActiveMQ.OpenWire.V1
+{
+  //
+  //  Marshalling code for Open Wire Format for DataStructureSupport
+  //
+  //
+  //  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 DataStructureSupportMarshaller : BaseDataStreamMarshaller
+  {
+
+    //
+    // Un-marshal an object instance from the data input stream
+    //
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+    {
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+    }
+
+
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        DataStructureSupport info = (DataStructureSupport)o;
+
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+
+        return rc + 0;
+    }
+
+    //
+    // Write a object instance to data output stream
+    //
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+    }
+  }
+}

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for DestinationInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for DiscoveryEvent

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ExceptionResponse

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for FlushCommand

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for IntegerResponse

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for JournalQueueAck

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for JournalTopicAck

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for JournalTrace

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for JournalTransaction

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for KeepAliveInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for LocalTransactionId

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

@@ -1,91 +1,90 @@
-//
-//
-// Copyright 2005-2006 The Apache Software Foundation
-//
-// 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.
-//
-
-// Marshalling code for Open Wire Format for ExceptionResponse
-//
-//
-// NOTE!: This file is autogenerated - do not modify!
-//        if you need to make a change, please see the Groovy scripts in the
-//        activemq-openwire module
-//
-
-using System;
-using System.Collections;
-using System.IO;
-
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
-
-namespace OpenWire.Client.IO
-{
-    public class MarshallerFactory
-    {
-        public void configure(OpenWireFormat format) 
-        {
-
-            format.addMarshaller(new MessageIdMarshaller());
-            format.addMarshaller(new BrokerInfoMarshaller());
-            format.addMarshaller(new ActiveMQTempQueueMarshaller());
-            format.addMarshaller(new LocalTransactionIdMarshaller());
-            format.addMarshaller(new RemoveSubscriptionInfoMarshaller());
-            format.addMarshaller(new IntegerResponseMarshaller());
-            format.addMarshaller(new ActiveMQQueueMarshaller());
-            format.addMarshaller(new DestinationInfoMarshaller());
-            format.addMarshaller(new ActiveMQBytesMessageMarshaller());
-            format.addMarshaller(new ShutdownInfoMarshaller());
-            format.addMarshaller(new DataResponseMarshaller());
-            format.addMarshaller(new SessionIdMarshaller());
-            format.addMarshaller(new DataArrayResponseMarshaller());
-            format.addMarshaller(new JournalQueueAckMarshaller());
-            format.addMarshaller(new WireFormatInfoMarshaller());
-            format.addMarshaller(new ResponseMarshaller());
-            format.addMarshaller(new ConnectionErrorMarshaller());
-            format.addMarshaller(new ActiveMQObjectMessageMarshaller());
-            format.addMarshaller(new ConsumerInfoMarshaller());
-            format.addMarshaller(new ActiveMQTempTopicMarshaller());
-            format.addMarshaller(new ConnectionIdMarshaller());
-            format.addMarshaller(new DiscoveryEventMarshaller());
-            format.addMarshaller(new ConnectionInfoMarshaller());
-            format.addMarshaller(new KeepAliveInfoMarshaller());
-            format.addMarshaller(new XATransactionIdMarshaller());
-            format.addMarshaller(new JournalTraceMarshaller());
-            format.addMarshaller(new FlushCommandMarshaller());
-            format.addMarshaller(new ConsumerIdMarshaller());
-            format.addMarshaller(new JournalTopicAckMarshaller());
-            format.addMarshaller(new ActiveMQTextMessageMarshaller());
-            format.addMarshaller(new BrokerIdMarshaller());
-            format.addMarshaller(new MessageDispatchMarshaller());
-            format.addMarshaller(new ProducerInfoMarshaller());
-            format.addMarshaller(new SubscriptionInfoMarshaller());
-            format.addMarshaller(new ActiveMQMapMessageMarshaller());
-            format.addMarshaller(new MessageDispatchNotificationMarshaller());
-            format.addMarshaller(new SessionInfoMarshaller());
-            format.addMarshaller(new ActiveMQMessageMarshaller());
-            format.addMarshaller(new TransactionInfoMarshaller());
-            format.addMarshaller(new ActiveMQStreamMessageMarshaller());
-            format.addMarshaller(new MessageAckMarshaller());
-            format.addMarshaller(new ProducerIdMarshaller());
-            format.addMarshaller(new ActiveMQTopicMarshaller());
-            format.addMarshaller(new JournalTransactionMarshaller());
-            format.addMarshaller(new RemoveInfoMarshaller());
-            format.addMarshaller(new ControlCommandMarshaller());
-            format.addMarshaller(new ExceptionResponseMarshaller());
-    	}
-    }
-}
+//
+//
+// Copyright 2005-2006 The Apache Software Foundation
+//
+// 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.
+//
+
+// Marshalling code for Open Wire Format for ExceptionResponse
+//
+//
+// NOTE!: This file is autogenerated - do not modify!
+//        if you need to make a change, please see the Groovy scripts in the
+//        activemq-openwire module
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
+
+namespace ActiveMQ.OpenWire.V1
+{
+    public class MarshallerFactory
+    {
+        public void configure(OpenWireFormat format) 
+        {
+
+            format.addMarshaller(new MessageIdMarshaller());
+            format.addMarshaller(new BrokerInfoMarshaller());
+            format.addMarshaller(new ActiveMQTempQueueMarshaller());
+            format.addMarshaller(new LocalTransactionIdMarshaller());
+            format.addMarshaller(new RemoveSubscriptionInfoMarshaller());
+            format.addMarshaller(new IntegerResponseMarshaller());
+            format.addMarshaller(new ActiveMQQueueMarshaller());
+            format.addMarshaller(new DestinationInfoMarshaller());
+            format.addMarshaller(new ActiveMQBytesMessageMarshaller());
+            format.addMarshaller(new ShutdownInfoMarshaller());
+            format.addMarshaller(new DataResponseMarshaller());
+            format.addMarshaller(new SessionIdMarshaller());
+            format.addMarshaller(new DataArrayResponseMarshaller());
+            format.addMarshaller(new JournalQueueAckMarshaller());
+            format.addMarshaller(new WireFormatInfoMarshaller());
+            format.addMarshaller(new ResponseMarshaller());
+            format.addMarshaller(new ConnectionErrorMarshaller());
+            format.addMarshaller(new ActiveMQObjectMessageMarshaller());
+            format.addMarshaller(new ConsumerInfoMarshaller());
+            format.addMarshaller(new ActiveMQTempTopicMarshaller());
+            format.addMarshaller(new ConnectionIdMarshaller());
+            format.addMarshaller(new DiscoveryEventMarshaller());
+            format.addMarshaller(new ConnectionInfoMarshaller());
+            format.addMarshaller(new KeepAliveInfoMarshaller());
+            format.addMarshaller(new XATransactionIdMarshaller());
+            format.addMarshaller(new JournalTraceMarshaller());
+            format.addMarshaller(new FlushCommandMarshaller());
+            format.addMarshaller(new ConsumerIdMarshaller());
+            format.addMarshaller(new JournalTopicAckMarshaller());
+            format.addMarshaller(new ActiveMQTextMessageMarshaller());
+            format.addMarshaller(new BrokerIdMarshaller());
+            format.addMarshaller(new MessageDispatchMarshaller());
+            format.addMarshaller(new ProducerInfoMarshaller());
+            format.addMarshaller(new SubscriptionInfoMarshaller());
+            format.addMarshaller(new ActiveMQMapMessageMarshaller());
+            format.addMarshaller(new MessageDispatchNotificationMarshaller());
+            format.addMarshaller(new SessionInfoMarshaller());
+            format.addMarshaller(new ActiveMQMessageMarshaller());
+            format.addMarshaller(new TransactionInfoMarshaller());
+            format.addMarshaller(new ActiveMQStreamMessageMarshaller());
+            format.addMarshaller(new MessageAckMarshaller());
+            format.addMarshaller(new ProducerIdMarshaller());
+            format.addMarshaller(new ActiveMQTopicMarshaller());
+            format.addMarshaller(new JournalTransactionMarshaller());
+            format.addMarshaller(new RemoveInfoMarshaller());
+            format.addMarshaller(new ControlCommandMarshaller());
+            format.addMarshaller(new ExceptionResponseMarshaller());
+    	}
+    }
+}

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for MessageAck

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for MessageDispatch

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

@@ -1,96 +1,95 @@
-//
-//
-// Copyright 2005-2006 The Apache Software Foundation
-//
-// 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 System.IO;
-
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
-
-namespace OpenWire.Client.IO
-{
-  //
-  //  Marshalling code for Open Wire Format for MessageDispatchNotification
-  //
-  //
-  //  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 class MessageDispatchNotificationMarshaller : BaseCommandMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new MessageDispatchNotification();
-    }
-
-    public override byte GetDataStructureType() 
-    {
-        return MessageDispatchNotification.ID_MessageDispatchNotification;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.DeliverySequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
-        info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
-
-    }
-
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs);
-    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
-    rc += TightMarshalLong1(wireFormat, info.DeliverySequenceId, bs);
-    rc += TightMarshalNestedObject1(wireFormat, info.MessageId, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        MessageDispatchNotification info = (MessageDispatchNotification)o;
-    TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs);
-    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
-    TightMarshalLong2(wireFormat, info.DeliverySequenceId, dataOut, bs);
-    TightMarshalNestedObject2(wireFormat, info.MessageId, dataOut, bs);
-
-    }
-  }
-}
+//
+//
+// Copyright 2005-2006 The Apache Software Foundation
+//
+// 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 System.IO;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
+
+namespace ActiveMQ.OpenWire.V1
+{
+  //
+  //  Marshalling code for Open Wire Format for MessageDispatchNotification
+  //
+  //
+  //  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 class MessageDispatchNotificationMarshaller : BaseCommandMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
+    {
+        return new MessageDispatchNotification();
+    }
+
+    public override byte GetDataStructureType() 
+    {
+        return MessageDispatchNotification.ID_MessageDispatchNotification;
+    }
+
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+        MessageDispatchNotification info = (MessageDispatchNotification)o;
+        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.DeliverySequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
+        info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+
+    }
+
+
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        MessageDispatchNotification info = (MessageDispatchNotification)o;
+
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalLong1(wireFormat, info.DeliverySequenceId, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.MessageId, bs);
+
+        return rc + 0;
+    }
+
+    // 
+    // Write a object instance to data output stream
+    //
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+        MessageDispatchNotification info = (MessageDispatchNotification)o;
+    TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.DeliverySequenceId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.MessageId, dataOut, bs);
+
+    }
+  }
+}

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for MessageId

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for Message

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ProducerId

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ProducerInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for RemoveInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for RemoveSubscriptionInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for Response

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for SessionId

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for SessionInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for ShutdownInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for SubscriptionInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for TransactionId

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for TransactionInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for WireFormatInfo

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

@@ -19,12 +19,11 @@ using System;
 using System.Collections;
 using System.IO;
 
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
-using OpenWire.Client.IO;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+using ActiveMQ.OpenWire.V1;
 
-namespace OpenWire.Client.IO
+namespace ActiveMQ.OpenWire.V1
 {
   //
   //  Marshalling code for Open Wire Format for XATransactionId