From aae59ee589cdfcfd5da78796ee05d3cec6b8ad23 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Sat, 4 Mar 2006 08:14:24 +0000 Subject: [PATCH] Get it to compile after refactor git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383068 13f79535-47bb-0310-9956-ffa450edef68 --- .../V1/ActiveMQBytesMessageMarshaller.cs | 9 +- .../V1/ActiveMQDestinationMarshaller.cs | 9 +- .../V1/ActiveMQMapMessageMarshaller.cs | 9 +- .../OpenWire/V1/ActiveMQMessageMarshaller.cs | 9 +- .../V1/ActiveMQObjectMessageMarshaller.cs | 9 +- .../OpenWire/V1/ActiveMQQueueMarshaller.cs | 9 +- .../V1/ActiveMQStreamMessageMarshaller.cs | 9 +- .../V1/ActiveMQTempDestinationMarshaller.cs | 9 +- .../V1/ActiveMQTempQueueMarshaller.cs | 9 +- .../V1/ActiveMQTempTopicMarshaller.cs | 9 +- .../V1/ActiveMQTextMessageMarshaller.cs | 9 +- .../OpenWire/V1/ActiveMQTopicMarshaller.cs | 9 +- .../OpenWire/V1/BaseCommandMarshaller.cs | 9 +- .../OpenWire/V1/BrokerIdMarshaller.cs | 9 +- .../OpenWire/V1/BrokerInfoMarshaller.cs | 9 +- .../OpenWire/V1/ConnectionErrorMarshaller.cs | 9 +- .../OpenWire/V1/ConnectionIdMarshaller.cs | 9 +- .../OpenWire/V1/ConnectionInfoMarshaller.cs | 9 +- .../OpenWire/V1/ConsumerIdMarshaller.cs | 9 +- .../OpenWire/V1/ConsumerInfoMarshaller.cs | 15 +- .../OpenWire/V1/ControlCommandMarshaller.cs | 9 +- .../V1/DataArrayResponseMarshaller.cs | 9 +- .../OpenWire/V1/DataResponseMarshaller.cs | 9 +- .../V1/DataStructureSupportMarshaller.cs | 137 +++++++------ .../OpenWire/V1/DestinationInfoMarshaller.cs | 9 +- .../OpenWire/V1/DiscoveryEventMarshaller.cs | 9 +- .../V1/ExceptionResponseMarshaller.cs | 9 +- .../OpenWire/V1/FlushCommandMarshaller.cs | 9 +- .../OpenWire/V1/IntegerResponseMarshaller.cs | 9 +- .../OpenWire/V1/JournalQueueAckMarshaller.cs | 9 +- .../OpenWire/V1/JournalTopicAckMarshaller.cs | 9 +- .../OpenWire/V1/JournalTraceMarshaller.cs | 9 +- .../V1/JournalTransactionMarshaller.cs | 9 +- .../OpenWire/V1/KeepAliveInfoMarshaller.cs | 9 +- .../V1/LocalTransactionIdMarshaller.cs | 9 +- .../ActiveMQ/OpenWire/V1/MarshallerFactory.cs | 181 +++++++++-------- .../OpenWire/V1/MessageAckMarshaller.cs | 9 +- .../OpenWire/V1/MessageDispatchMarshaller.cs | 9 +- .../MessageDispatchNotificationMarshaller.cs | 191 +++++++++--------- .../OpenWire/V1/MessageIdMarshaller.cs | 9 +- .../ActiveMQ/OpenWire/V1/MessageMarshaller.cs | 9 +- .../OpenWire/V1/ProducerIdMarshaller.cs | 9 +- .../OpenWire/V1/ProducerInfoMarshaller.cs | 9 +- .../OpenWire/V1/RemoveInfoMarshaller.cs | 9 +- .../V1/RemoveSubscriptionInfoMarshaller.cs | 9 +- .../OpenWire/V1/ResponseMarshaller.cs | 9 +- .../OpenWire/V1/SessionIdMarshaller.cs | 9 +- .../OpenWire/V1/SessionInfoMarshaller.cs | 9 +- .../OpenWire/V1/ShutdownInfoMarshaller.cs | 9 +- .../OpenWire/V1/SubscriptionInfoMarshaller.cs | 9 +- .../OpenWire/V1/TransactionIdMarshaller.cs | 9 +- .../OpenWire/V1/TransactionInfoMarshaller.cs | 9 +- .../OpenWire/V1/WireFormatInfoMarshaller.cs | 9 +- .../OpenWire/V1/XATransactionIdMarshaller.cs | 9 +- 54 files changed, 461 insertions(+), 513 deletions(-) diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs index 1fabd97c57..a5ddadf4eb 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs index 7eec605d44..de073d49a8 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs index f27460e4c1..f28026e535 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs index 031d054c10..4c31a45810 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs index d03b444097..308c14d667 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs index 9f0033e633..52a4a191e3 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs index abb4daf9ac..fbeb65c1d3 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs index 44ed2296d8..10a2166e18 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs index 6e40d7f042..3aeff09a1d 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs index ed5011381e..9451b43f24 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs index 6f9d21d033..25c303861c 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs index d7ddabc9f0..64fa4e204d 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs index 48a42a8a3b..4196c66bff 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs index 174616d1cb..d306bfe48f 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs index bad8742530..68d963fe90 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs index 745a7ed31f..e13003eee8 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs index f0d28d5f15..bf8a40c3e1 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs index 9c8d54a946..4a64924c2f 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs index 99a6c25f5f..88853714aa 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs index f24038a51a..174022ee5c 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs +++ b/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); diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs index a107822681..0789aee7b5 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs index 62210a9e31..7d6af546d5 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs index 11a0b54b11..b4d76b90fb 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs index 8e506b3473..9d99e3c856 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs +++ b/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); + + } + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs index d8621c2e10..acc70b48da 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs index fb604732c1..813f539c89 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs index 2d22f6162d..7bc9b544b2 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs index c5187c4188..643b0c9a43 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs index be083d9eb1..9ce556837a 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs index 7d5b673f71..00e4aabab5 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs index 808d4c9a17..dc9545eaa3 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs index f5192d9672..defb563ec5 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs index aed1a5f76f..142ebb6e87 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs index 819ba5cbfe..cccced66c6 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs index 9209b50eea..da1b9651a4 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MarshallerFactory.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MarshallerFactory.cs index 17423627e2..4945dae383 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MarshallerFactory.cs +++ b/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()); + } + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs index 8974dd2ca4..00aad4c371 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs index 9a3184b60e..a451bec833 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs index 0e9c820c32..dbbfdde05a 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs +++ b/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); + + } + } +} diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs index 785e57fe90..d858a4fc53 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageMarshaller.cs index f87b851726..0dd5df4114 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs index 971a72c26a..d94f11c170 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs index f8f97999e8..aee22c9250 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs index f4bcc30e24..fce6cdd891 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs index 577bb73db7..7481c7b797 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs index 410ed0ce0e..2941f139f8 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs index 4b070509c5..4805352d3f 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs index 2e1e44f881..86e47b1382 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs index c997e5ea0f..caf2ddc662 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs index df53c18473..2ae58a18ef 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs index fe54c645cf..b048cbee6a 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs index 295dca4906..66995698b7 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs index 8d1e43672e..d667662ab5 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs +++ b/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 diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs index 4f219edc5a..8892237353 100644 --- a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs +++ b/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