From 446629bba0a09f101f9d574296b6c9b966c27198 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Tue, 7 Mar 2006 02:32:50 +0000 Subject: [PATCH] - Since we WireFormatInfo needs to be flexible and extensible so that feilds can be added witout changing it's on the wire encoding, we are now using a primitive map to store it's data. - Extracted the NetworkBridgeFilter out of the Demand based forwarding bridge and made it a serializable class so that a bridge can be used with a remote broker. - Cleaned up many of the warnings gram was spewing out by having it suck in more files. git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383749 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-core/maven.xml | 2 +- .../tool/OpenWireCSharpClassesScript.java | 11 +- .../tool/OpenWireCSharpMarshallingScript.java | 30 +- .../openwire/tool/OpenWireClassesScript.java | 2 +- .../tool/OpenWireJavaMarshallingScript.java | 28 +- .../gram/script/GenerateCMarshalling.groovy | 2 +- .../gram/script/GenerateCSharpClasses.groovy | 8 +- .../script/GenerateJavaMarshalling.groovy | 1 + .../apache/activemq/command/CommandTypes.java | 1 + .../apache/activemq/command/ConsumerInfo.java | 4 +- .../activemq/command/NetworkBridgeFilter.java | 137 + .../activemq/command/WireFormatInfo.java | 248 +- .../network/DemandForwardingBridge.java | 52 +- .../v1/ActiveMQBytesMessageMarshaller.java | 1 + .../v1/ActiveMQDestinationMarshaller.java | 1 + .../v1/ActiveMQMapMessageMarshaller.java | 1 + .../v1/ActiveMQMessageMarshaller.java | 1 + .../v1/ActiveMQObjectMessageMarshaller.java | 1 + .../openwire/v1/ActiveMQQueueMarshaller.java | 1 + .../v1/ActiveMQStreamMessageMarshaller.java | 1 + .../v1/ActiveMQTempDestinationMarshaller.java | 1 + .../v1/ActiveMQTempQueueMarshaller.java | 1 + .../v1/ActiveMQTempTopicMarshaller.java | 1 + .../v1/ActiveMQTextMessageMarshaller.java | 1 + .../openwire/v1/ActiveMQTopicMarshaller.java | 1 + .../openwire/v1/BaseCommandMarshaller.java | 1 + .../openwire/v1/BrokerIdMarshaller.java | 1 + .../openwire/v1/BrokerInfoMarshaller.java | 19 +- .../v1/ConnectionErrorMarshaller.java | 15 +- .../openwire/v1/ConnectionIdMarshaller.java | 1 + .../openwire/v1/ConnectionInfoMarshaller.java | 19 +- .../openwire/v1/ConsumerIdMarshaller.java | 1 + .../openwire/v1/ConsumerInfoMarshaller.java | 34 +- .../openwire/v1/ControlCommandMarshaller.java | 1 + .../v1/DataArrayResponseMarshaller.java | 9 +- .../openwire/v1/DataResponseMarshaller.java | 11 +- .../v1/DestinationInfoMarshaller.java | 29 +- .../openwire/v1/DiscoveryEventMarshaller.java | 1 + .../v1/ExceptionResponseMarshaller.java | 5 +- .../openwire/v1/FlushCommandMarshaller.java | 1 + .../v1/IntegerResponseMarshaller.java | 1 + .../v1/JournalQueueAckMarshaller.java | 21 +- .../v1/JournalTopicAckMarshaller.java | 31 +- .../openwire/v1/JournalTraceMarshaller.java | 1 + .../v1/JournalTransactionMarshaller.java | 11 +- .../openwire/v1/KeepAliveInfoMarshaller.java | 1 + .../v1/LocalTransactionIdMarshaller.java | 11 +- .../openwire/v1/MarshallerFactory.java | 63 +- .../openwire/v1/MessageAckMarshaller.java | 51 +- .../v1/MessageDispatchMarshaller.java | 31 +- ...MessageDispatchNotificationMarshaller.java | 31 +- .../openwire/v1/MessageIdMarshaller.java | 11 +- .../openwire/v1/MessageMarshaller.java | 99 +- .../v1/NetworkBridgeFilterMarshaller.java | 1 + .../openwire/v1/ProducerIdMarshaller.java | 1 + .../openwire/v1/ProducerInfoMarshaller.java | 29 +- .../openwire/v1/RemoveInfoMarshaller.java | 11 +- .../v1/RemoveSubscriptionInfoMarshaller.java | 11 +- .../openwire/v1/ResponseMarshaller.java | 1 + .../openwire/v1/SessionIdMarshaller.java | 1 + .../openwire/v1/SessionInfoMarshaller.java | 11 +- .../openwire/v1/ShutdownInfoMarshaller.java | 1 + .../v1/SubscriptionInfoMarshaller.java | 11 +- .../openwire/v1/TransactionIdMarshaller.java | 1 + .../v1/TransactionInfoMarshaller.java | 21 +- .../openwire/v1/WireFormatInfoMarshaller.java | 47 +- .../v1/XATransactionIdMarshaller.java | 1 + .../transport/WireFormatNegotiator.java | 34 +- .../transport/activeio/ActiveIOTransport.java | 10 +- .../DataFileGeneratorTestSupport.java | 45 +- .../openwire/v1/ConsumerInfoTest.java | 1 + .../openwire/v1/NetworkBridgeFilterTest.java | 1 + .../openwire/v1/WireFormatInfoTest.java | 11 +- activemq-dotnet/activemq-dotnet.csproj | 5 + .../ActiveMQ/Commands/AbstractCommand.cs | 27 + .../ActiveMQ/Commands/ActiveMQMessage.cs | 611 ++-- .../Commands/ActiveMQObjectMessage.cs | 111 +- .../ActiveMQ/Commands/BooleanExpression.cs | 22 + .../main/csharp/ActiveMQ/Commands/BrokerId.cs | 86 +- .../csharp/ActiveMQ/Commands/BrokerInfo.cs | 96 +- .../ActiveMQ/Commands/ConnectionError.cs | 72 +- .../csharp/ActiveMQ/Commands/ConnectionId.cs | 86 +- .../ActiveMQ/Commands/ConnectionInfo.cs | 96 +- .../csharp/ActiveMQ/Commands/ConsumerId.cs | 106 +- .../csharp/ActiveMQ/Commands/ConsumerInfo.cs | 168 +- .../ActiveMQ/Commands/ControlCommand.cs | 64 +- .../ActiveMQ/Commands/DataArrayResponse.cs | 64 +- .../csharp/ActiveMQ/Commands/DataResponse.cs | 64 +- .../ActiveMQ/Commands/DestinationInfo.cs | 96 +- .../ActiveMQ/Commands/DiscoveryEvent.cs | 72 +- .../ActiveMQ/Commands/ExceptionResponse.cs | 64 +- .../csharp/ActiveMQ/Commands/FlushCommand.cs | 56 +- .../ActiveMQ/Commands/IntegerResponse.cs | 64 +- .../ActiveMQ/Commands/JournalQueueAck.cs | 72 +- .../ActiveMQ/Commands/JournalTopicAck.cs | 104 +- .../csharp/ActiveMQ/Commands/JournalTrace.cs | 64 +- .../ActiveMQ/Commands/JournalTransaction.cs | 80 +- .../csharp/ActiveMQ/Commands/KeepAliveInfo.cs | 56 +- .../ActiveMQ/Commands/LocalTransactionId.cs | 96 +- .../main/csharp/ActiveMQ/Commands/Message.cs | 256 +- .../csharp/ActiveMQ/Commands/MessageAck.cs | 112 +- .../ActiveMQ/Commands/MessageDispatch.cs | 88 +- .../Commands/MessageDispatchNotification.cs | 88 +- .../csharp/ActiveMQ/Commands/MessageId.cs | 106 +- .../ActiveMQ/Commands/MessageReference.cs | 23 + .../ActiveMQ/Commands/NetworkBridgeFilter.cs | 1 + .../csharp/ActiveMQ/Commands/ProducerId.cs | 106 +- .../csharp/ActiveMQ/Commands/ProducerInfo.cs | 80 +- .../csharp/ActiveMQ/Commands/RemoveInfo.cs | 64 +- .../Commands/RemoveSubscriptionInfo.cs | 80 +- .../main/csharp/ActiveMQ/Commands/Response.cs | 64 +- .../csharp/ActiveMQ/Commands/SessionId.cs | 96 +- .../csharp/ActiveMQ/Commands/SessionInfo.cs | 64 +- .../csharp/ActiveMQ/Commands/ShutdownInfo.cs | 56 +- .../ActiveMQ/Commands/SubscriptionInfo.cs | 88 +- .../csharp/ActiveMQ/Commands/TransactionId.cs | 76 +- .../ActiveMQ/Commands/TransactionInfo.cs | 80 +- .../ActiveMQ/Commands/WireFormatInfo.cs | 235 +- .../ActiveMQ/Commands/XATransactionId.cs | 106 +- .../src/main/csharp/ActiveMQ/Commands/Xid.cs | 22 + .../OpenWire/BaseDataStreamMarshaller.cs | 1539 +++++---- .../OpenWire/V1/BrokerInfoMarshaller.cs | 4 +- .../OpenWire/V1/ConnectionErrorMarshaller.cs | 4 +- .../OpenWire/V1/ConnectionInfoMarshaller.cs | 4 +- .../OpenWire/V1/ConsumerInfoMarshaller.cs | 11 +- .../OpenWire/V1/DataResponseMarshaller.cs | 4 +- .../OpenWire/V1/DestinationInfoMarshaller.cs | 8 +- .../OpenWire/V1/JournalQueueAckMarshaller.cs | 8 +- .../OpenWire/V1/JournalTopicAckMarshaller.cs | 12 +- .../V1/JournalTransactionMarshaller.cs | 4 +- .../V1/LocalTransactionIdMarshaller.cs | 4 +- .../ActiveMQ/OpenWire/V1/MarshallerFactory.cs | 65 +- .../OpenWire/V1/MessageAckMarshaller.cs | 20 +- .../OpenWire/V1/MessageDispatchMarshaller.cs | 12 +- .../MessageDispatchNotificationMarshaller.cs | 96 +- .../OpenWire/V1/MessageIdMarshaller.cs | 4 +- .../ActiveMQ/OpenWire/V1/MessageMarshaller.cs | 36 +- .../V1/NetworkBridgeFilterMarshaller.cs | 1 + .../OpenWire/V1/ProducerInfoMarshaller.cs | 8 +- .../OpenWire/V1/RemoveInfoMarshaller.cs | 4 +- .../V1/RemoveSubscriptionInfoMarshaller.cs | 4 +- .../OpenWire/V1/SessionInfoMarshaller.cs | 4 +- .../OpenWire/V1/SubscriptionInfoMarshaller.cs | 4 +- .../OpenWire/V1/TransactionInfoMarshaller.cs | 8 +- .../OpenWire/V1/WireFormatInfoMarshaller.cs | 22 +- .../src/main/csharp/CommonAssemblyInfo.cs | 27 + .../src/test/csharp/CommonAssemblyInfo.cs | 27 + openwire-c/src/libopenwire/ow_commands_v1.c | 2889 +++++++++-------- openwire-c/src/libopenwire/ow_commands_v1.h | 901 ++--- .../src/command/ActiveMQObjectMessage.hpp | 72 +- openwire-cpp/src/command/ConnectionError.hpp | 82 +- openwire-cpp/src/command/ConsumerInfo.cpp | 12 + openwire-cpp/src/command/ConsumerInfo.hpp | 5 + openwire-cpp/src/command/ControlCommand.hpp | 76 +- .../src/command/DataArrayResponse.hpp | 77 +- openwire-cpp/src/command/DataResponse.hpp | 77 +- openwire-cpp/src/command/DestinationInfo.hpp | 95 +- openwire-cpp/src/command/DiscoveryEvent.hpp | 80 +- openwire-cpp/src/command/FlushCommand.hpp | 72 +- openwire-cpp/src/command/IntegerResponse.hpp | 76 +- openwire-cpp/src/command/JournalQueueAck.hpp | 82 +- openwire-cpp/src/command/JournalTopicAck.hpp | 99 +- openwire-cpp/src/command/JournalTrace.hpp | 76 +- .../src/command/JournalTransaction.hpp | 85 +- openwire-cpp/src/command/KeepAliveInfo.hpp | 72 +- .../src/command/LocalTransactionId.hpp | 81 +- openwire-cpp/src/command/MessageDispatch.hpp | 91 +- .../command/MessageDispatchNotification.hpp | 91 +- openwire-cpp/src/command/MessageId.hpp | 85 +- .../src/command/NetworkBridgeFilter.cpp | 1 + .../src/command/NetworkBridgeFilter.hpp | 1 + .../src/command/RemoveSubscriptionInfo.hpp | 85 +- openwire-cpp/src/command/ShutdownInfo.hpp | 72 +- openwire-cpp/src/command/SubscriptionInfo.hpp | 89 +- openwire-cpp/src/command/TransactionId.hpp | 72 +- openwire-cpp/src/command/TransactionInfo.hpp | 86 +- openwire-cpp/src/command/WireFormatInfo.cpp | 58 +- openwire-cpp/src/command/WireFormatInfo.hpp | 100 +- openwire-cpp/src/command/XATransactionId.hpp | 84 +- .../ActiveMQBytesMessageMarshaller.hpp | 72 +- .../marshal/ActiveMQDestinationMarshaller.hpp | 72 +- .../marshal/ActiveMQMapMessageMarshaller.hpp | 72 +- .../src/marshal/ActiveMQMessageMarshaller.hpp | 72 +- .../ActiveMQObjectMessageMarshaller.hpp | 72 +- .../src/marshal/ActiveMQQueueMarshaller.hpp | 72 +- .../ActiveMQStreamMessageMarshaller.hpp | 72 +- .../ActiveMQTempDestinationMarshaller.hpp | 72 +- .../marshal/ActiveMQTempQueueMarshaller.hpp | 72 +- .../marshal/ActiveMQTempTopicMarshaller.hpp | 72 +- .../marshal/ActiveMQTextMessageMarshaller.hpp | 72 +- .../src/marshal/ActiveMQTopicMarshaller.hpp | 72 +- .../src/marshal/BaseCommandMarshaller.hpp | 72 +- .../src/marshal/BrokerInfoMarshaller.cpp | 6 +- .../src/marshal/ConnectionErrorMarshaller.cpp | 4 +- .../src/marshal/ConnectionErrorMarshaller.hpp | 72 +- .../src/marshal/ConnectionIdMarshaller.hpp | 72 +- .../src/marshal/ConnectionInfoMarshaller.cpp | 6 +- .../src/marshal/ConnectionInfoMarshaller.hpp | 72 +- .../src/marshal/ConsumerIdMarshaller.hpp | 72 +- .../src/marshal/ConsumerInfoMarshaller.cpp | 11 +- .../src/marshal/ConsumerInfoMarshaller.hpp | 72 +- .../src/marshal/ControlCommandMarshaller.hpp | 72 +- .../marshal/DataArrayResponseMarshaller.cpp | 4 +- .../marshal/DataArrayResponseMarshaller.hpp | 72 +- .../src/marshal/DataResponseMarshaller.cpp | 2 +- .../src/marshal/DataResponseMarshaller.hpp | 72 +- .../src/marshal/DestinationInfoMarshaller.cpp | 8 +- .../src/marshal/DestinationInfoMarshaller.hpp | 72 +- .../src/marshal/DiscoveryEventMarshaller.hpp | 72 +- .../marshal/ExceptionResponseMarshaller.cpp | 2 +- .../marshal/ExceptionResponseMarshaller.hpp | 72 +- .../src/marshal/FlushCommandMarshaller.hpp | 72 +- .../src/marshal/IntegerResponseMarshaller.hpp | 72 +- .../src/marshal/JournalQueueAckMarshaller.cpp | 4 +- .../src/marshal/JournalQueueAckMarshaller.hpp | 72 +- .../src/marshal/JournalTopicAckMarshaller.cpp | 6 +- .../src/marshal/JournalTopicAckMarshaller.hpp | 72 +- .../src/marshal/JournalTraceMarshaller.hpp | 72 +- .../marshal/JournalTransactionMarshaller.cpp | 2 +- .../marshal/JournalTransactionMarshaller.hpp | 72 +- .../src/marshal/KeepAliveInfoMarshaller.hpp | 72 +- .../marshal/LocalTransactionIdMarshaller.cpp | 2 +- .../marshal/LocalTransactionIdMarshaller.hpp | 72 +- .../src/marshal/MarshallerFactory.cpp | 126 +- .../src/marshal/MessageAckMarshaller.cpp | 10 +- .../src/marshal/MessageAckMarshaller.hpp | 72 +- .../src/marshal/MessageDispatchMarshaller.cpp | 6 +- .../src/marshal/MessageDispatchMarshaller.hpp | 72 +- .../MessageDispatchNotificationMarshaller.cpp | 6 +- .../MessageDispatchNotificationMarshaller.hpp | 72 +- .../src/marshal/MessageIdMarshaller.cpp | 2 +- .../src/marshal/MessageIdMarshaller.hpp | 72 +- .../src/marshal/MessageMarshaller.cpp | 22 +- .../src/marshal/MessageMarshaller.hpp | 72 +- .../marshal/NetworkBridgeFilterMarshaller.cpp | 1 + .../marshal/NetworkBridgeFilterMarshaller.hpp | 1 + .../src/marshal/ProducerIdMarshaller.hpp | 72 +- .../src/marshal/ProducerInfoMarshaller.cpp | 8 +- .../src/marshal/ProducerInfoMarshaller.hpp | 72 +- .../src/marshal/RemoveInfoMarshaller.cpp | 2 +- .../src/marshal/RemoveInfoMarshaller.hpp | 72 +- .../RemoveSubscriptionInfoMarshaller.cpp | 2 +- .../RemoveSubscriptionInfoMarshaller.hpp | 72 +- .../src/marshal/ResponseMarshaller.hpp | 72 +- .../src/marshal/SessionIdMarshaller.hpp | 72 +- .../src/marshal/SessionInfoMarshaller.cpp | 2 +- .../src/marshal/SessionInfoMarshaller.hpp | 72 +- .../src/marshal/ShutdownInfoMarshaller.hpp | 72 +- .../marshal/SubscriptionInfoMarshaller.cpp | 2 +- .../marshal/SubscriptionInfoMarshaller.hpp | 72 +- .../src/marshal/TransactionIdMarshaller.hpp | 72 +- .../src/marshal/TransactionInfoMarshaller.cpp | 4 +- .../src/marshal/TransactionInfoMarshaller.hpp | 72 +- .../src/marshal/WireFormatInfoMarshaller.cpp | 22 +- .../src/marshal/WireFormatInfoMarshaller.hpp | 72 +- .../src/marshal/XATransactionIdMarshaller.hpp | 72 +- 256 files changed, 4477 insertions(+), 12956 deletions(-) create mode 100644 activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java create mode 100644 activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java create mode 100644 activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java create mode 100644 activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BooleanExpression.cs create mode 100644 activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageReference.cs create mode 100644 activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs create mode 100644 activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Xid.cs create mode 100644 activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs create mode 100644 activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs create mode 100644 activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs create mode 100644 openwire-cpp/src/command/NetworkBridgeFilter.cpp create mode 100644 openwire-cpp/src/command/NetworkBridgeFilter.hpp create mode 100644 openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.cpp create mode 100644 openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.hpp diff --git a/activemq-core/maven.xml b/activemq-core/maven.xml index b3f53cbce5..b427d2262b 100755 --- a/activemq-core/maven.xml +++ b/activemq-core/maven.xml @@ -110,7 +110,7 @@ - + diff --git a/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpClassesScript.java b/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpClassesScript.java index e6d2259a41..3949af4e00 100644 --- a/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpClassesScript.java +++ b/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpClassesScript.java @@ -16,12 +16,13 @@ */ package org.apache.activemq.openwire.tool; -import org.codehaus.jam.JClass; -import org.codehaus.jam.JProperty; - -import java.io.*; +import java.io.File; +import java.io.PrintWriter; +import java.io.StringWriter; import java.util.Iterator; +import org.codehaus.jam.JProperty; + /** * * @version $Revision$ @@ -31,7 +32,7 @@ public abstract class OpenWireCSharpClassesScript extends OpenWireClassesScript public Object run() { filePostFix = ".cs"; if (destDir == null) { - destDir = new File("../openwire-dotnet/src/ActiveMQ/Commands"); + destDir = new File("../activemq-dotnet/src/main/csharp/ActiveMQ/Commands"); } return super.run(); diff --git a/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java b/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java index 46dd227335..634aa92e81 100644 --- a/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java +++ b/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java @@ -33,7 +33,7 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha public Object run() { filePostFix = ".cs"; if (destDir == null) { - destDir = new File("../openwire-dotnet/src/ActiveMQ/OpenWire/V"+getOpenwireVersion()); + destDir = new File("../activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V"+getOpenwireVersion()); } return super.run(); @@ -49,16 +49,16 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha out.println("info." + propertyName + " = bs.ReadBoolean();"); } else if (type.equals("byte")) { - out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadByte(dataIn);"); + out.println("info." + propertyName + " = dataIn.ReadByte();"); } else if (type.equals("char")) { - out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadChar(dataIn);"); + out.println("info." + propertyName + " = dataIn.ReadChar();"); } else if (type.equals("short")) { - out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadShort(dataIn);"); + out.println("info." + propertyName + " = dataIn.ReadInt16();"); } else if (type.equals("int")) { - out.println("info." + propertyName + " = BaseDataStreamMarshaller.ReadInt(dataIn);"); + out.println("info." + propertyName + " = dataIn.ReadInt32();"); } else if (type.equals("long")) { out.println("info." + propertyName + " = TightUnmarshalLong(wireFormat, dataIn, bs);"); @@ -101,7 +101,7 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha } else { out.println(" if (bs.ReadBoolean()) {"); - out.println(" short size = BaseDataStreamMarshaller.ReadShort(dataIn);"); + out.println(" short size = dataIn.ReadInt16();"); out.println(" " + arrayType + "[] value = new " + arrayType + "[size];"); out.println(" for( int i=0; i < size; i++ ) {"); out.println(" value[i] = (" + arrayType + ") TightUnmarshalNestedObject(wireFormat,dataIn, bs);"); @@ -169,10 +169,10 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha } else { if (isCachedProperty(property)) { - out.println("rc += TightMarshalCachedObject1(wireFormat, " + getter + ", bs);"); + out.println("rc += TightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);"); } else { - out.println("rc += TightMarshalNestedObject1(wireFormat, " + getter + ", bs);"); + out.println("rc += TightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);"); } } } @@ -194,16 +194,16 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha out.println("bs.ReadBoolean();"); } else if (type.equals("byte")) { - out.println("BaseDataStreamMarshaller.WriteByte(" + getter + ", dataOut);"); + out.println("dataOut.Write(" + getter + ");"); } else if (type.equals("char")) { - out.println("BaseDataStreamMarshaller.WriteChar(" + getter + ", dataOut);"); + out.println("dataOut.Write(" + getter + ");"); } else if (type.equals("short")) { - out.println("BaseDataStreamMarshaller.WriteShort(" + getter + ", dataOut);"); + out.println("dataOut.Write(" + getter + ");"); } else if (type.equals("int")) { - out.println("BaseDataStreamMarshaller.WriteInt(" + getter + ", dataOut);"); + out.println("dataOut.Write(" + getter + ");"); } else if (type.equals("long")) { out.println("TightMarshalLong2(wireFormat, " + getter + ", dataOut, bs);"); @@ -217,7 +217,7 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha } else { out.println("if(bs.ReadBoolean()) {"); - out.println(" BaseDataStreamMarshaller.WriteInt(" + getter + ".Length, dataOut);"); + out.println(" dataOut.Write(" + getter + ".Length);"); out.println(" dataOut.Write(" + getter + ");"); out.println(" }"); } @@ -235,10 +235,10 @@ public abstract class OpenWireCSharpMarshallingScript extends OpenWireJavaMarsha } else { if (isCachedProperty(property)) { - out.println("TightMarshalCachedObject2(wireFormat, " + getter + ", dataOut, bs);"); + out.println("TightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);"); } else { - out.println("TightMarshalNestedObject2(wireFormat, " + getter + ", dataOut, bs);"); + out.println("TightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);"); } } } diff --git a/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireClassesScript.java b/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireClassesScript.java index d34f6ba494..7a23cbde73 100644 --- a/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireClassesScript.java +++ b/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireClassesScript.java @@ -159,7 +159,7 @@ public abstract class OpenWireClassesScript extends OpenWireScript { protected void initialiseManuallyMaintainedClasses() { String[] names = { "ActiveMQDestination", "ActiveMQTempDestination", "ActiveMQQueue", "ActiveMQTopic", "ActiveMQTempQueue", "ActiveMQTempTopic", "BaseCommand", "ActiveMQMessage", "ActiveMQTextMessage", "ActiveMQMapMessage", "ActiveMQBytesMessage", "ActiveMQStreamMessage", - "ActiveMQStreamMessage", "DataStructureSupport" }; + "ActiveMQStreamMessage", "DataStructureSupport", "WireFormatInfo", "ActiveMQObjectMessage" }; for (int i = 0; i < names.length; i++) { manuallyMaintainedClasses.add(names[i]); diff --git a/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java b/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java index af1377cefd..df06f91720 100644 --- a/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java +++ b/activemq-core/src/gram/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java @@ -152,19 +152,19 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip out.println("info." + setter + "(tightUnmarshalByteSequence(dataIn, bs));"); } else if (isThrowable(property.getType())) { - out.println("info." + setter + "((" + type + ") tightUnmarsalThrowable(wireFormat, dataIn, bs));"); + out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalThrowable(wireFormat, dataIn, bs));"); } else if (isCachedProperty(property)) { - out.println("info." + setter + "((" + type + ") tightUnmarsalCachedObject(wireFormat, dataIn, bs));"); + out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalCachedObject(wireFormat, dataIn, bs));"); } else { - out.println("info." + setter + "((" + type + ") tightUnmarsalNestedObject(wireFormat, dataIn, bs));"); + out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") tightUnmarsalNestedObject(wireFormat, dataIn, bs));"); } } protected void generateTightUnmarshalBodyForArrayProperty(PrintWriter out, JProperty property, JAnnotationValue size) { JClass propertyType = property.getType(); - String arrayType = propertyType.getArrayComponentType().getSimpleName(); + String arrayType = propertyType.getArrayComponentType().getQualifiedName(); String setter = property.getSetter().getSimpleName(); out.println(); if (size != null) { @@ -248,10 +248,10 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip } else { if (isCachedProperty(property)) { - out.println("rc += tightMarshalCachedObject1(wireFormat, " + getter + ", bs);"); + out.println("rc += tightMarshalCachedObject1(wireFormat, (DataStructure)" + getter + ", bs);"); } else { - out.println("rc += tightMarshalNestedObject1(wireFormat, " + getter + ", bs);"); + out.println("rc += tightMarshalNestedObject1(wireFormat, (DataStructure)" + getter + ", bs);"); } } } @@ -314,10 +314,10 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip } else { if (isCachedProperty(property)) { - out.println("tightMarshalCachedObject2(wireFormat, " + getter + ", dataOut, bs);"); + out.println("tightMarshalCachedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);"); } else { - out.println("tightMarshalNestedObject2(wireFormat, " + getter + ", dataOut, bs);"); + out.println("tightMarshalNestedObject2(wireFormat, (DataStructure)" + getter + ", dataOut, bs);"); } } } @@ -381,10 +381,10 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip } else { if (isCachedProperty(property)) { - out.println("looseMarshalCachedObject(wireFormat, " + getter + ", dataOut);"); + out.println("looseMarshalCachedObject(wireFormat, (DataStructure)" + getter + ", dataOut);"); } else { - out.println("looseMarshalNestedObject(wireFormat, " + getter + ", dataOut);"); + out.println("looseMarshalNestedObject(wireFormat, (DataStructure)" + getter + ", dataOut);"); } } } @@ -447,19 +447,19 @@ public abstract class OpenWireJavaMarshallingScript extends OpenWireClassesScrip out.println("info." + setter + "(looseUnmarshalByteSequence(dataIn));"); } else if (isThrowable(property.getType())) { - out.println("info." + setter + "((" + type + ") looseUnmarsalThrowable(wireFormat, dataIn));"); + out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalThrowable(wireFormat, dataIn));"); } else if (isCachedProperty(property)) { - out.println("info." + setter + "((" + type + ") looseUnmarsalCachedObject(wireFormat, dataIn));"); + out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalCachedObject(wireFormat, dataIn));"); } else { - out.println("info." + setter + "((" + type + ") looseUnmarsalNestedObject(wireFormat, dataIn));"); + out.println("info." + setter + "((" + property.getType().getQualifiedName() + ") looseUnmarsalNestedObject(wireFormat, dataIn));"); } } protected void generateLooseUnmarshalBodyForArrayProperty(PrintWriter out, JProperty property, JAnnotationValue size) { JClass propertyType = property.getType(); - String arrayType = propertyType.getArrayComponentType().getSimpleName(); + String arrayType = propertyType.getArrayComponentType().getQualifiedName(); String setter = property.getSetter().getSimpleName(); out.println(); if (size != null) { diff --git a/activemq-core/src/gram/script/GenerateCMarshalling.groovy b/activemq-core/src/gram/script/GenerateCMarshalling.groovy index a9ff068fb7..6eb540791a 100755 --- a/activemq-core/src/gram/script/GenerateCMarshalling.groovy +++ b/activemq-core/src/gram/script/GenerateCMarshalling.groovy @@ -74,7 +74,7 @@ class GenerateCMarshalling extends OpenWireScript { def generateFields(out, jclass) { - println("getting fields for: ${jclass.simpleName}"); +// println("getting fields for: ${jclass.simpleName}"); if( jclass.superclass == null || jclass.superclass.simpleName.equals("Object") ) { out << """ ow_byte structType; diff --git a/activemq-core/src/gram/script/GenerateCSharpClasses.groovy b/activemq-core/src/gram/script/GenerateCSharpClasses.groovy index 2d7a1b66c9..6d2d90e47e 100755 --- a/activemq-core/src/gram/script/GenerateCSharpClasses.groovy +++ b/activemq-core/src/gram/script/GenerateCSharpClasses.groovy @@ -57,7 +57,13 @@ namespace ActiveMQ.Commands // if you need to make a change, please see the Groovy scripts in the // activemq-core module // - public class ${jclass.simpleName} : $baseClass + public class ${jclass.simpleName} : $baseClass""" + + for( i in jclass.interfaces ) { + out << ", ${i.simpleName}"; + } + +out << """ { public const byte ID_${jclass.simpleName} = ${getOpenWireOpCode(jclass)}; diff --git a/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy b/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy index 90c8ef55e6..bfc0531251 100755 --- a/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy +++ b/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy @@ -49,6 +49,7 @@ import java.io.IOException; import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + """ for (pkg in jclass.importedPackages) { for (clazz in pkg.classes) { diff --git a/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java b/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java index cef5299852..a47193ec8d 100755 --- a/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java @@ -117,6 +117,7 @@ public interface CommandTypes { /////////////////////////////////////////////////// byte MESSAGE_DISPATCH_NOTIFICATION = 90; + byte NETWORK_BRIDGE_FILTER = 91; /////////////////////////////////////////////////// // diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java index f98bbcb671..9bd7ab461e 100755 --- a/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java @@ -49,7 +49,7 @@ public class ConsumerInfo extends BaseCommand { protected byte priority; protected BrokerId[] brokerPath; - protected transient BooleanExpression additionalPredicate; + protected BooleanExpression additionalPredicate; protected transient boolean networkSubscription; //this subscription originated from a network connection public ConsumerInfo() { @@ -278,7 +278,7 @@ public class ConsumerInfo extends BaseCommand { * into the selector on the fly. Handy if if say a Security Broker interceptor wants to * filter out messages based on security level of the consumer. * - * @return + * @openwire:property version=1 */ public BooleanExpression getAdditionalPredicate() { return additionalPredicate; diff --git a/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java b/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java new file mode 100644 index 0000000000..b6ec8d575a --- /dev/null +++ b/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java @@ -0,0 +1,137 @@ +/** + * ActiveMQ: The Open Source Message Fabric + * + * Copyright 2005 Hiram Chirino + * + * 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. + * + **/ + +package org.apache.activemq.command; + +import java.io.IOException; + +import javax.jms.JMSException; + +import org.apache.activemq.filter.BooleanExpression; +import org.apache.activemq.filter.MessageEvaluationContext; +import org.apache.activemq.util.JMSExceptionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @openwire:marshaller code="91" + * @version $Revision: 1.12 $ + */ +public class NetworkBridgeFilter implements DataStructure, BooleanExpression { + + static final Log log=LogFactory.getLog(NetworkBridgeFilter.class); + public static final byte DATA_STRUCTURE_TYPE=CommandTypes.NETWORK_BRIDGE_FILTER; + + private BrokerId networkBrokerId; + private int networkTTL; + + public NetworkBridgeFilter() { + } + + public NetworkBridgeFilter(BrokerId remoteBrokerPath, int networkTTL) { + this.networkBrokerId = remoteBrokerPath; + this.networkTTL = networkTTL; + } + + public byte getDataStructureType() { + return DATA_STRUCTURE_TYPE; + } + + public boolean isMarshallAware() { + return false; + } + + + public boolean matches(MessageEvaluationContext message) throws JMSException{ + try{ + return matchesForwardingFilter(message.getMessage()); + }catch(IOException e){ + throw JMSExceptionSupport.create(e); + } + } + + public Object evaluate(MessageEvaluationContext message) throws JMSException{ + return matches(message)?Boolean.TRUE:Boolean.FALSE; + } + + protected boolean matchesForwardingFilter(Message message){ + + if ( contains(message.getBrokerPath(), networkBrokerId) ){ + if (log.isTraceEnabled()){ + log.trace("Message all ready routed once through this broker - ignoring: " + message); + } + return false; + } + + int hops = message.getBrokerPath() == null ? 0 : message.getBrokerPath().length; + + if(hops >= networkTTL){ + if (log.isTraceEnabled()){ + log.trace("Message restricted to " + networkTTL + " network hops ignoring: " + message); + } + return false; + } + + // Don't propagate advisory messages about network subscriptions + if(message.isAdvisory()&&message.getDataStructure()!=null + &&message.getDataStructure().getDataStructureType()==CommandTypes.CONSUMER_INFO){ + ConsumerInfo info=(ConsumerInfo) message.getDataStructure(); + hops = info.getBrokerPath() == null ? 0 : message.getBrokerPath().length; + if(hops >= networkTTL ){ + if (log.isTraceEnabled()){ + log.trace("ConsumerInfo advisory restricted to " + networkTTL + " network hops ignoring: " + message); + } + return false; + } + } + return true; + } + + public static boolean contains(BrokerId[] brokerPath,BrokerId brokerId){ + if(brokerPath!=null){ + for(int i=0;i= networkTTL){ - if (log.isTraceEnabled()){ - log.trace("Message restricted to " + networkTTL + " network hops ignoring: " + message); - } - return false; - } - // Don't propagate advisory messages about network subscriptions - if(message.isAdvisory()&&message.getDataStructure()!=null - &&message.getDataStructure().getDataStructureType()==CommandTypes.CONSUMER_INFO){ - ConsumerInfo info=(ConsumerInfo) message.getDataStructure(); - hops = info.getBrokerPath() == null ? 0 : message.getBrokerPath().length; - if(hops >= networkTTL){ - if (log.isTraceEnabled()){ - log.trace("ConsumerInfo advisory restricted to " + networkTTL + " network hops ignoring: " + message); - } - return false; - } - } - return true; - } protected void waitStarted() throws InterruptedException { startedLatch.await(); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java index 8a7addf69e..e7c3b41b28 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQBytesMessageMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java index 5a804ea887..be16c8912d 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQDestinationMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java index a4ea019374..0a1bbfc17e 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQMapMessageMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java index b24914dc51..02ca98a50e 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQMessageMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java index cd3c016e95..79b070f520 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQObjectMessageMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java index 7ad600d2b7..c02b2c1631 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQQueueMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java index e03b3d250a..14de3e1eea 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQStreamMessageMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java index f3d22a87ba..8318d23ce5 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQTempDestinationMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java index 215f562420..55363fc14e 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQTempQueueMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java index e2d08ca186..0b3eab3788 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQTempTopicMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java index 4951c330f7..60daafb274 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQTextMessageMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java index b2f6edb571..8d5099f7e3 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ActiveMQTopicMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java index 5a49e7bba6..9588fbd4cd 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for BaseCommandMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java index c519a346bb..af4c2ad4c2 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for BrokerIdMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java index 81ebeb7e00..2601a7a521 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for BrokerInfoMarshaller * @@ -64,14 +65,14 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); BrokerInfo info = (BrokerInfo)o; - info.setBrokerId((BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setBrokerURL(tightUnmarshalString(dataIn, bs)); if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerInfo value[] = new BrokerInfo[size]; + org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerInfo) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerInfo) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setPeerBrokerInfos(value); } @@ -92,7 +93,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { BrokerInfo info = (BrokerInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getBrokerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getBrokerId(), bs); rc += tightMarshalString1(info.getBrokerURL(), bs); rc += tightMarshalObjectArray1(wireFormat, info.getPeerBrokerInfos(), bs); rc += tightMarshalString1(info.getBrokerName(), bs); @@ -112,7 +113,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); BrokerInfo info = (BrokerInfo)o; - tightMarshalCachedObject2(wireFormat, info.getBrokerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getBrokerId(), dataOut, bs); tightMarshalString2(info.getBrokerURL(), dataOut, bs); tightMarshalObjectArray2(wireFormat, info.getPeerBrokerInfos(), dataOut, bs); tightMarshalString2(info.getBrokerName(), dataOut, bs); @@ -131,14 +132,14 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); BrokerInfo info = (BrokerInfo)o; - info.setBrokerId((BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setBrokerId((org.apache.activemq.command.BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setBrokerURL(looseUnmarshalString(dataIn)); if (dataIn.readBoolean()) { short size = dataIn.readShort(); - BrokerInfo value[] = new BrokerInfo[size]; + org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerInfo) looseUnmarsalNestedObject(wireFormat,dataIn); + value[i] = (org.apache.activemq.command.BrokerInfo) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setPeerBrokerInfos(value); } @@ -159,7 +160,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { BrokerInfo info = (BrokerInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getBrokerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getBrokerId(), dataOut); looseMarshalString(info.getBrokerURL(), dataOut); looseMarshalObjectArray(wireFormat, info.getPeerBrokerInfos(), dataOut); looseMarshalString(info.getBrokerName(), dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java index f02ff5f592..8ecaebfad6 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ConnectionErrorMarshaller * @@ -64,8 +65,8 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionError info = (ConnectionError)o; - info.setException((Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs)); - info.setConnectionId((ConnectionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setException((java.lang.Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } @@ -79,7 +80,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { int rc = super.tightMarshal1(wireFormat, o, bs); rc += tightMarshalThrowable1(wireFormat, info.getException(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getConnectionId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); return rc + 0; } @@ -96,7 +97,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { ConnectionError info = (ConnectionError)o; tightMarshalThrowable2(wireFormat, info.getException(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, info.getConnectionId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); } @@ -111,8 +112,8 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); ConnectionError info = (ConnectionError)o; - info.setException((Throwable) looseUnmarsalThrowable(wireFormat, dataIn)); - info.setConnectionId((ConnectionId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setException((java.lang.Throwable) looseUnmarsalThrowable(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalNestedObject(wireFormat, dataIn)); } @@ -126,7 +127,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { super.looseMarshal(wireFormat, o, dataOut); looseMarshalThrowable(wireFormat, info.getException(), dataOut); - looseMarshalNestedObject(wireFormat, info.getConnectionId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java index c9cdc9c6b3..49f4338c35 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ConnectionIdMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java index 520a535cd1..816e88f5bc 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ConnectionInfoMarshaller * @@ -64,16 +65,16 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionInfo info = (ConnectionInfo)o; - info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setClientId(tightUnmarshalString(dataIn, bs)); info.setPassword(tightUnmarshalString(dataIn, bs)); info.setUserName(tightUnmarshalString(dataIn, bs)); if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } @@ -92,7 +93,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { ConnectionInfo info = (ConnectionInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); rc += tightMarshalString1(info.getClientId(), bs); rc += tightMarshalString1(info.getPassword(), bs); rc += tightMarshalString1(info.getUserName(), bs); @@ -112,7 +113,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); ConnectionInfo info = (ConnectionInfo)o; - tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); tightMarshalString2(info.getClientId(), dataOut, bs); tightMarshalString2(info.getPassword(), dataOut, bs); tightMarshalString2(info.getUserName(), dataOut, bs); @@ -131,16 +132,16 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); ConnectionInfo info = (ConnectionInfo)o; - info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setClientId(looseUnmarshalString(dataIn)); info.setPassword(looseUnmarshalString(dataIn)); info.setUserName(looseUnmarshalString(dataIn)); if (dataIn.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); + value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); } @@ -159,7 +160,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { ConnectionInfo info = (ConnectionInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); looseMarshalString(info.getClientId(), dataOut); looseMarshalString(info.getPassword(), dataOut); looseMarshalString(info.getUserName(), dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java index 907e8c5381..8a968890ac 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ConsumerIdMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java index 726cf0667e..2f6d3c3386 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ConsumerInfoMarshaller * @@ -64,9 +65,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConsumerInfo info = (ConsumerInfo)o; - info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setBrowser(bs.readBoolean()); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setPrefetchSize(dataIn.readInt()); info.setMaximumPendingMessageLimit(dataIn.readInt()); info.setDispatchAsync(bs.readBoolean()); @@ -79,15 +80,16 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } else { info.setBrokerPath(null); } + info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setNetworkSubscription(bs.readBoolean()); } @@ -101,9 +103,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { ConsumerInfo info = (ConsumerInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs); bs.writeBoolean(info.isBrowser()); - rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); bs.writeBoolean(info.isDispatchAsync()); rc += tightMarshalString1(info.getSelector(), bs); rc += tightMarshalString1(info.getSubcriptionName(), bs); @@ -111,6 +113,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { bs.writeBoolean(info.isExclusive()); bs.writeBoolean(info.isRetroactive()); rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getAdditionalPredicate(), bs); bs.writeBoolean(info.isNetworkSubscription()); return rc + 9; @@ -127,9 +130,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); ConsumerInfo info = (ConsumerInfo)o; - tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs); bs.readBoolean(); - tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); dataOut.writeInt(info.getPrefetchSize()); dataOut.writeInt(info.getMaximumPendingMessageLimit()); bs.readBoolean(); @@ -140,6 +143,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { bs.readBoolean(); dataOut.writeByte(info.getPriority()); tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getAdditionalPredicate(), dataOut, bs); bs.readBoolean(); } @@ -155,9 +159,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); ConsumerInfo info = (ConsumerInfo)o; - info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setBrowser(dataIn.readBoolean()); - info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setPrefetchSize(dataIn.readInt()); info.setMaximumPendingMessageLimit(dataIn.readInt()); info.setDispatchAsync(dataIn.readBoolean()); @@ -170,15 +174,16 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { if (dataIn.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); + value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); } else { info.setBrokerPath(null); } + info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) looseUnmarsalNestedObject(wireFormat, dataIn)); info.setNetworkSubscription(dataIn.readBoolean()); } @@ -192,9 +197,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { ConsumerInfo info = (ConsumerInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut); dataOut.writeBoolean(info.isBrowser()); - looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); dataOut.writeInt(info.getPrefetchSize()); dataOut.writeInt(info.getMaximumPendingMessageLimit()); dataOut.writeBoolean(info.isDispatchAsync()); @@ -205,6 +210,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { dataOut.writeBoolean(info.isRetroactive()); dataOut.writeByte(info.getPriority()); looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getAdditionalPredicate(), dataOut); dataOut.writeBoolean(info.isNetworkSubscription()); } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java index 665bb3cee7..12aec552e5 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ControlCommandMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java index 2cab60a1f0..636907f9a0 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for DataArrayResponseMarshaller * @@ -67,9 +68,9 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { if (bs.readBoolean()) { short size = dataIn.readShort(); - DataStructure value[] = new DataStructure[size]; + org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size]; for( int i=0; i < size; i++ ) { - value[i] = (DataStructure) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setData(value); } @@ -122,9 +123,9 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { if (dataIn.readBoolean()) { short size = dataIn.readShort(); - DataStructure value[] = new DataStructure[size]; + org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size]; for( int i=0; i < size; i++ ) { - value[i] = (DataStructure) looseUnmarsalNestedObject(wireFormat,dataIn); + value[i] = (org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setData(value); } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java index 804de8ae1b..532832ea86 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for DataResponseMarshaller * @@ -64,7 +65,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); DataResponse info = (DataResponse)o; - info.setData((DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setData((org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } @@ -77,7 +78,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { DataResponse info = (DataResponse)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalNestedObject1(wireFormat, info.getData(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getData(), bs); return rc + 0; } @@ -93,7 +94,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); DataResponse info = (DataResponse)o; - tightMarshalNestedObject2(wireFormat, info.getData(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getData(), dataOut, bs); } @@ -108,7 +109,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); DataResponse info = (DataResponse)o; - info.setData((DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setData((org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn)); } @@ -121,7 +122,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { DataResponse info = (DataResponse)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalNestedObject(wireFormat, info.getData(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getData(), dataOut); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java index ec6a7d483f..2a454f72dc 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for DestinationInfoMarshaller * @@ -64,16 +65,16 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); DestinationInfo info = (DestinationInfo)o; - info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setOperationType(dataIn.readByte()); info.setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs)); if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } @@ -92,8 +93,8 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { DestinationInfo info = (DestinationInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); rc+=tightMarshalLong1(wireFormat, info.getTimeout(), bs); rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs); @@ -111,8 +112,8 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); DestinationInfo info = (DestinationInfo)o; - tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); dataOut.writeByte(info.getOperationType()); tightMarshalLong2(wireFormat, info.getTimeout(), dataOut, bs); tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs); @@ -130,16 +131,16 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); DestinationInfo info = (DestinationInfo)o; - info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setOperationType(dataIn.readByte()); info.setTimeout(looseUnmarshalLong(wireFormat, dataIn)); if (dataIn.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); + value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); } @@ -158,8 +159,8 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { DestinationInfo info = (DestinationInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut); - looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); dataOut.writeByte(info.getOperationType()); looseMarshalLong(wireFormat, info.getTimeout(), dataOut); looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java index ee09197935..170bb48171 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for DiscoveryEventMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java index 8101cd7d3b..067b3cf2d6 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ExceptionResponseMarshaller * @@ -64,7 +65,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); ExceptionResponse info = (ExceptionResponse)o; - info.setException((Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs)); + info.setException((java.lang.Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs)); } @@ -108,7 +109,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); ExceptionResponse info = (ExceptionResponse)o; - info.setException((Throwable) looseUnmarsalThrowable(wireFormat, dataIn)); + info.setException((java.lang.Throwable) looseUnmarsalThrowable(wireFormat, dataIn)); } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java index b60b9de8cf..4140585f7c 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for FlushCommandMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java index ab26ad09ee..4bd0ba5c2c 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for IntegerResponseMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java index 58d19aac00..2c87dd9937 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for JournalQueueAckMarshaller * @@ -64,8 +65,8 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalQueueAck info = (JournalQueueAck)o; - info.setDestination((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setMessageAck((MessageAck) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageAck((org.apache.activemq.command.MessageAck) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } @@ -78,8 +79,8 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { JournalQueueAck info = (JournalQueueAck)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalNestedObject1(wireFormat, info.getDestination(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getMessageAck(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageAck(), bs); return rc + 0; } @@ -95,8 +96,8 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalQueueAck info = (JournalQueueAck)o; - tightMarshalNestedObject2(wireFormat, info.getDestination(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, info.getMessageAck(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageAck(), dataOut, bs); } @@ -111,8 +112,8 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); JournalQueueAck info = (JournalQueueAck)o; - info.setDestination((ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn)); - info.setMessageAck((MessageAck) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setMessageAck((org.apache.activemq.command.MessageAck) looseUnmarsalNestedObject(wireFormat, dataIn)); } @@ -125,8 +126,8 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { JournalQueueAck info = (JournalQueueAck)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalNestedObject(wireFormat, info.getDestination(), dataOut); - looseMarshalNestedObject(wireFormat, info.getMessageAck(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageAck(), dataOut); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java index 649c796ce9..365905d5bb 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for JournalTopicAckMarshaller * @@ -64,12 +65,12 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalTopicAck info = (JournalTopicAck)o; - info.setDestination((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setSubscritionName(tightUnmarshalString(dataIn, bs)); info.setClientId(tightUnmarshalString(dataIn, bs)); - info.setTransactionId((TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } @@ -82,12 +83,12 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { JournalTopicAck info = (JournalTopicAck)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalNestedObject1(wireFormat, info.getDestination(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); rc+=tightMarshalLong1(wireFormat, info.getMessageSequenceId(), bs); rc += tightMarshalString1(info.getSubscritionName(), bs); rc += tightMarshalString1(info.getClientId(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getTransactionId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); return rc + 0; } @@ -103,12 +104,12 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTopicAck info = (JournalTopicAck)o; - tightMarshalNestedObject2(wireFormat, info.getDestination(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs); tightMarshalLong2(wireFormat, info.getMessageSequenceId(), dataOut, bs); tightMarshalString2(info.getSubscritionName(), dataOut, bs); tightMarshalString2(info.getClientId(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, info.getTransactionId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); } @@ -123,12 +124,12 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); JournalTopicAck info = (JournalTopicAck)o; - info.setDestination((ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn)); - info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); info.setMessageSequenceId(looseUnmarshalLong(wireFormat, dataIn)); info.setSubscritionName(looseUnmarshalString(dataIn)); info.setClientId(looseUnmarshalString(dataIn)); - info.setTransactionId((TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn)); } @@ -141,12 +142,12 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { JournalTopicAck info = (JournalTopicAck)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalNestedObject(wireFormat, info.getDestination(), dataOut); - looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut); looseMarshalLong(wireFormat, info.getMessageSequenceId(), dataOut); looseMarshalString(info.getSubscritionName(), dataOut); looseMarshalString(info.getClientId(), dataOut); - looseMarshalNestedObject(wireFormat, info.getTransactionId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java index c46158eafa..232b55f2c3 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for JournalTraceMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java index c64de8741c..8db84f32e8 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for JournalTransactionMarshaller * @@ -64,7 +65,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalTransaction info = (JournalTransaction)o; - info.setTransactionId((TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setType(dataIn.readByte()); info.setWasPrepared(bs.readBoolean()); @@ -79,7 +80,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { JournalTransaction info = (JournalTransaction)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalNestedObject1(wireFormat, info.getTransactionId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); bs.writeBoolean(info.getWasPrepared()); return rc + 1; @@ -96,7 +97,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTransaction info = (JournalTransaction)o; - tightMarshalNestedObject2(wireFormat, info.getTransactionId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); dataOut.writeByte(info.getType()); bs.readBoolean(); @@ -113,7 +114,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); JournalTransaction info = (JournalTransaction)o; - info.setTransactionId((TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn)); info.setType(dataIn.readByte()); info.setWasPrepared(dataIn.readBoolean()); @@ -128,7 +129,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { JournalTransaction info = (JournalTransaction)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalNestedObject(wireFormat, info.getTransactionId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); dataOut.writeByte(info.getType()); dataOut.writeBoolean(info.getWasPrepared()); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java index e8e1ad8471..7b263527de 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for KeepAliveInfoMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java index 0b98fa9817..174ebd74bb 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller * @@ -65,7 +66,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { LocalTransactionId info = (LocalTransactionId)o; info.setValue(tightUnmarshalLong(wireFormat, dataIn, bs)); - info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } @@ -79,7 +80,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { int rc = super.tightMarshal1(wireFormat, o, bs); rc+=tightMarshalLong1(wireFormat, info.getValue(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); return rc + 0; } @@ -96,7 +97,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { LocalTransactionId info = (LocalTransactionId)o; tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); } @@ -112,7 +113,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { LocalTransactionId info = (LocalTransactionId)o; info.setValue(looseUnmarshalLong(wireFormat, dataIn)); - info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); } @@ -126,7 +127,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { super.looseMarshal(wireFormat, o, dataOut); looseMarshalLong(wireFormat, info.getValue(), dataOut); - looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java index 085cc5d531..eb220f5c72 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java @@ -39,52 +39,53 @@ public class MarshallerFactory { static final private DataStreamMarshaller marshaller[] = new DataStreamMarshaller[256]; static { - add(new MessageIdMarshaller()); - add(new BrokerInfoMarshaller()); - add(new ActiveMQTempQueueMarshaller()); add(new LocalTransactionIdMarshaller()); - add(new RemoveSubscriptionInfoMarshaller()); add(new IntegerResponseMarshaller()); add(new ActiveMQQueueMarshaller()); - add(new DestinationInfoMarshaller()); - add(new ActiveMQBytesMessageMarshaller()); - add(new ShutdownInfoMarshaller()); - add(new DataResponseMarshaller()); - add(new SessionIdMarshaller()); - add(new DataArrayResponseMarshaller()); - add(new JournalQueueAckMarshaller()); - add(new WireFormatInfoMarshaller()); - add(new ResponseMarshaller()); - add(new ConnectionErrorMarshaller()); add(new ActiveMQObjectMessageMarshaller()); - add(new ConsumerInfoMarshaller()); - add(new ActiveMQTempTopicMarshaller()); add(new ConnectionIdMarshaller()); - add(new DiscoveryEventMarshaller()); add(new ConnectionInfoMarshaller()); - add(new KeepAliveInfoMarshaller()); - add(new XATransactionIdMarshaller()); - add(new JournalTraceMarshaller()); - add(new FlushCommandMarshaller()); - add(new ConsumerIdMarshaller()); - add(new JournalTopicAckMarshaller()); - add(new ActiveMQTextMessageMarshaller()); - add(new BrokerIdMarshaller()); - add(new MessageDispatchMarshaller()); add(new ProducerInfoMarshaller()); - add(new SubscriptionInfoMarshaller()); - add(new ActiveMQMapMessageMarshaller()); add(new MessageDispatchNotificationMarshaller()); add(new SessionInfoMarshaller()); - add(new ActiveMQMessageMarshaller()); add(new TransactionInfoMarshaller()); add(new ActiveMQStreamMessageMarshaller()); add(new MessageAckMarshaller()); add(new ProducerIdMarshaller()); - add(new ActiveMQTopicMarshaller()); + add(new MessageIdMarshaller()); + add(new ActiveMQTempQueueMarshaller()); + add(new RemoveSubscriptionInfoMarshaller()); + add(new SessionIdMarshaller()); + add(new DataArrayResponseMarshaller()); + add(new JournalQueueAckMarshaller()); + add(new ResponseMarshaller()); + add(new ConnectionErrorMarshaller()); + add(new ConsumerInfoMarshaller()); + add(new XATransactionIdMarshaller()); + add(new JournalTraceMarshaller()); + add(new ConsumerIdMarshaller()); + add(new ActiveMQTextMessageMarshaller()); + add(new SubscriptionInfoMarshaller()); add(new JournalTransactionMarshaller()); - add(new RemoveInfoMarshaller()); add(new ControlCommandMarshaller()); + add(new NetworkBridgeFilterMarshaller()); + add(new ActiveMQBytesMessageMarshaller()); + add(new WireFormatInfoMarshaller()); + add(new ActiveMQTempTopicMarshaller()); + add(new DiscoveryEventMarshaller()); + add(new ActiveMQTopicMarshaller()); + add(new BrokerInfoMarshaller()); + add(new DestinationInfoMarshaller()); + add(new ShutdownInfoMarshaller()); + add(new DataResponseMarshaller()); + add(new KeepAliveInfoMarshaller()); + add(new FlushCommandMarshaller()); + add(new JournalTopicAckMarshaller()); + add(new BrokerIdMarshaller()); + add(new MessageDispatchMarshaller()); + add(new ActiveMQMapMessageMarshaller()); + add(new ActiveMQMessageMarshaller()); + add(new RemoveInfoMarshaller()); add(new ExceptionResponseMarshaller()); } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java index 5b5d260d42..62ff45c797 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for MessageAckMarshaller * @@ -64,12 +65,12 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageAck info = (MessageAck)o; - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setAckType(dataIn.readByte()); - info.setFirstMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setLastMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setFirstMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setLastMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageCount(dataIn.readInt()); } @@ -83,11 +84,11 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { MessageAck info = (MessageAck)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getFirstMessageId(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getLastMessageId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getFirstMessageId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getLastMessageId(), bs); return rc + 5; } @@ -103,12 +104,12 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageAck info = (MessageAck)o; - tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs); dataOut.writeByte(info.getAckType()); - tightMarshalNestedObject2(wireFormat, info.getFirstMessageId(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, info.getLastMessageId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getFirstMessageId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getLastMessageId(), dataOut, bs); dataOut.writeInt(info.getMessageCount()); } @@ -124,12 +125,12 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); MessageAck info = (MessageAck)o; - info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setAckType(dataIn.readByte()); - info.setFirstMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); - info.setLastMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setFirstMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setLastMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); info.setMessageCount(dataIn.readInt()); } @@ -143,12 +144,12 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { MessageAck info = (MessageAck)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut); - looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut); - looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut); dataOut.writeByte(info.getAckType()); - looseMarshalNestedObject(wireFormat, info.getFirstMessageId(), dataOut); - looseMarshalNestedObject(wireFormat, info.getLastMessageId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getFirstMessageId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getLastMessageId(), dataOut); dataOut.writeInt(info.getMessageCount()); } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java index a56eb86ca1..6e5c6702e4 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for MessageDispatchMarshaller * @@ -64,9 +65,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageDispatch info = (MessageDispatch)o; - info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setMessage((Message) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setMessage((org.apache.activemq.command.Message) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setRedeliveryCounter(dataIn.readInt()); } @@ -80,9 +81,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { MessageDispatch info = (MessageDispatch)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getMessage(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessage(), bs); return rc + 4; } @@ -98,9 +99,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageDispatch info = (MessageDispatch)o; - tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, info.getMessage(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessage(), dataOut, bs); dataOut.writeInt(info.getRedeliveryCounter()); } @@ -116,9 +117,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); MessageDispatch info = (MessageDispatch)o; - info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setMessage((Message) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setMessage((org.apache.activemq.command.Message) looseUnmarsalNestedObject(wireFormat, dataIn)); info.setRedeliveryCounter(dataIn.readInt()); } @@ -132,9 +133,9 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { MessageDispatch info = (MessageDispatch)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut); - looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut); - looseMarshalNestedObject(wireFormat, info.getMessage(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessage(), dataOut); dataOut.writeInt(info.getRedeliveryCounter()); } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java index c6cbb40c95..53557290b2 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for MessageDispatchNotificationMarshaller * @@ -64,10 +65,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageDispatchNotification info = (MessageDispatchNotification)o; - info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setDeliverySequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); - info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } @@ -80,10 +81,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller MessageDispatchNotification info = (MessageDispatchNotification)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); rc+=tightMarshalLong1(wireFormat, info.getDeliverySequenceId(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); return rc + 0; } @@ -99,10 +100,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller super.tightMarshal2(wireFormat, o, dataOut, bs); MessageDispatchNotification info = (MessageDispatchNotification)o; - tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); tightMarshalLong2(wireFormat, info.getDeliverySequenceId(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs); } @@ -117,10 +118,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller super.looseUnmarshal(wireFormat, o, dataIn); MessageDispatchNotification info = (MessageDispatchNotification)o; - info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setDeliverySequenceId(looseUnmarshalLong(wireFormat, dataIn)); - info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); } @@ -133,10 +134,10 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller MessageDispatchNotification info = (MessageDispatchNotification)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut); - looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); looseMarshalLong(wireFormat, info.getDeliverySequenceId(), dataOut); - looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java index b5dc055589..0cd5c7b0c0 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for MessageIdMarshaller * @@ -64,7 +65,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageId info = (MessageId)o; - info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setBrokerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); @@ -79,7 +80,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { MessageId info = (MessageId)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getProducerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs); rc+=tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs); rc+=tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs); @@ -97,7 +98,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageId info = (MessageId)o; - tightMarshalCachedObject2(wireFormat, info.getProducerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs); tightMarshalLong2(wireFormat, info.getProducerSequenceId(), dataOut, bs); tightMarshalLong2(wireFormat, info.getBrokerSequenceId(), dataOut, bs); @@ -114,7 +115,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); MessageId info = (MessageId)o; - info.setProducerId((ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn)); info.setBrokerSequenceId(looseUnmarshalLong(wireFormat, dataIn)); @@ -129,7 +130,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { MessageId info = (MessageId)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getProducerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut); looseMarshalLong(wireFormat, info.getProducerSequenceId(), dataOut); looseMarshalLong(wireFormat, info.getBrokerSequenceId(), dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java index 896017c4db..51e51fef0a 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for MessageMarshaller * @@ -52,33 +53,33 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { info.beforeUnmarshall(wireFormat); - info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setOriginalDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setOriginalTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setGroupID(tightUnmarshalString(dataIn, bs)); info.setGroupSequence(dataIn.readInt()); info.setCorrelationId(tightUnmarshalString(dataIn, bs)); info.setPersistent(bs.readBoolean()); info.setExpiration(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setPriority(dataIn.readByte()); - info.setReplyTo((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setTimestamp(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setType(tightUnmarshalString(dataIn, bs)); info.setContent(tightUnmarshalByteSequence(dataIn, bs)); info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs)); - info.setDataStructure((DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setTargetConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDataStructure((org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setCompressed(bs.readBoolean()); info.setRedeliveryCounter(dataIn.readInt()); if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } @@ -104,23 +105,23 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { info.beforeMarshall(wireFormat); int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getProducerId(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getOriginalDestination(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getOriginalTransactionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalTransactionId(), bs); rc += tightMarshalString1(info.getGroupID(), bs); rc += tightMarshalString1(info.getCorrelationId(), bs); bs.writeBoolean(info.isPersistent()); rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getReplyTo(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs); rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs); rc += tightMarshalString1(info.getType(), bs); rc += tightMarshalByteSequence1(info.getContent(), bs); rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs); - rc += tightMarshalNestedObject1(wireFormat, info.getDataStructure(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getTargetConsumerId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs); bs.writeBoolean(info.isCompressed()); rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs); rc+=tightMarshalLong1(wireFormat, info.getArrival(), bs); @@ -141,25 +142,25 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); Message info = (Message)o; - tightMarshalCachedObject2(wireFormat, info.getProducerId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getOriginalDestination(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getOriginalTransactionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs); tightMarshalString2(info.getGroupID(), dataOut, bs); dataOut.writeInt(info.getGroupSequence()); tightMarshalString2(info.getCorrelationId(), dataOut, bs); bs.readBoolean(); tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs); dataOut.writeByte(info.getPriority()); - tightMarshalNestedObject2(wireFormat, info.getReplyTo(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs); tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs); tightMarshalString2(info.getType(), dataOut, bs); tightMarshalByteSequence2(info.getContent(), dataOut, bs); tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, info.getDataStructure(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getTargetConsumerId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs); bs.readBoolean(); dataOut.writeInt(info.getRedeliveryCounter()); tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs); @@ -185,33 +186,33 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { info.beforeUnmarshall(wireFormat); - info.setProducerId((ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setOriginalDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); - info.setOriginalTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setGroupID(looseUnmarshalString(dataIn)); info.setGroupSequence(dataIn.readInt()); info.setCorrelationId(looseUnmarshalString(dataIn)); info.setPersistent(dataIn.readBoolean()); info.setExpiration(looseUnmarshalLong(wireFormat, dataIn)); info.setPriority(dataIn.readByte()); - info.setReplyTo((ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn)); info.setTimestamp(looseUnmarshalLong(wireFormat, dataIn)); info.setType(looseUnmarshalString(dataIn)); info.setContent(looseUnmarshalByteSequence(dataIn)); info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn)); - info.setDataStructure((DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn)); - info.setTargetConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDataStructure((org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setCompressed(dataIn.readBoolean()); info.setRedeliveryCounter(dataIn.readInt()); if (dataIn.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); + value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); } @@ -237,25 +238,25 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { info.beforeMarshall(wireFormat); super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getProducerId(), dataOut); - looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut); - looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut); - looseMarshalCachedObject(wireFormat, info.getOriginalDestination(), dataOut); - looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut); - looseMarshalCachedObject(wireFormat, info.getOriginalTransactionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut); looseMarshalString(info.getGroupID(), dataOut); dataOut.writeInt(info.getGroupSequence()); looseMarshalString(info.getCorrelationId(), dataOut); dataOut.writeBoolean(info.isPersistent()); looseMarshalLong(wireFormat, info.getExpiration(), dataOut); dataOut.writeByte(info.getPriority()); - looseMarshalNestedObject(wireFormat, info.getReplyTo(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut); looseMarshalLong(wireFormat, info.getTimestamp(), dataOut); looseMarshalString(info.getType(), dataOut); looseMarshalByteSequence(wireFormat, info.getContent(), dataOut); looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut); - looseMarshalNestedObject(wireFormat, info.getDataStructure(), dataOut); - looseMarshalCachedObject(wireFormat, info.getTargetConsumerId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut); dataOut.writeBoolean(info.isCompressed()); dataOut.writeInt(info.getRedeliveryCounter()); looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java new file mode 100644 index 0000000000..91c48bc5ac --- /dev/null +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java @@ -0,0 +1 @@ +/** * * 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. */ package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; /** * Marshalling code for Open Wire Format for NetworkBridgeFilterMarshaller * * * NOTE!: This file is auto generated - do not modify! * if you need to make a change, please see the modify the groovy scripts in the * under src/gram/script and then use maven openwire:generate to regenerate * this file. * * @version $Revision$ */ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { /** * Return the type of Data Structure we marshal * @return short representation of the type data structure */ public byte getDataStructureType() { return NetworkBridgeFilter.DATA_STRUCTURE_TYPE; } /** * @return a new object instance */ public DataStructure createObject() { return new NetworkBridgeFilter(); } /** * Un-marshal an object instance from the data input stream * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); NetworkBridgeFilter info = (NetworkBridgeFilter)o; info.setNetworkTTL(dataIn.readInt()); info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } /** * Write the booleans that this object uses to a BooleanStream */ public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException { NetworkBridgeFilter info = (NetworkBridgeFilter)o; int rc = super.tightMarshal1(wireFormat, o, bs); rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getNetworkBrokerId(), bs); return rc + 4; } /** * Write a object instance to data output stream * * @param o the instance to be marshaled * @param dataOut the output stream * @throws IOException thrown if an error occurs */ public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); NetworkBridgeFilter info = (NetworkBridgeFilter)o; dataOut.writeInt(info.getNetworkTTL()); tightMarshalCachedObject2(wireFormat, (DataStructure)info.getNetworkBrokerId(), dataOut, bs); } /** * Un-marshal an object instance from the data input stream * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); NetworkBridgeFilter info = (NetworkBridgeFilter)o; info.setNetworkTTL(dataIn.readInt()); info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn)); } /** * Write the booleans that this object uses to a BooleanStream */ public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { NetworkBridgeFilter info = (NetworkBridgeFilter)o; super.looseMarshal(wireFormat, o, dataOut); dataOut.writeInt(info.getNetworkTTL()); looseMarshalCachedObject(wireFormat, (DataStructure)info.getNetworkBrokerId(), dataOut); } } \ No newline at end of file diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java index cb69be9305..8b25cd9709 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ProducerIdMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java index 7b64aa4c41..cc4135f6b8 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ProducerInfoMarshaller * @@ -64,14 +65,14 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); ProducerInfo info = (ProducerInfo)o; - info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } @@ -90,8 +91,8 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { ProducerInfo info = (ProducerInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getProducerId(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs); return rc + 0; @@ -108,8 +109,8 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); ProducerInfo info = (ProducerInfo)o; - tightMarshalCachedObject2(wireFormat, info.getProducerId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs); } @@ -125,14 +126,14 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); ProducerInfo info = (ProducerInfo)o; - info.setProducerId((ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); if (dataIn.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); + value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); } @@ -151,8 +152,8 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { ProducerInfo info = (ProducerInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getProducerId(), dataOut); - looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut); } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java index 743fbd8817..a33f8bc969 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for RemoveInfoMarshaller * @@ -64,7 +65,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); RemoveInfo info = (RemoveInfo)o; - info.setObjectId((DataStructure) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setObjectId((org.apache.activemq.command.DataStructure) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } @@ -77,7 +78,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { RemoveInfo info = (RemoveInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getObjectId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getObjectId(), bs); return rc + 0; } @@ -93,7 +94,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); RemoveInfo info = (RemoveInfo)o; - tightMarshalCachedObject2(wireFormat, info.getObjectId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getObjectId(), dataOut, bs); } @@ -108,7 +109,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); RemoveInfo info = (RemoveInfo)o; - info.setObjectId((DataStructure) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setObjectId((org.apache.activemq.command.DataStructure) looseUnmarsalCachedObject(wireFormat, dataIn)); } @@ -121,7 +122,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { RemoveInfo info = (RemoveInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getObjectId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getObjectId(), dataOut); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java index a179e888de..aac26c69b3 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for RemoveSubscriptionInfoMarshaller * @@ -64,7 +65,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; - info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setSubcriptionName(tightUnmarshalString(dataIn, bs)); info.setClientId(tightUnmarshalString(dataIn, bs)); @@ -79,7 +80,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); rc += tightMarshalString1(info.getSubcriptionName(), bs); rc += tightMarshalString1(info.getClientId(), bs); @@ -97,7 +98,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; - tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); tightMarshalString2(info.getSubcriptionName(), dataOut, bs); tightMarshalString2(info.getClientId(), dataOut, bs); @@ -114,7 +115,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; - info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setSubcriptionName(looseUnmarshalString(dataIn)); info.setClientId(looseUnmarshalString(dataIn)); @@ -129,7 +130,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); looseMarshalString(info.getSubcriptionName(), dataOut); looseMarshalString(info.getClientId(), dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java index 2ad4104368..89b65a480a 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ResponseMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java index 7169befe68..a28f50ba5f 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for SessionIdMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java index d86c446b29..5d33a80b5a 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for SessionInfoMarshaller * @@ -64,7 +65,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); SessionInfo info = (SessionInfo)o; - info.setSessionId((SessionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setSessionId((org.apache.activemq.command.SessionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } @@ -77,7 +78,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { SessionInfo info = (SessionInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getSessionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getSessionId(), bs); return rc + 0; } @@ -93,7 +94,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); SessionInfo info = (SessionInfo)o; - tightMarshalCachedObject2(wireFormat, info.getSessionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getSessionId(), dataOut, bs); } @@ -108,7 +109,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); SessionInfo info = (SessionInfo)o; - info.setSessionId((SessionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setSessionId((org.apache.activemq.command.SessionId) looseUnmarsalCachedObject(wireFormat, dataIn)); } @@ -121,7 +122,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { SessionInfo info = (SessionInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getSessionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getSessionId(), dataOut); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java index 574bdd8610..30acc7b003 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for ShutdownInfoMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java index f797f1880a..86db0b7230 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for SubscriptionInfoMarshaller * @@ -65,7 +66,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { SubscriptionInfo info = (SubscriptionInfo)o; info.setClientId(tightUnmarshalString(dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setSelector(tightUnmarshalString(dataIn, bs)); info.setSubcriptionName(tightUnmarshalString(dataIn, bs)); @@ -81,7 +82,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { int rc = super.tightMarshal1(wireFormat, o, bs); rc += tightMarshalString1(info.getClientId(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); rc += tightMarshalString1(info.getSelector(), bs); rc += tightMarshalString1(info.getSubcriptionName(), bs); @@ -100,7 +101,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { SubscriptionInfo info = (SubscriptionInfo)o; tightMarshalString2(info.getClientId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); tightMarshalString2(info.getSelector(), dataOut, bs); tightMarshalString2(info.getSubcriptionName(), dataOut, bs); @@ -118,7 +119,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { SubscriptionInfo info = (SubscriptionInfo)o; info.setClientId(looseUnmarshalString(dataIn)); - info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setSelector(looseUnmarshalString(dataIn)); info.setSubcriptionName(looseUnmarshalString(dataIn)); @@ -134,7 +135,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { super.looseMarshal(wireFormat, o, dataOut); looseMarshalString(info.getClientId(), dataOut); - looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); looseMarshalString(info.getSelector(), dataOut); looseMarshalString(info.getSubcriptionName(), dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java index ac2093cdf4..dc23835a24 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for TransactionIdMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java index 7a590c5073..1ed91f82d8 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for TransactionInfoMarshaller * @@ -64,8 +65,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); TransactionInfo info = (TransactionInfo)o; - info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setType(dataIn.readByte()); } @@ -79,8 +80,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { TransactionInfo info = (TransactionInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs); - rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); return rc + 1; } @@ -96,8 +97,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { super.tightMarshal2(wireFormat, o, dataOut, bs); TransactionInfo info = (TransactionInfo)o; - tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); dataOut.writeByte(info.getType()); } @@ -113,8 +114,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); TransactionInfo info = (TransactionInfo)o; - info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setType(dataIn.readByte()); } @@ -128,8 +129,8 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { TransactionInfo info = (TransactionInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut); - looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); dataOut.writeByte(info.getType()); } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java index 2c2befb08f..7f6bfb5594 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for WireFormatInfoMarshaller * @@ -64,13 +65,14 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); WireFormatInfo info = (WireFormatInfo)o; + + info.beforeUnmarshall(wireFormat); + info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8)); info.setVersion(dataIn.readInt()); - info.setCacheEnabled(bs.readBoolean()); - info.setStackTraceEnabled(bs.readBoolean()); - info.setTcpNoDelayEnabled(bs.readBoolean()); - info.setPrefixPacketSize(bs.readBoolean()); - info.setTightEncodingEnabled(bs.readBoolean()); + info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs)); + + info.afterUnmarshall(wireFormat); } @@ -82,13 +84,11 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { WireFormatInfo info = (WireFormatInfo)o; + info.beforeMarshall(wireFormat); + int rc = super.tightMarshal1(wireFormat, o, bs); rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8); - bs.writeBoolean(info.isCacheEnabled()); - bs.writeBoolean(info.isStackTraceEnabled()); - bs.writeBoolean(info.isTcpNoDelayEnabled()); - bs.writeBoolean(info.isPrefixPacketSize()); - bs.writeBoolean(info.isTightEncodingEnabled()); + rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs); return rc + 4; } @@ -106,11 +106,9 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { WireFormatInfo info = (WireFormatInfo)o; tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8); dataOut.writeInt(info.getVersion()); - bs.readBoolean(); - bs.readBoolean(); - bs.readBoolean(); - bs.readBoolean(); - bs.readBoolean(); + tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs); + + info.afterMarshall(wireFormat); } @@ -125,13 +123,14 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); WireFormatInfo info = (WireFormatInfo)o; + + info.beforeUnmarshall(wireFormat); + info.setMagic(looseUnmarshalConstByteArray(dataIn, 8)); info.setVersion(dataIn.readInt()); - info.setCacheEnabled(dataIn.readBoolean()); - info.setStackTraceEnabled(dataIn.readBoolean()); - info.setTcpNoDelayEnabled(dataIn.readBoolean()); - info.setPrefixPacketSize(dataIn.readBoolean()); - info.setTightEncodingEnabled(dataIn.readBoolean()); + info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn)); + + info.afterUnmarshall(wireFormat); } @@ -143,14 +142,12 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { WireFormatInfo info = (WireFormatInfo)o; + info.beforeMarshall(wireFormat); + super.looseMarshal(wireFormat, o, dataOut); looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8); dataOut.writeInt(info.getVersion()); - dataOut.writeBoolean(info.isCacheEnabled()); - dataOut.writeBoolean(info.isStackTraceEnabled()); - dataOut.writeBoolean(info.isTcpNoDelayEnabled()); - dataOut.writeBoolean(info.isPrefixPacketSize()); - dataOut.writeBoolean(info.isTightEncodingEnabled()); + looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java index 9185a4e0e4..f6628e49eb 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java @@ -25,6 +25,7 @@ import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; + /** * Marshalling code for Open Wire Format for XATransactionIdMarshaller * diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java b/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java index 95ceff9b37..ce7937af10 100755 --- a/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java @@ -69,7 +69,7 @@ public class WireFormatNegotiator extends TransportFilter { super.oneway(command); } - protected WireFormatInfo createWireFormatInfo() { + protected WireFormatInfo createWireFormatInfo() throws IOException { WireFormatInfo info = new WireFormatInfo(); info.setVersion(wireFormat.getVersion()); if ( wireFormat instanceof OpenWireFormat ) { @@ -98,20 +98,24 @@ public class WireFormatNegotiator extends TransportFilter { wireFormat.setVersion(info.getVersion()); } if ( wireFormat instanceof OpenWireFormat ) { - if( !info.isStackTraceEnabled() ) { - ((OpenWireFormat)wireFormat).setStackTraceEnabled(false); - } - if( info.isTcpNoDelayEnabled() ) { - ((OpenWireFormat)wireFormat).setTcpNoDelayEnabled(true); - } - if( !info.isCacheEnabled() ) { - ((OpenWireFormat)wireFormat).setCacheEnabled(false); - } - if( !info.isPrefixPacketSize() ) { - ((OpenWireFormat)wireFormat).setPrefixPacketSize(false); - } - if( !info.isTightEncodingEnabled() ) { - ((OpenWireFormat)wireFormat).setTightEncodingEnabled(false); + try { + if( !info.isStackTraceEnabled() ) { + ((OpenWireFormat)wireFormat).setStackTraceEnabled(false); + } + if( info.isTcpNoDelayEnabled() ) { + ((OpenWireFormat)wireFormat).setTcpNoDelayEnabled(true); + } + if( !info.isCacheEnabled() ) { + ((OpenWireFormat)wireFormat).setCacheEnabled(false); + } + if( !info.isPrefixPacketSize() ) { + ((OpenWireFormat)wireFormat).setPrefixPacketSize(false); + } + if( !info.isTightEncodingEnabled() ) { + ((OpenWireFormat)wireFormat).setTightEncodingEnabled(false); + } + } catch (IOException e) { + commandListener.onException(e); } } diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java index a0364dda74..492e676f2d 100755 --- a/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java @@ -54,13 +54,13 @@ public class ActiveIOTransport implements Transport { public void onCommand(Object command) { if (command.getClass() == WireFormatInfo.class) { WireFormatInfo info = (WireFormatInfo) command; - if (info.isTcpNoDelayEnabled()) { - try { + try { + if (info.isTcpNoDelayEnabled()) { enableTcpNodeDelay(); } - catch (SocketException e) { - onError(e); - } + } + catch (IOException e) { + onError(e); } } transportListener.onCommand((Command) command); diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java index 0db39bb0f0..40ebc24c28 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java @@ -16,6 +16,24 @@ */ package org.apache.activemq.openwire; +import java.beans.BeanInfo; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.lang.reflect.Array; +import java.lang.reflect.Method; +import java.net.URI; +import java.net.URL; +import java.util.HashSet; +import java.util.Set; + import org.activeio.ByteSequence; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; @@ -29,34 +47,16 @@ import org.apache.activemq.command.LocalTransactionId; import org.apache.activemq.command.Message; import org.apache.activemq.command.MessageAck; import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.NetworkBridgeFilter; import org.apache.activemq.command.ProducerId; import org.apache.activemq.command.SessionId; import org.apache.activemq.command.TransactionId; +import org.apache.activemq.filter.BooleanExpression; import org.apache.activemq.openwire.v1.ActiveMQTextMessageTest; import org.apache.activemq.openwire.v1.BrokerInfoTest; import org.apache.activemq.openwire.v1.MessageAckTest; import org.apache.activemq.test.TestSupport; -import java.beans.BeanInfo; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.lang.reflect.Array; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.URI; -import java.net.URL; -import java.util.*; - -import junit.framework.TestCase; - public abstract class DataFileGeneratorTestSupport extends TestSupport { protected static final Object[] EMPTY_ARGUMENTS = {}; @@ -316,4 +316,9 @@ public abstract class DataFileGeneratorTestSupport extends TestSupport { // exception each time return singletonException; } + + protected BooleanExpression createBooleanExpression(String string) { + return new NetworkBridgeFilter(new BrokerId(string), 10); + } + } diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java index 2dea939d77..d55607e722 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java @@ -70,6 +70,7 @@ public class ConsumerInfoTest extends BaseCommandTestSupport { } info.setBrokerPath(value); } + info.setAdditionalPredicate(createBooleanExpression("AdditionalPredicate:6")); info.setNetworkSubscription(false); } diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java new file mode 100644 index 0000000000..38edcb2154 --- /dev/null +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java @@ -0,0 +1 @@ +/** * * 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. */ package org.apache.activemq.openwire.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; /** * Test case for the OpenWire marshalling for NetworkBridgeFilter * * * NOTE!: This file is auto generated - do not modify! * if you need to make a change, please see the modify the groovy scripts in the * under src/gram/script and then use maven openwire:generate to regenerate * this file. * * @version $Revision: $ */ public class NetworkBridgeFilterTest extends DataFileGeneratorTestSupport { public static NetworkBridgeFilterTest SINGLETON = new NetworkBridgeFilterTest(); public Object createObject() throws Exception { NetworkBridgeFilter info = new NetworkBridgeFilter(); populateObject(info); return info; } protected void populateObject(Object object) throws Exception { super.populateObject(object); NetworkBridgeFilter info = (NetworkBridgeFilter) object; info.setNetworkTTL(1); info.setNetworkBrokerId(createBrokerId("NetworkBrokerId:1")); } } \ No newline at end of file diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java index a00363da86..0e09956ee9 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java @@ -51,11 +51,12 @@ public class WireFormatInfoTest extends DataFileGeneratorTestSupport { super.populateObject(object); WireFormatInfo info = (WireFormatInfo) object; info.setVersion(1); - info.setCacheEnabled(true); - info.setStackTraceEnabled(false); - info.setTcpNoDelayEnabled(true); - info.setPrefixPacketSize(false); - info.setTightEncodingEnabled(true); + + { + byte data[] = "MarshalledProperties:1".getBytes(); + info.setMarshalledProperties(new org.activeio.ByteSequence(data,0,data.length)); + } + } } diff --git a/activemq-dotnet/activemq-dotnet.csproj b/activemq-dotnet/activemq-dotnet.csproj index 9a8b676f73..be5006c75c 100644 --- a/activemq-dotnet/activemq-dotnet.csproj +++ b/activemq-dotnet/activemq-dotnet.csproj @@ -49,6 +49,7 @@ + @@ -80,6 +81,8 @@ + + @@ -93,6 +96,7 @@ + @@ -151,6 +155,7 @@ + diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs index ef058d76cd..78e8c31cfb 100755 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs @@ -16,6 +16,7 @@ */ using ActiveMQ.Commands; using System; +using ActiveMQ.OpenWire; namespace ActiveMQ.Commands { @@ -137,6 +138,32 @@ namespace ActiveMQ.Commands return -1; } } + + public virtual void BeforeMarshall(OpenWireFormat wireFormat) + { + } + + public virtual void AfterMarshall(OpenWireFormat wireFormat) + { + } + + public virtual void BeforeUnmarshall(OpenWireFormat wireFormat) + { + } + + public virtual void AfterUnmarshall(OpenWireFormat wireFormat) + { + } + + public virtual void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data) + { + } + + public virtual byte[] GetMarshalledForm(OpenWireFormat wireFormat) + { + return null; + } + } } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs index 70c4c5e45f..4e5de24ced 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs @@ -1,316 +1,295 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using ActiveMQ.OpenWire; -using JMS; - - -namespace ActiveMQ.Commands -{ - public delegate void AcknowledgeHandler(ActiveMQMessage message); -} - -namespace ActiveMQ.Commands -{ - public class ActiveMQMessage : Message, IMessage, MarshallAware - { - public const byte ID_ActiveMQMessage = 23; - - protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper(); - - private PrimitiveMap properties; - - public event AcknowledgeHandler Acknowledger; - - public static ActiveMQMessage Transform(IMessage message) - { - return (ActiveMQMessage) message; - } - - // TODO generate Equals method - // TODO generate GetHashCode method - - - public override byte GetDataStructureType() - { - return ID_ActiveMQMessage; - } - - public void Acknowledge() - { - if (Acknowledger == null) - { - throw new JMSException("No Acknowledger has been associated with this message: " + this); - } - else - { - Acknowledger(this); - } - } - - - // Properties - - public IPrimitiveMap Properties - { - get { - if (properties == null) - { - properties = PrimitiveMap.Unmarshal(MarshalledProperties); - } - return properties; - } - } - - public IDestination FromDestination - { - get { return Destination; } - set { this.Destination = ActiveMQDestination.Transform(value); } - } - - - // IMessage interface - - // JMS headers - - /// - /// The correlation ID used to correlate messages with conversations or long running business processes - /// - public string JMSCorrelationID - { - get { - return CorrelationId; - } - set { - CorrelationId = value; - } - } - - /// - /// The destination of the message - /// - public IDestination JMSDestination - { - get { - return OriginalDestination; - } - } - - /// - /// The time in milliseconds that this message should expire in - /// - public long JMSExpiration - { - get { - return Expiration; - } - set { - Expiration = value; - } - } - - /// - /// The message ID which is set by the provider - /// - public string JMSMessageId - { - get { - return BaseDataStreamMarshaller.ToString(MessageId); - } - } - - /// - /// Whether or not this message is persistent - /// - public bool JMSPersistent - { - get { - return Persistent; - } - set { - Persistent = value; - } - } - - /// - /// The Priority on this message - /// - public byte JMSPriority - { - get { - return Priority; - } - set { - Priority = value; - } - } - - /// - /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully. - /// - public bool JMSRedelivered - { - get { - return RedeliveryCounter > 0; - } - } - - - /// - /// The destination that the consumer of this message should send replies to - /// - public IDestination JMSReplyTo - { - get { - return ReplyTo; - } - set { - ReplyTo = ActiveMQDestination.Transform(value); - } - } - - - /// - /// The timestamp the broker added to the message - /// - public long JMSTimestamp - { - get { - return Timestamp; - } - } - - /// - /// The type name of this message - /// - public string JMSType - { - get { - return Type; - } - set { - Type = value; - } - } - - - // JMS Extension headers - - /// - /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully. - /// - public int JMSXDeliveryCount - { - get { - return RedeliveryCounter + 1; - } - } - - - /// - /// The Message Group ID used to group messages together to the same consumer for the same group ID value - /// - public string JMSXGroupID - { - get { - return GroupID; - } - set { - GroupID = value; - } - } - /// - /// The Message Group Sequence counter to indicate the position in a group - /// - public int JMSXGroupSeq - { - get { - return GroupSequence; - } - set { - GroupSequence = value; - } - } - - /// - /// Returns the ID of the producers transaction - /// - public string JMSXProducerTXID - { - get { - TransactionId txnId = OriginalTransactionId; - if (txnId == null) - { - txnId = TransactionId; - } - if (txnId != null) - { - return BaseDataStreamMarshaller.ToString(txnId); - } - return null; - } - } - - public object GetObjectProperty(string name) - { - return propertyHelper.GetObjectProperty(this, name); - } - - public void SetObjectProperty(string name, object value) - { - propertyHelper.SetObjectProperty(this, name, value); - } - - // MarshallAware interface - - public override bool IsMarshallAware() - { - return true; - } - - public virtual void BeforeMarshall(OpenWireFormat wireFormat) - { - MarshalledProperties = null; - if (properties != null) - { - MarshalledProperties = properties.Marshal(); - } - } - - public virtual void AfterMarshall(OpenWireFormat wireFormat) - { - } - - public virtual void BeforeUnmarshall(OpenWireFormat wireFormat) - { - } - - public virtual void AfterUnmarshall(OpenWireFormat wireFormat) - { - } - - public virtual void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data) - { - } - - public virtual byte[] GetMarshalledForm(OpenWireFormat wireFormat) - { - return null; - } - - } -} - +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ.OpenWire; +using JMS; + + +namespace ActiveMQ.Commands +{ + public delegate void AcknowledgeHandler(ActiveMQMessage message); +} + +namespace ActiveMQ.Commands +{ + public class ActiveMQMessage : Message, IMessage, MarshallAware + { + public const byte ID_ActiveMQMessage = 23; + + protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper(); + + private PrimitiveMap properties; + + public event AcknowledgeHandler Acknowledger; + + public static ActiveMQMessage Transform(IMessage message) + { + return (ActiveMQMessage) message; + } + + // TODO generate Equals method + // TODO generate GetHashCode method + + + public override byte GetDataStructureType() + { + return ID_ActiveMQMessage; + } + + public void Acknowledge() + { + if (Acknowledger == null) + { + throw new JMSException("No Acknowledger has been associated with this message: " + this); + } + else + { + Acknowledger(this); + } + } + + + // Properties + + public IPrimitiveMap Properties + { + get { + if (properties == null) + { + properties = PrimitiveMap.Unmarshal(MarshalledProperties); + } + return properties; + } + } + + public IDestination FromDestination + { + get { return Destination; } + set { this.Destination = ActiveMQDestination.Transform(value); } + } + + + // IMessage interface + + // JMS headers + + /// + /// The correlation ID used to correlate messages with conversations or long running business processes + /// + public string JMSCorrelationID + { + get { + return CorrelationId; + } + set { + CorrelationId = value; + } + } + + /// + /// The destination of the message + /// + public IDestination JMSDestination + { + get { + return OriginalDestination; + } + } + + /// + /// The time in milliseconds that this message should expire in + /// + public long JMSExpiration + { + get { + return Expiration; + } + set { + Expiration = value; + } + } + + /// + /// The message ID which is set by the provider + /// + public string JMSMessageId + { + get { + return BaseDataStreamMarshaller.ToString(MessageId); + } + } + + /// + /// Whether or not this message is persistent + /// + public bool JMSPersistent + { + get { + return Persistent; + } + set { + Persistent = value; + } + } + + /// + /// The Priority on this message + /// + public byte JMSPriority + { + get { + return Priority; + } + set { + Priority = value; + } + } + + /// + /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully. + /// + public bool JMSRedelivered + { + get { + return RedeliveryCounter > 0; + } + } + + + /// + /// The destination that the consumer of this message should send replies to + /// + public IDestination JMSReplyTo + { + get { + return ReplyTo; + } + set { + ReplyTo = ActiveMQDestination.Transform(value); + } + } + + + /// + /// The timestamp the broker added to the message + /// + public long JMSTimestamp + { + get { + return Timestamp; + } + } + + /// + /// The type name of this message + /// + public string JMSType + { + get { + return Type; + } + set { + Type = value; + } + } + + + // JMS Extension headers + + /// + /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully. + /// + public int JMSXDeliveryCount + { + get { + return RedeliveryCounter + 1; + } + } + + + /// + /// The Message Group ID used to group messages together to the same consumer for the same group ID value + /// + public string JMSXGroupID + { + get { + return GroupID; + } + set { + GroupID = value; + } + } + /// + /// The Message Group Sequence counter to indicate the position in a group + /// + public int JMSXGroupSeq + { + get { + return GroupSequence; + } + set { + GroupSequence = value; + } + } + + /// + /// Returns the ID of the producers transaction + /// + public string JMSXProducerTXID + { + get { + TransactionId txnId = OriginalTransactionId; + if (txnId == null) + { + txnId = TransactionId; + } + if (txnId != null) + { + return BaseDataStreamMarshaller.ToString(txnId); + } + return null; + } + } + + public object GetObjectProperty(string name) + { + return propertyHelper.GetObjectProperty(this, name); + } + + public void SetObjectProperty(string name, object value) + { + propertyHelper.SetObjectProperty(this, name, value); + } + + // MarshallAware interface + public override bool IsMarshallAware() + { + return true; + } + + public override void BeforeMarshall(OpenWireFormat wireFormat) + { + MarshalledProperties = null; + if (properties != null) + { + MarshalledProperties = properties.Marshal(); + } + } + + + } +} + diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs index 25d32eaf14..faac68cdf5 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs @@ -1,55 +1,56 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for ActiveMQObjectMessage - // - // - // 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 ActiveMQObjectMessage : ActiveMQMessage - { - public const byte ID_ActiveMQObjectMessage = 26; - - - public override string ToString() { - return GetType().Name + "[" - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ActiveMQObjectMessage; - } - - - // Properties - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; +using JMS; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for ActiveMQObjectMessage + // + // + // 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 ActiveMQObjectMessage : ActiveMQMessage + { + public const byte ID_ActiveMQObjectMessage = 26; + + + public override string ToString() { + return GetType().Name + "[" + + " ]"; + + } + + + + public override byte GetDataStructureType() { + return ID_ActiveMQObjectMessage; + } + + + // Properties + + } +} diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BooleanExpression.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BooleanExpression.cs new file mode 100644 index 0000000000..7e050b00c5 --- /dev/null +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BooleanExpression.cs @@ -0,0 +1,22 @@ +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +namespace ActiveMQ.Commands +{ + public interface BooleanExpression + { + } +} diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs index eee48782cb..cb85e3c6d0 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs @@ -1,85 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for BrokerId - // - // - // 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 BrokerId : AbstractCommand - { - public const byte ID_BrokerId = 124; - - string value; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(Value); - return answer; - - } - - - public override bool Equals(object that) { - if (that is BrokerId) { - return Equals((BrokerId) that); - } - return false; - } - - public virtual bool Equals(BrokerId that) { - if (! Equals(this.Value, that.Value)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " Value=" + Value - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_BrokerId; - } - - - // Properties - - public string Value - { - get { return value; } - set { this.value = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for BrokerId // // // 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 BrokerId : AbstractCommand, DataStructure { public const byte ID_BrokerId = 124; string value; public override int GetHashCode() { int answer = 0; answer = (answer * 37) + HashCode(Value); return answer; } public override bool Equals(object that) { if (that is BrokerId) { return Equals((BrokerId) that); } return false; } public virtual bool Equals(BrokerId that) { if (! Equals(this.Value, that.Value)) return false; return true; } public override string ToString() { return GetType().Name + "[" + " Value=" + Value + " ]"; } public override byte GetDataStructureType() { return ID_BrokerId; } // Properties public string Value { get { return value; } set { this.value = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs index b23e949d04..2d87fdb412 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs @@ -1,95 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for BrokerInfo - // - // - // 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 BrokerInfo : BaseCommand - { - public const byte ID_BrokerInfo = 2; - - BrokerId brokerId; - string brokerURL; - BrokerInfo[] peerBrokerInfos; - string brokerName; - bool slaveBroker; - - public override string ToString() { - return GetType().Name + "[" - + " BrokerId=" + BrokerId - + " BrokerURL=" + BrokerURL - + " PeerBrokerInfos=" + PeerBrokerInfos - + " BrokerName=" + BrokerName - + " SlaveBroker=" + SlaveBroker - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_BrokerInfo; - } - - - // Properties - - public BrokerId BrokerId - { - get { return brokerId; } - set { this.brokerId = value; } - } - - public string BrokerURL - { - get { return brokerURL; } - set { this.brokerURL = value; } - } - - public BrokerInfo[] PeerBrokerInfos - { - get { return peerBrokerInfos; } - set { this.peerBrokerInfos = value; } - } - - public string BrokerName - { - get { return brokerName; } - set { this.brokerName = value; } - } - - public bool SlaveBroker - { - get { return slaveBroker; } - set { this.slaveBroker = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for BrokerInfo // // // 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 BrokerInfo : BaseCommand { public const byte ID_BrokerInfo = 2; BrokerId brokerId; string brokerURL; BrokerInfo[] peerBrokerInfos; string brokerName; bool slaveBroker; public override string ToString() { return GetType().Name + "[" + " BrokerId=" + BrokerId + " BrokerURL=" + BrokerURL + " PeerBrokerInfos=" + PeerBrokerInfos + " BrokerName=" + BrokerName + " SlaveBroker=" + SlaveBroker + " ]"; } public override byte GetDataStructureType() { return ID_BrokerInfo; } // Properties public BrokerId BrokerId { get { return brokerId; } set { this.brokerId = value; } } public string BrokerURL { get { return brokerURL; } set { this.brokerURL = value; } } public BrokerInfo[] PeerBrokerInfos { get { return peerBrokerInfos; } set { this.peerBrokerInfos = value; } } public string BrokerName { get { return brokerName; } set { this.brokerName = value; } } public bool SlaveBroker { get { return slaveBroker; } set { this.slaveBroker = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs index 7c5f3f0f63..0d62ddeb7d 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for ConnectionError - // - // - // 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 ConnectionError : BaseCommand - { - public const byte ID_ConnectionError = 16; - - BrokerError exception; - ConnectionId connectionId; - - public override string ToString() { - return GetType().Name + "[" - + " Exception=" + Exception - + " ConnectionId=" + ConnectionId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ConnectionError; - } - - - // Properties - - public BrokerError Exception - { - get { return exception; } - set { this.exception = value; } - } - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for ConnectionError // // // 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 ConnectionError : BaseCommand { public const byte ID_ConnectionError = 16; BrokerError exception; ConnectionId connectionId; public override string ToString() { return GetType().Name + "[" + " Exception=" + Exception + " ConnectionId=" + ConnectionId + " ]"; } public override byte GetDataStructureType() { return ID_ConnectionError; } // Properties public BrokerError Exception { get { return exception; } set { this.exception = value; } } public ConnectionId ConnectionId { get { return connectionId; } set { this.connectionId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs index 276a4b585e..d16b366ade 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs @@ -1,85 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for ConnectionId - // - // - // 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 ConnectionId : AbstractCommand - { - public const byte ID_ConnectionId = 120; - - string value; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(Value); - return answer; - - } - - - public override bool Equals(object that) { - if (that is ConnectionId) { - return Equals((ConnectionId) that); - } - return false; - } - - public virtual bool Equals(ConnectionId that) { - if (! Equals(this.Value, that.Value)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " Value=" + Value - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ConnectionId; - } - - - // Properties - - public string Value - { - get { return value; } - set { this.value = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for ConnectionId // // // 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 ConnectionId : AbstractCommand, DataStructure { public const byte ID_ConnectionId = 120; string value; public override int GetHashCode() { int answer = 0; answer = (answer * 37) + HashCode(Value); return answer; } public override bool Equals(object that) { if (that is ConnectionId) { return Equals((ConnectionId) that); } return false; } public virtual bool Equals(ConnectionId that) { if (! Equals(this.Value, that.Value)) return false; return true; } public override string ToString() { return GetType().Name + "[" + " Value=" + Value + " ]"; } public override byte GetDataStructureType() { return ID_ConnectionId; } // Properties public string Value { get { return value; } set { this.value = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs index 8dbbaf6546..41c04f5165 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs @@ -1,95 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for ConnectionInfo - // - // - // 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 ConnectionInfo : BaseCommand - { - public const byte ID_ConnectionInfo = 3; - - ConnectionId connectionId; - string clientId; - string password; - string userName; - BrokerId[] brokerPath; - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " ClientId=" + ClientId - + " Password=" + Password - + " UserName=" + UserName - + " BrokerPath=" + BrokerPath - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ConnectionInfo; - } - - - // Properties - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public string ClientId - { - get { return clientId; } - set { this.clientId = value; } - } - - public string Password - { - get { return password; } - set { this.password = value; } - } - - public string UserName - { - get { return userName; } - set { this.userName = value; } - } - - public BrokerId[] BrokerPath - { - get { return brokerPath; } - set { this.brokerPath = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for ConnectionInfo // // // 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 ConnectionInfo : BaseCommand { public const byte ID_ConnectionInfo = 3; ConnectionId connectionId; string clientId; string password; string userName; BrokerId[] brokerPath; public override string ToString() { return GetType().Name + "[" + " ConnectionId=" + ConnectionId + " ClientId=" + ClientId + " Password=" + Password + " UserName=" + UserName + " BrokerPath=" + BrokerPath + " ]"; } public override byte GetDataStructureType() { return ID_ConnectionInfo; } // Properties public ConnectionId ConnectionId { get { return connectionId; } set { this.connectionId = value; } } public string ClientId { get { return clientId; } set { this.clientId = value; } } public string Password { get { return password; } set { this.password = value; } } public string UserName { get { return userName; } set { this.userName = value; } } public BrokerId[] BrokerPath { get { return brokerPath; } set { this.brokerPath = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs index 25a3517758..358f36db5e 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs @@ -1,105 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for ConsumerId - // - // - // 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 ConsumerId : AbstractCommand - { - public const byte ID_ConsumerId = 122; - - string connectionId; - long sessionId; - long value; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(ConnectionId); - answer = (answer * 37) + HashCode(SessionId); - answer = (answer * 37) + HashCode(Value); - return answer; - - } - - - public override bool Equals(object that) { - if (that is ConsumerId) { - return Equals((ConsumerId) that); - } - return false; - } - - public virtual bool Equals(ConsumerId that) { - if (! Equals(this.ConnectionId, that.ConnectionId)) return false; - if (! Equals(this.SessionId, that.SessionId)) return false; - if (! Equals(this.Value, that.Value)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " SessionId=" + SessionId - + " Value=" + Value - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ConsumerId; - } - - - // Properties - - public string ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public long SessionId - { - get { return sessionId; } - set { this.sessionId = value; } - } - - public long Value - { - get { return value; } - set { this.value = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for ConsumerId // // // 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 ConsumerId : AbstractCommand, DataStructure { public const byte ID_ConsumerId = 122; string connectionId; long sessionId; long value; public override int GetHashCode() { int answer = 0; answer = (answer * 37) + HashCode(ConnectionId); answer = (answer * 37) + HashCode(SessionId); answer = (answer * 37) + HashCode(Value); return answer; } public override bool Equals(object that) { if (that is ConsumerId) { return Equals((ConsumerId) that); } return false; } public virtual bool Equals(ConsumerId that) { if (! Equals(this.ConnectionId, that.ConnectionId)) return false; if (! Equals(this.SessionId, that.SessionId)) return false; if (! Equals(this.Value, that.Value)) return false; return true; } public override string ToString() { return GetType().Name + "[" + " ConnectionId=" + ConnectionId + " SessionId=" + SessionId + " Value=" + Value + " ]"; } public override byte GetDataStructureType() { return ID_ConsumerId; } // Properties public string ConnectionId { get { return connectionId; } set { this.connectionId = value; } } public long SessionId { get { return sessionId; } set { this.sessionId = value; } } public long Value { get { return value; } set { this.value = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs index 506696e590..894ea6fcf2 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs @@ -1,167 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for ConsumerInfo - // - // - // 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 ConsumerInfo : BaseCommand - { - public const byte ID_ConsumerInfo = 5; - - ConsumerId consumerId; - bool browser; - ActiveMQDestination destination; - int prefetchSize; - int maximumPendingMessageLimit; - bool dispatchAsync; - string selector; - string subcriptionName; - bool noLocal; - bool exclusive; - bool retroactive; - byte priority; - BrokerId[] brokerPath; - bool networkSubscription; - - public override string ToString() { - return GetType().Name + "[" - + " ConsumerId=" + ConsumerId - + " Browser=" + Browser - + " Destination=" + Destination - + " PrefetchSize=" + PrefetchSize - + " MaximumPendingMessageLimit=" + MaximumPendingMessageLimit - + " DispatchAsync=" + DispatchAsync - + " Selector=" + Selector - + " SubcriptionName=" + SubcriptionName - + " NoLocal=" + NoLocal - + " Exclusive=" + Exclusive - + " Retroactive=" + Retroactive - + " Priority=" + Priority - + " BrokerPath=" + BrokerPath - + " NetworkSubscription=" + NetworkSubscription - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ConsumerInfo; - } - - - // Properties - - public ConsumerId ConsumerId - { - get { return consumerId; } - set { this.consumerId = value; } - } - - public bool Browser - { - get { return browser; } - set { this.browser = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public int PrefetchSize - { - get { return prefetchSize; } - set { this.prefetchSize = value; } - } - - public int MaximumPendingMessageLimit - { - get { return maximumPendingMessageLimit; } - set { this.maximumPendingMessageLimit = value; } - } - - public bool DispatchAsync - { - get { return dispatchAsync; } - set { this.dispatchAsync = value; } - } - - public string Selector - { - get { return selector; } - set { this.selector = value; } - } - - public string SubcriptionName - { - get { return subcriptionName; } - set { this.subcriptionName = value; } - } - - public bool NoLocal - { - get { return noLocal; } - set { this.noLocal = value; } - } - - public bool Exclusive - { - get { return exclusive; } - set { this.exclusive = value; } - } - - public bool Retroactive - { - get { return retroactive; } - set { this.retroactive = value; } - } - - public byte Priority - { - get { return priority; } - set { this.priority = value; } - } - - public BrokerId[] BrokerPath - { - get { return brokerPath; } - set { this.brokerPath = value; } - } - - public bool NetworkSubscription - { - get { return networkSubscription; } - set { this.networkSubscription = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for ConsumerInfo // // // 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 ConsumerInfo : BaseCommand { public const byte ID_ConsumerInfo = 5; ConsumerId consumerId; bool browser; ActiveMQDestination destination; int prefetchSize; int maximumPendingMessageLimit; bool dispatchAsync; string selector; string subcriptionName; bool noLocal; bool exclusive; bool retroactive; byte priority; BrokerId[] brokerPath; BooleanExpression additionalPredicate; bool networkSubscription; public override string ToString() { return GetType().Name + "[" + " ConsumerId=" + ConsumerId + " Browser=" + Browser + " Destination=" + Destination + " PrefetchSize=" + PrefetchSize + " MaximumPendingMessageLimit=" + MaximumPendingMessageLimit + " DispatchAsync=" + DispatchAsync + " Selector=" + Selector + " SubcriptionName=" + SubcriptionName + " NoLocal=" + NoLocal + " Exclusive=" + Exclusive + " Retroactive=" + Retroactive + " Priority=" + Priority + " BrokerPath=" + BrokerPath + " AdditionalPredicate=" + AdditionalPredicate + " NetworkSubscription=" + NetworkSubscription + " ]"; } public override byte GetDataStructureType() { return ID_ConsumerInfo; } // Properties public ConsumerId ConsumerId { get { return consumerId; } set { this.consumerId = value; } } public bool Browser { get { return browser; } set { this.browser = value; } } public ActiveMQDestination Destination { get { return destination; } set { this.destination = value; } } public int PrefetchSize { get { return prefetchSize; } set { this.prefetchSize = value; } } public int MaximumPendingMessageLimit { get { return maximumPendingMessageLimit; } set { this.maximumPendingMessageLimit = value; } } public bool DispatchAsync { get { return dispatchAsync; } set { this.dispatchAsync = value; } } public string Selector { get { return selector; } set { this.selector = value; } } public string SubcriptionName { get { return subcriptionName; } set { this.subcriptionName = value; } } public bool NoLocal { get { return noLocal; } set { this.noLocal = value; } } public bool Exclusive { get { return exclusive; } set { this.exclusive = value; } } public bool Retroactive { get { return retroactive; } set { this.retroactive = value; } } public byte Priority { get { return priority; } set { this.priority = value; } } public BrokerId[] BrokerPath { get { return brokerPath; } set { this.brokerPath = value; } } public BooleanExpression AdditionalPredicate { get { return additionalPredicate; } set { this.additionalPredicate = value; } } public bool NetworkSubscription { get { return networkSubscription; } set { this.networkSubscription = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs index 25969600d6..9e60e1445e 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs @@ -1,63 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for ControlCommand - // - // - // 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 ControlCommand : BaseCommand - { - public const byte ID_ControlCommand = 14; - - string command; - - public override string ToString() { - return GetType().Name + "[" - + " Command=" + Command - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ControlCommand; - } - - - // Properties - - public string Command - { - get { return command; } - set { this.command = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for ControlCommand // // // 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 ControlCommand : BaseCommand { public const byte ID_ControlCommand = 14; string command; public override string ToString() { return GetType().Name + "[" + " Command=" + Command + " ]"; } public override byte GetDataStructureType() { return ID_ControlCommand; } // Properties public string Command { get { return command; } set { this.command = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs index 82d73eaa00..67242ef9f7 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs @@ -1,63 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for DataArrayResponse - // - // - // 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 DataArrayResponse : Response - { - public const byte ID_DataArrayResponse = 33; - - DataStructure[] data; - - public override string ToString() { - return GetType().Name + "[" - + " Data=" + Data - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_DataArrayResponse; - } - - - // Properties - - public DataStructure[] Data - { - get { return data; } - set { this.data = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for DataArrayResponse // // // 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 DataArrayResponse : Response { public const byte ID_DataArrayResponse = 33; DataStructure[] data; public override string ToString() { return GetType().Name + "[" + " Data=" + Data + " ]"; } public override byte GetDataStructureType() { return ID_DataArrayResponse; } // Properties public DataStructure[] Data { get { return data; } set { this.data = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs index b15e5b8d10..264092f635 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs @@ -1,63 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for DataResponse - // - // - // 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 DataResponse : Response - { - public const byte ID_DataResponse = 32; - - DataStructure data; - - public override string ToString() { - return GetType().Name + "[" - + " Data=" + Data - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_DataResponse; - } - - - // Properties - - public DataStructure Data - { - get { return data; } - set { this.data = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for DataResponse // // // 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 DataResponse : Response { public const byte ID_DataResponse = 32; DataStructure data; public override string ToString() { return GetType().Name + "[" + " Data=" + Data + " ]"; } public override byte GetDataStructureType() { return ID_DataResponse; } // Properties public DataStructure Data { get { return data; } set { this.data = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs index aff7c7dd95..c522d5fe2a 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs @@ -1,95 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for DestinationInfo - // - // - // 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 DestinationInfo : BaseCommand - { - public const byte ID_DestinationInfo = 8; - - ConnectionId connectionId; - ActiveMQDestination destination; - byte operationType; - long timeout; - BrokerId[] brokerPath; - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " Destination=" + Destination - + " OperationType=" + OperationType - + " Timeout=" + Timeout - + " BrokerPath=" + BrokerPath - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_DestinationInfo; - } - - - // Properties - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public byte OperationType - { - get { return operationType; } - set { this.operationType = value; } - } - - public long Timeout - { - get { return timeout; } - set { this.timeout = value; } - } - - public BrokerId[] BrokerPath - { - get { return brokerPath; } - set { this.brokerPath = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for DestinationInfo // // // 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 DestinationInfo : BaseCommand { public const byte ID_DestinationInfo = 8; ConnectionId connectionId; ActiveMQDestination destination; byte operationType; long timeout; BrokerId[] brokerPath; public override string ToString() { return GetType().Name + "[" + " ConnectionId=" + ConnectionId + " Destination=" + Destination + " OperationType=" + OperationType + " Timeout=" + Timeout + " BrokerPath=" + BrokerPath + " ]"; } public override byte GetDataStructureType() { return ID_DestinationInfo; } // Properties public ConnectionId ConnectionId { get { return connectionId; } set { this.connectionId = value; } } public ActiveMQDestination Destination { get { return destination; } set { this.destination = value; } } public byte OperationType { get { return operationType; } set { this.operationType = value; } } public long Timeout { get { return timeout; } set { this.timeout = value; } } public BrokerId[] BrokerPath { get { return brokerPath; } set { this.brokerPath = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs index f6dcf187cd..78be853a3a 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for DiscoveryEvent - // - // - // 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 DiscoveryEvent : AbstractCommand - { - public const byte ID_DiscoveryEvent = 40; - - string serviceName; - string brokerName; - - public override string ToString() { - return GetType().Name + "[" - + " ServiceName=" + ServiceName - + " BrokerName=" + BrokerName - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_DiscoveryEvent; - } - - - // Properties - - public string ServiceName - { - get { return serviceName; } - set { this.serviceName = value; } - } - - public string BrokerName - { - get { return brokerName; } - set { this.brokerName = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for DiscoveryEvent // // // 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 DiscoveryEvent : AbstractCommand, DataStructure { public const byte ID_DiscoveryEvent = 40; string serviceName; string brokerName; public override string ToString() { return GetType().Name + "[" + " ServiceName=" + ServiceName + " BrokerName=" + BrokerName + " ]"; } public override byte GetDataStructureType() { return ID_DiscoveryEvent; } // Properties public string ServiceName { get { return serviceName; } set { this.serviceName = value; } } public string BrokerName { get { return brokerName; } set { this.brokerName = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs index 8e3aee9281..c56043acce 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs @@ -1,63 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // 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-core module - // - public class ExceptionResponse : Response - { - public const byte ID_ExceptionResponse = 31; - - BrokerError exception; - - public override string ToString() { - return GetType().Name + "[" - + " Exception=" + Exception - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ExceptionResponse; - } - - - // Properties - - public BrokerError Exception - { - get { return exception; } - set { this.exception = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // 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-core module // public class ExceptionResponse : Response { public const byte ID_ExceptionResponse = 31; BrokerError exception; public override string ToString() { return GetType().Name + "[" + " Exception=" + Exception + " ]"; } public override byte GetDataStructureType() { return ID_ExceptionResponse; } // Properties public BrokerError Exception { get { return exception; } set { this.exception = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs index 3cb60557db..9c06ef2a01 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs @@ -1,55 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for FlushCommand - // - // - // 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 FlushCommand : BaseCommand - { - public const byte ID_FlushCommand = 15; - - - public override string ToString() { - return GetType().Name + "[" - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_FlushCommand; - } - - - // Properties - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for FlushCommand // // // 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 FlushCommand : BaseCommand { public const byte ID_FlushCommand = 15; public override string ToString() { return GetType().Name + "[" + " ]"; } public override byte GetDataStructureType() { return ID_FlushCommand; } // Properties } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs index 030ea53768..ed4df4afe8 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs @@ -1,63 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for IntegerResponse - // - // - // 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 IntegerResponse : Response - { - public const byte ID_IntegerResponse = 34; - - int result; - - public override string ToString() { - return GetType().Name + "[" - + " Result=" + Result - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_IntegerResponse; - } - - - // Properties - - public int Result - { - get { return result; } - set { this.result = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for IntegerResponse // // // 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 IntegerResponse : Response { public const byte ID_IntegerResponse = 34; int result; public override string ToString() { return GetType().Name + "[" + " Result=" + Result + " ]"; } public override byte GetDataStructureType() { return ID_IntegerResponse; } // Properties public int Result { get { return result; } set { this.result = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs index 21eb773dae..5e1401afa4 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for JournalQueueAck - // - // - // 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 JournalQueueAck : AbstractCommand - { - public const byte ID_JournalQueueAck = 52; - - ActiveMQDestination destination; - MessageAck messageAck; - - public override string ToString() { - return GetType().Name + "[" - + " Destination=" + Destination - + " MessageAck=" + MessageAck - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_JournalQueueAck; - } - - - // Properties - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public MessageAck MessageAck - { - get { return messageAck; } - set { this.messageAck = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for JournalQueueAck // // // 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 JournalQueueAck : AbstractCommand, DataStructure { public const byte ID_JournalQueueAck = 52; ActiveMQDestination destination; MessageAck messageAck; public override string ToString() { return GetType().Name + "[" + " Destination=" + Destination + " MessageAck=" + MessageAck + " ]"; } public override byte GetDataStructureType() { return ID_JournalQueueAck; } // Properties public ActiveMQDestination Destination { get { return destination; } set { this.destination = value; } } public MessageAck MessageAck { get { return messageAck; } set { this.messageAck = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs index 3e545b4714..b6ce227c8a 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs @@ -1,103 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for JournalTopicAck - // - // - // 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 JournalTopicAck : AbstractCommand - { - public const byte ID_JournalTopicAck = 50; - - ActiveMQDestination destination; - MessageId messageId; - long messageSequenceId; - string subscritionName; - string clientId; - TransactionId transactionId; - - public override string ToString() { - return GetType().Name + "[" - + " Destination=" + Destination - + " MessageId=" + MessageId - + " MessageSequenceId=" + MessageSequenceId - + " SubscritionName=" + SubscritionName - + " ClientId=" + ClientId - + " TransactionId=" + TransactionId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_JournalTopicAck; - } - - - // Properties - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public MessageId MessageId - { - get { return messageId; } - set { this.messageId = value; } - } - - public long MessageSequenceId - { - get { return messageSequenceId; } - set { this.messageSequenceId = value; } - } - - public string SubscritionName - { - get { return subscritionName; } - set { this.subscritionName = value; } - } - - public string ClientId - { - get { return clientId; } - set { this.clientId = value; } - } - - public TransactionId TransactionId - { - get { return transactionId; } - set { this.transactionId = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for JournalTopicAck // // // 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 JournalTopicAck : AbstractCommand, DataStructure { public const byte ID_JournalTopicAck = 50; ActiveMQDestination destination; MessageId messageId; long messageSequenceId; string subscritionName; string clientId; TransactionId transactionId; public override string ToString() { return GetType().Name + "[" + " Destination=" + Destination + " MessageId=" + MessageId + " MessageSequenceId=" + MessageSequenceId + " SubscritionName=" + SubscritionName + " ClientId=" + ClientId + " TransactionId=" + TransactionId + " ]"; } public override byte GetDataStructureType() { return ID_JournalTopicAck; } // Properties public ActiveMQDestination Destination { get { return destination; } set { this.destination = value; } } public MessageId MessageId { get { return messageId; } set { this.messageId = value; } } public long MessageSequenceId { get { return messageSequenceId; } set { this.messageSequenceId = value; } } public string SubscritionName { get { return subscritionName; } set { this.subscritionName = value; } } public string ClientId { get { return clientId; } set { this.clientId = value; } } public TransactionId TransactionId { get { return transactionId; } set { this.transactionId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs index f6c37fcc0d..a89ff10ed3 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs @@ -1,63 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for JournalTrace - // - // - // 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 JournalTrace : AbstractCommand - { - public const byte ID_JournalTrace = 53; - - string message; - - public override string ToString() { - return GetType().Name + "[" - + " Message=" + Message - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_JournalTrace; - } - - - // Properties - - public string Message - { - get { return message; } - set { this.message = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for JournalTrace // // // 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 JournalTrace : AbstractCommand, DataStructure { public const byte ID_JournalTrace = 53; string message; public override string ToString() { return GetType().Name + "[" + " Message=" + Message + " ]"; } public override byte GetDataStructureType() { return ID_JournalTrace; } // Properties public string Message { get { return message; } set { this.message = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs index 99cd78e43b..da8e5eb0f2 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs @@ -1,79 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for JournalTransaction - // - // - // 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 JournalTransaction : AbstractCommand - { - public const byte ID_JournalTransaction = 54; - - TransactionId transactionId; - byte type; - bool wasPrepared; - - public override string ToString() { - return GetType().Name + "[" - + " TransactionId=" + TransactionId - + " Type=" + Type - + " WasPrepared=" + WasPrepared - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_JournalTransaction; - } - - - // Properties - - public TransactionId TransactionId - { - get { return transactionId; } - set { this.transactionId = value; } - } - - public byte Type - { - get { return type; } - set { this.type = value; } - } - - public bool WasPrepared - { - get { return wasPrepared; } - set { this.wasPrepared = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for JournalTransaction // // // 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 JournalTransaction : AbstractCommand, DataStructure { public const byte ID_JournalTransaction = 54; TransactionId transactionId; byte type; bool wasPrepared; public override string ToString() { return GetType().Name + "[" + " TransactionId=" + TransactionId + " Type=" + Type + " WasPrepared=" + WasPrepared + " ]"; } public override byte GetDataStructureType() { return ID_JournalTransaction; } // Properties public TransactionId TransactionId { get { return transactionId; } set { this.transactionId = value; } } public byte Type { get { return type; } set { this.type = value; } } public bool WasPrepared { get { return wasPrepared; } set { this.wasPrepared = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs index 9fee642447..d700e9b877 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs @@ -1,55 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for KeepAliveInfo - // - // - // 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 KeepAliveInfo : AbstractCommand - { - public const byte ID_KeepAliveInfo = 10; - - - public override string ToString() { - return GetType().Name + "[" - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_KeepAliveInfo; - } - - - // Properties - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for KeepAliveInfo // // // 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 KeepAliveInfo : AbstractCommand, Command { public const byte ID_KeepAliveInfo = 10; public override string ToString() { return GetType().Name + "[" + " ]"; } public override byte GetDataStructureType() { return ID_KeepAliveInfo; } // Properties } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs index 8a498e6f07..23f2192007 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs @@ -1,95 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for LocalTransactionId - // - // - // 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 LocalTransactionId : TransactionId - { - public const byte ID_LocalTransactionId = 111; - - long value; - ConnectionId connectionId; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(Value); - answer = (answer * 37) + HashCode(ConnectionId); - return answer; - - } - - - public override bool Equals(object that) { - if (that is LocalTransactionId) { - return Equals((LocalTransactionId) that); - } - return false; - } - - public virtual bool Equals(LocalTransactionId that) { - if (! Equals(this.Value, that.Value)) return false; - if (! Equals(this.ConnectionId, that.ConnectionId)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " Value=" + Value - + " ConnectionId=" + ConnectionId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_LocalTransactionId; - } - - - // Properties - - public long Value - { - get { return value; } - set { this.value = value; } - } - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for LocalTransactionId // // // 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 LocalTransactionId : TransactionId { public const byte ID_LocalTransactionId = 111; long value; ConnectionId connectionId; public override int GetHashCode() { int answer = 0; answer = (answer * 37) + HashCode(Value); answer = (answer * 37) + HashCode(ConnectionId); return answer; } public override bool Equals(object that) { if (that is LocalTransactionId) { return Equals((LocalTransactionId) that); } return false; } public virtual bool Equals(LocalTransactionId that) { if (! Equals(this.Value, that.Value)) return false; if (! Equals(this.ConnectionId, that.ConnectionId)) return false; return true; } public override string ToString() { return GetType().Name + "[" + " Value=" + Value + " ConnectionId=" + ConnectionId + " ]"; } public override byte GetDataStructureType() { return ID_LocalTransactionId; } // Properties public long Value { get { return value; } set { this.value = value; } } public ConnectionId ConnectionId { get { return connectionId; } set { this.connectionId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs index 5fb0a1e736..aca63580c4 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs @@ -1,255 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for Message - // - // - // 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 Message : BaseCommand - { - public const byte ID_Message = 0; - - ProducerId producerId; - ActiveMQDestination destination; - TransactionId transactionId; - ActiveMQDestination originalDestination; - MessageId messageId; - TransactionId originalTransactionId; - string groupID; - int groupSequence; - string correlationId; - bool persistent; - long expiration; - byte priority; - ActiveMQDestination replyTo; - long timestamp; - string type; - byte[] content; - byte[] marshalledProperties; - DataStructure dataStructure; - ConsumerId targetConsumerId; - bool compressed; - int redeliveryCounter; - BrokerId[] brokerPath; - long arrival; - string userID; - bool recievedByDFBridge; - - public override string ToString() { - return GetType().Name + "[" - + " ProducerId=" + ProducerId - + " Destination=" + Destination - + " TransactionId=" + TransactionId - + " OriginalDestination=" + OriginalDestination - + " MessageId=" + MessageId - + " OriginalTransactionId=" + OriginalTransactionId - + " GroupID=" + GroupID - + " GroupSequence=" + GroupSequence - + " CorrelationId=" + CorrelationId - + " Persistent=" + Persistent - + " Expiration=" + Expiration - + " Priority=" + Priority - + " ReplyTo=" + ReplyTo - + " Timestamp=" + Timestamp - + " Type=" + Type - + " Content=" + Content - + " MarshalledProperties=" + MarshalledProperties - + " DataStructure=" + DataStructure - + " TargetConsumerId=" + TargetConsumerId - + " Compressed=" + Compressed - + " RedeliveryCounter=" + RedeliveryCounter - + " BrokerPath=" + BrokerPath - + " Arrival=" + Arrival - + " UserID=" + UserID - + " RecievedByDFBridge=" + RecievedByDFBridge - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_Message; - } - - - // Properties - - public ProducerId ProducerId - { - get { return producerId; } - set { this.producerId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public TransactionId TransactionId - { - get { return transactionId; } - set { this.transactionId = value; } - } - - public ActiveMQDestination OriginalDestination - { - get { return originalDestination; } - set { this.originalDestination = value; } - } - - public MessageId MessageId - { - get { return messageId; } - set { this.messageId = value; } - } - - public TransactionId OriginalTransactionId - { - get { return originalTransactionId; } - set { this.originalTransactionId = value; } - } - - public string GroupID - { - get { return groupID; } - set { this.groupID = value; } - } - - public int GroupSequence - { - get { return groupSequence; } - set { this.groupSequence = value; } - } - - public string CorrelationId - { - get { return correlationId; } - set { this.correlationId = value; } - } - - public bool Persistent - { - get { return persistent; } - set { this.persistent = value; } - } - - public long Expiration - { - get { return expiration; } - set { this.expiration = value; } - } - - public byte Priority - { - get { return priority; } - set { this.priority = value; } - } - - public ActiveMQDestination ReplyTo - { - get { return replyTo; } - set { this.replyTo = value; } - } - - public long Timestamp - { - get { return timestamp; } - set { this.timestamp = value; } - } - - public string Type - { - get { return type; } - set { this.type = value; } - } - - public byte[] Content - { - get { return content; } - set { this.content = value; } - } - - public byte[] MarshalledProperties - { - get { return marshalledProperties; } - set { this.marshalledProperties = value; } - } - - public DataStructure DataStructure - { - get { return dataStructure; } - set { this.dataStructure = value; } - } - - public ConsumerId TargetConsumerId - { - get { return targetConsumerId; } - set { this.targetConsumerId = value; } - } - - public bool Compressed - { - get { return compressed; } - set { this.compressed = value; } - } - - public int RedeliveryCounter - { - get { return redeliveryCounter; } - set { this.redeliveryCounter = value; } - } - - public BrokerId[] BrokerPath - { - get { return brokerPath; } - set { this.brokerPath = value; } - } - - public long Arrival - { - get { return arrival; } - set { this.arrival = value; } - } - - public string UserID - { - get { return userID; } - set { this.userID = value; } - } - - public bool RecievedByDFBridge - { - get { return recievedByDFBridge; } - set { this.recievedByDFBridge = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for Message // // // 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 Message : BaseCommand, MarshallAware, MessageReference { public const byte ID_Message = 0; ProducerId producerId; ActiveMQDestination destination; TransactionId transactionId; ActiveMQDestination originalDestination; MessageId messageId; TransactionId originalTransactionId; string groupID; int groupSequence; string correlationId; bool persistent; long expiration; byte priority; ActiveMQDestination replyTo; long timestamp; string type; byte[] content; byte[] marshalledProperties; DataStructure dataStructure; ConsumerId targetConsumerId; bool compressed; int redeliveryCounter; BrokerId[] brokerPath; long arrival; string userID; bool recievedByDFBridge; public override string ToString() { return GetType().Name + "[" + " ProducerId=" + ProducerId + " Destination=" + Destination + " TransactionId=" + TransactionId + " OriginalDestination=" + OriginalDestination + " MessageId=" + MessageId + " OriginalTransactionId=" + OriginalTransactionId + " GroupID=" + GroupID + " GroupSequence=" + GroupSequence + " CorrelationId=" + CorrelationId + " Persistent=" + Persistent + " Expiration=" + Expiration + " Priority=" + Priority + " ReplyTo=" + ReplyTo + " Timestamp=" + Timestamp + " Type=" + Type + " Content=" + Content + " MarshalledProperties=" + MarshalledProperties + " DataStructure=" + DataStructure + " TargetConsumerId=" + TargetConsumerId + " Compressed=" + Compressed + " RedeliveryCounter=" + RedeliveryCounter + " BrokerPath=" + BrokerPath + " Arrival=" + Arrival + " UserID=" + UserID + " RecievedByDFBridge=" + RecievedByDFBridge + " ]"; } public override byte GetDataStructureType() { return ID_Message; } // Properties public ProducerId ProducerId { get { return producerId; } set { this.producerId = value; } } public ActiveMQDestination Destination { get { return destination; } set { this.destination = value; } } public TransactionId TransactionId { get { return transactionId; } set { this.transactionId = value; } } public ActiveMQDestination OriginalDestination { get { return originalDestination; } set { this.originalDestination = value; } } public MessageId MessageId { get { return messageId; } set { this.messageId = value; } } public TransactionId OriginalTransactionId { get { return originalTransactionId; } set { this.originalTransactionId = value; } } public string GroupID { get { return groupID; } set { this.groupID = value; } } public int GroupSequence { get { return groupSequence; } set { this.groupSequence = value; } } public string CorrelationId { get { return correlationId; } set { this.correlationId = value; } } public bool Persistent { get { return persistent; } set { this.persistent = value; } } public long Expiration { get { return expiration; } set { this.expiration = value; } } public byte Priority { get { return priority; } set { this.priority = value; } } public ActiveMQDestination ReplyTo { get { return replyTo; } set { this.replyTo = value; } } public long Timestamp { get { return timestamp; } set { this.timestamp = value; } } public string Type { get { return type; } set { this.type = value; } } public byte[] Content { get { return content; } set { this.content = value; } } public byte[] MarshalledProperties { get { return marshalledProperties; } set { this.marshalledProperties = value; } } public DataStructure DataStructure { get { return dataStructure; } set { this.dataStructure = value; } } public ConsumerId TargetConsumerId { get { return targetConsumerId; } set { this.targetConsumerId = value; } } public bool Compressed { get { return compressed; } set { this.compressed = value; } } public int RedeliveryCounter { get { return redeliveryCounter; } set { this.redeliveryCounter = value; } } public BrokerId[] BrokerPath { get { return brokerPath; } set { this.brokerPath = value; } } public long Arrival { get { return arrival; } set { this.arrival = value; } } public string UserID { get { return userID; } set { this.userID = value; } } public bool RecievedByDFBridge { get { return recievedByDFBridge; } set { this.recievedByDFBridge = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs index 6032cd6863..e2e7ebc1fa 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs @@ -1,111 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for MessageAck - // - // - // 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 MessageAck : BaseCommand - { - public const byte ID_MessageAck = 22; - - ActiveMQDestination destination; - TransactionId transactionId; - ConsumerId consumerId; - byte ackType; - MessageId firstMessageId; - MessageId lastMessageId; - int messageCount; - - public override string ToString() { - return GetType().Name + "[" - + " Destination=" + Destination - + " TransactionId=" + TransactionId - + " ConsumerId=" + ConsumerId - + " AckType=" + AckType - + " FirstMessageId=" + FirstMessageId - + " LastMessageId=" + LastMessageId - + " MessageCount=" + MessageCount - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_MessageAck; - } - - - // Properties - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public TransactionId TransactionId - { - get { return transactionId; } - set { this.transactionId = value; } - } - - public ConsumerId ConsumerId - { - get { return consumerId; } - set { this.consumerId = value; } - } - - public byte AckType - { - get { return ackType; } - set { this.ackType = value; } - } - - public MessageId FirstMessageId - { - get { return firstMessageId; } - set { this.firstMessageId = value; } - } - - public MessageId LastMessageId - { - get { return lastMessageId; } - set { this.lastMessageId = value; } - } - - public int MessageCount - { - get { return messageCount; } - set { this.messageCount = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for MessageAck // // // 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 MessageAck : BaseCommand { public const byte ID_MessageAck = 22; ActiveMQDestination destination; TransactionId transactionId; ConsumerId consumerId; byte ackType; MessageId firstMessageId; MessageId lastMessageId; int messageCount; public override string ToString() { return GetType().Name + "[" + " Destination=" + Destination + " TransactionId=" + TransactionId + " ConsumerId=" + ConsumerId + " AckType=" + AckType + " FirstMessageId=" + FirstMessageId + " LastMessageId=" + LastMessageId + " MessageCount=" + MessageCount + " ]"; } public override byte GetDataStructureType() { return ID_MessageAck; } // Properties public ActiveMQDestination Destination { get { return destination; } set { this.destination = value; } } public TransactionId TransactionId { get { return transactionId; } set { this.transactionId = value; } } public ConsumerId ConsumerId { get { return consumerId; } set { this.consumerId = value; } } public byte AckType { get { return ackType; } set { this.ackType = value; } } public MessageId FirstMessageId { get { return firstMessageId; } set { this.firstMessageId = value; } } public MessageId LastMessageId { get { return lastMessageId; } set { this.lastMessageId = value; } } public int MessageCount { get { return messageCount; } set { this.messageCount = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs index 7cddb89dfa..10b5005462 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs @@ -1,87 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for MessageDispatch - // - // - // 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 MessageDispatch : BaseCommand - { - public const byte ID_MessageDispatch = 21; - - ConsumerId consumerId; - ActiveMQDestination destination; - Message message; - int redeliveryCounter; - - public override string ToString() { - return GetType().Name + "[" - + " ConsumerId=" + ConsumerId - + " Destination=" + Destination - + " Message=" + Message - + " RedeliveryCounter=" + RedeliveryCounter - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_MessageDispatch; - } - - - // Properties - - public ConsumerId ConsumerId - { - get { return consumerId; } - set { this.consumerId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public Message Message - { - get { return message; } - set { this.message = value; } - } - - public int RedeliveryCounter - { - get { return redeliveryCounter; } - set { this.redeliveryCounter = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for MessageDispatch // // // 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 MessageDispatch : BaseCommand { public const byte ID_MessageDispatch = 21; ConsumerId consumerId; ActiveMQDestination destination; Message message; int redeliveryCounter; public override string ToString() { return GetType().Name + "[" + " ConsumerId=" + ConsumerId + " Destination=" + Destination + " Message=" + Message + " RedeliveryCounter=" + RedeliveryCounter + " ]"; } public override byte GetDataStructureType() { return ID_MessageDispatch; } // Properties public ConsumerId ConsumerId { get { return consumerId; } set { this.consumerId = value; } } public ActiveMQDestination Destination { get { return destination; } set { this.destination = value; } } public Message Message { get { return message; } set { this.message = value; } } public int RedeliveryCounter { get { return redeliveryCounter; } set { this.redeliveryCounter = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs index 909cc1713d..dfd2c9abb0 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs @@ -1,87 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // 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 MessageDispatchNotification : BaseCommand - { - public const byte ID_MessageDispatchNotification = 90; - - ConsumerId consumerId; - ActiveMQDestination destination; - long deliverySequenceId; - MessageId messageId; - - public override string ToString() { - return GetType().Name + "[" - + " ConsumerId=" + ConsumerId - + " Destination=" + Destination - + " DeliverySequenceId=" + DeliverySequenceId - + " MessageId=" + MessageId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_MessageDispatchNotification; - } - - - // Properties - - public ConsumerId ConsumerId - { - get { return consumerId; } - set { this.consumerId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public long DeliverySequenceId - { - get { return deliverySequenceId; } - set { this.deliverySequenceId = value; } - } - - public MessageId MessageId - { - get { return messageId; } - set { this.messageId = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // 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 MessageDispatchNotification : BaseCommand { public const byte ID_MessageDispatchNotification = 90; ConsumerId consumerId; ActiveMQDestination destination; long deliverySequenceId; MessageId messageId; public override string ToString() { return GetType().Name + "[" + " ConsumerId=" + ConsumerId + " Destination=" + Destination + " DeliverySequenceId=" + DeliverySequenceId + " MessageId=" + MessageId + " ]"; } public override byte GetDataStructureType() { return ID_MessageDispatchNotification; } // Properties public ConsumerId ConsumerId { get { return consumerId; } set { this.consumerId = value; } } public ActiveMQDestination Destination { get { return destination; } set { this.destination = value; } } public long DeliverySequenceId { get { return deliverySequenceId; } set { this.deliverySequenceId = value; } } public MessageId MessageId { get { return messageId; } set { this.messageId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs index c27914daf9..478afb8165 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs @@ -1,105 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for MessageId - // - // - // 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 MessageId : AbstractCommand - { - public const byte ID_MessageId = 110; - - ProducerId producerId; - long producerSequenceId; - long brokerSequenceId; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(ProducerId); - answer = (answer * 37) + HashCode(ProducerSequenceId); - answer = (answer * 37) + HashCode(BrokerSequenceId); - return answer; - - } - - - public override bool Equals(object that) { - if (that is MessageId) { - return Equals((MessageId) that); - } - return false; - } - - public virtual bool Equals(MessageId that) { - if (! Equals(this.ProducerId, that.ProducerId)) return false; - if (! Equals(this.ProducerSequenceId, that.ProducerSequenceId)) return false; - if (! Equals(this.BrokerSequenceId, that.BrokerSequenceId)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " ProducerId=" + ProducerId - + " ProducerSequenceId=" + ProducerSequenceId - + " BrokerSequenceId=" + BrokerSequenceId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_MessageId; - } - - - // Properties - - public ProducerId ProducerId - { - get { return producerId; } - set { this.producerId = value; } - } - - public long ProducerSequenceId - { - get { return producerSequenceId; } - set { this.producerSequenceId = value; } - } - - public long BrokerSequenceId - { - get { return brokerSequenceId; } - set { this.brokerSequenceId = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for MessageId // // // 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 MessageId : AbstractCommand, DataStructure { public const byte ID_MessageId = 110; ProducerId producerId; long producerSequenceId; long brokerSequenceId; public override int GetHashCode() { int answer = 0; answer = (answer * 37) + HashCode(ProducerId); answer = (answer * 37) + HashCode(ProducerSequenceId); answer = (answer * 37) + HashCode(BrokerSequenceId); return answer; } public override bool Equals(object that) { if (that is MessageId) { return Equals((MessageId) that); } return false; } public virtual bool Equals(MessageId that) { if (! Equals(this.ProducerId, that.ProducerId)) return false; if (! Equals(this.ProducerSequenceId, that.ProducerSequenceId)) return false; if (! Equals(this.BrokerSequenceId, that.BrokerSequenceId)) return false; return true; } public override string ToString() { return GetType().Name + "[" + " ProducerId=" + ProducerId + " ProducerSequenceId=" + ProducerSequenceId + " BrokerSequenceId=" + BrokerSequenceId + " ]"; } public override byte GetDataStructureType() { return ID_MessageId; } // Properties public ProducerId ProducerId { get { return producerId; } set { this.producerId = value; } } public long ProducerSequenceId { get { return producerSequenceId; } set { this.producerSequenceId = value; } } public long BrokerSequenceId { get { return brokerSequenceId; } set { this.brokerSequenceId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageReference.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageReference.cs new file mode 100644 index 0000000000..0db55d6f47 --- /dev/null +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageReference.cs @@ -0,0 +1,23 @@ +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +namespace ActiveMQ.Commands +{ + public interface MessageReference + { + + } +} diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs new file mode 100644 index 0000000000..5adf833775 --- /dev/null +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/NetworkBridgeFilter.cs @@ -0,0 +1 @@ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for NetworkBridgeFilter // // // 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 NetworkBridgeFilter : AbstractCommand, DataStructure, BooleanExpression { public const byte ID_NetworkBridgeFilter = 91; int networkTTL; BrokerId networkBrokerId; public override string ToString() { return GetType().Name + "[" + " NetworkTTL=" + NetworkTTL + " NetworkBrokerId=" + NetworkBrokerId + " ]"; } public override byte GetDataStructureType() { return ID_NetworkBridgeFilter; } // Properties public int NetworkTTL { get { return networkTTL; } set { this.networkTTL = value; } } public BrokerId NetworkBrokerId { get { return networkBrokerId; } set { this.networkBrokerId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs index 3c858811ed..84bf7403ce 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs @@ -1,105 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for ProducerId - // - // - // 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 ProducerId : AbstractCommand - { - public const byte ID_ProducerId = 123; - - string connectionId; - long value; - long sessionId; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(ConnectionId); - answer = (answer * 37) + HashCode(Value); - answer = (answer * 37) + HashCode(SessionId); - return answer; - - } - - - public override bool Equals(object that) { - if (that is ProducerId) { - return Equals((ProducerId) that); - } - return false; - } - - public virtual bool Equals(ProducerId that) { - if (! Equals(this.ConnectionId, that.ConnectionId)) return false; - if (! Equals(this.Value, that.Value)) return false; - if (! Equals(this.SessionId, that.SessionId)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " Value=" + Value - + " SessionId=" + SessionId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ProducerId; - } - - - // Properties - - public string ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public long Value - { - get { return value; } - set { this.value = value; } - } - - public long SessionId - { - get { return sessionId; } - set { this.sessionId = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for ProducerId // // // 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 ProducerId : AbstractCommand, DataStructure { public const byte ID_ProducerId = 123; string connectionId; long value; long sessionId; public override int GetHashCode() { int answer = 0; answer = (answer * 37) + HashCode(ConnectionId); answer = (answer * 37) + HashCode(Value); answer = (answer * 37) + HashCode(SessionId); return answer; } public override bool Equals(object that) { if (that is ProducerId) { return Equals((ProducerId) that); } return false; } public virtual bool Equals(ProducerId that) { if (! Equals(this.ConnectionId, that.ConnectionId)) return false; if (! Equals(this.Value, that.Value)) return false; if (! Equals(this.SessionId, that.SessionId)) return false; return true; } public override string ToString() { return GetType().Name + "[" + " ConnectionId=" + ConnectionId + " Value=" + Value + " SessionId=" + SessionId + " ]"; } public override byte GetDataStructureType() { return ID_ProducerId; } // Properties public string ConnectionId { get { return connectionId; } set { this.connectionId = value; } } public long Value { get { return value; } set { this.value = value; } } public long SessionId { get { return sessionId; } set { this.sessionId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs index 3508eb38fe..295882cea4 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs @@ -1,79 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for ProducerInfo - // - // - // 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 ProducerInfo : BaseCommand - { - public const byte ID_ProducerInfo = 6; - - ProducerId producerId; - ActiveMQDestination destination; - BrokerId[] brokerPath; - - public override string ToString() { - return GetType().Name + "[" - + " ProducerId=" + ProducerId - + " Destination=" + Destination - + " BrokerPath=" + BrokerPath - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ProducerInfo; - } - - - // Properties - - public ProducerId ProducerId - { - get { return producerId; } - set { this.producerId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public BrokerId[] BrokerPath - { - get { return brokerPath; } - set { this.brokerPath = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for ProducerInfo // // // 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 ProducerInfo : BaseCommand { public const byte ID_ProducerInfo = 6; ProducerId producerId; ActiveMQDestination destination; BrokerId[] brokerPath; public override string ToString() { return GetType().Name + "[" + " ProducerId=" + ProducerId + " Destination=" + Destination + " BrokerPath=" + BrokerPath + " ]"; } public override byte GetDataStructureType() { return ID_ProducerInfo; } // Properties public ProducerId ProducerId { get { return producerId; } set { this.producerId = value; } } public ActiveMQDestination Destination { get { return destination; } set { this.destination = value; } } public BrokerId[] BrokerPath { get { return brokerPath; } set { this.brokerPath = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs index c7e73f0683..3de679d9d6 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs @@ -1,63 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for RemoveInfo - // - // - // 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 RemoveInfo : BaseCommand - { - public const byte ID_RemoveInfo = 12; - - DataStructure objectId; - - public override string ToString() { - return GetType().Name + "[" - + " ObjectId=" + ObjectId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_RemoveInfo; - } - - - // Properties - - public DataStructure ObjectId - { - get { return objectId; } - set { this.objectId = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for RemoveInfo // // // 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 RemoveInfo : BaseCommand { public const byte ID_RemoveInfo = 12; DataStructure objectId; public override string ToString() { return GetType().Name + "[" + " ObjectId=" + ObjectId + " ]"; } public override byte GetDataStructureType() { return ID_RemoveInfo; } // Properties public DataStructure ObjectId { get { return objectId; } set { this.objectId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs index a3b1fa9fb3..4404187817 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs @@ -1,79 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for RemoveSubscriptionInfo - // - // - // 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 RemoveSubscriptionInfo : BaseCommand - { - public const byte ID_RemoveSubscriptionInfo = 0; - - ConnectionId connectionId; - string subcriptionName; - string clientId; - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " SubcriptionName=" + SubcriptionName - + " ClientId=" + ClientId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_RemoveSubscriptionInfo; - } - - - // Properties - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public string SubcriptionName - { - get { return subcriptionName; } - set { this.subcriptionName = value; } - } - - public string ClientId - { - get { return clientId; } - set { this.clientId = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for RemoveSubscriptionInfo // // // 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 RemoveSubscriptionInfo : BaseCommand { public const byte ID_RemoveSubscriptionInfo = 0; ConnectionId connectionId; string subcriptionName; string clientId; public override string ToString() { return GetType().Name + "[" + " ConnectionId=" + ConnectionId + " SubcriptionName=" + SubcriptionName + " ClientId=" + ClientId + " ]"; } public override byte GetDataStructureType() { return ID_RemoveSubscriptionInfo; } // Properties public ConnectionId ConnectionId { get { return connectionId; } set { this.connectionId = value; } } public string SubcriptionName { get { return subcriptionName; } set { this.subcriptionName = value; } } public string ClientId { get { return clientId; } set { this.clientId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs index 0bfdb79d6e..03c5614793 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs @@ -1,63 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for Response - // - // - // 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 Response : BaseCommand - { - public const byte ID_Response = 30; - - short correlationId; - - public override string ToString() { - return GetType().Name + "[" - + " CorrelationId=" + CorrelationId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_Response; - } - - - // Properties - - public short CorrelationId - { - get { return correlationId; } - set { this.correlationId = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for Response // // // 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 Response : BaseCommand { public const byte ID_Response = 30; short correlationId; public override string ToString() { return GetType().Name + "[" + " CorrelationId=" + CorrelationId + " ]"; } public override byte GetDataStructureType() { return ID_Response; } // Properties public short CorrelationId { get { return correlationId; } set { this.correlationId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs index 6dbcd384fa..e72ffdbacf 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs @@ -1,95 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for SessionId - // - // - // 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 SessionId : AbstractCommand - { - public const byte ID_SessionId = 121; - - string connectionId; - long value; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(ConnectionId); - answer = (answer * 37) + HashCode(Value); - return answer; - - } - - - public override bool Equals(object that) { - if (that is SessionId) { - return Equals((SessionId) that); - } - return false; - } - - public virtual bool Equals(SessionId that) { - if (! Equals(this.ConnectionId, that.ConnectionId)) return false; - if (! Equals(this.Value, that.Value)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " Value=" + Value - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_SessionId; - } - - - // Properties - - public string ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public long Value - { - get { return value; } - set { this.value = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for SessionId // // // 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 SessionId : AbstractCommand, DataStructure { public const byte ID_SessionId = 121; string connectionId; long value; public override int GetHashCode() { int answer = 0; answer = (answer * 37) + HashCode(ConnectionId); answer = (answer * 37) + HashCode(Value); return answer; } public override bool Equals(object that) { if (that is SessionId) { return Equals((SessionId) that); } return false; } public virtual bool Equals(SessionId that) { if (! Equals(this.ConnectionId, that.ConnectionId)) return false; if (! Equals(this.Value, that.Value)) return false; return true; } public override string ToString() { return GetType().Name + "[" + " ConnectionId=" + ConnectionId + " Value=" + Value + " ]"; } public override byte GetDataStructureType() { return ID_SessionId; } // Properties public string ConnectionId { get { return connectionId; } set { this.connectionId = value; } } public long Value { get { return value; } set { this.value = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs index dc077d5942..cba8f2de1e 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs @@ -1,63 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for SessionInfo - // - // - // 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 SessionInfo : BaseCommand - { - public const byte ID_SessionInfo = 4; - - SessionId sessionId; - - public override string ToString() { - return GetType().Name + "[" - + " SessionId=" + SessionId - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_SessionInfo; - } - - - // Properties - - public SessionId SessionId - { - get { return sessionId; } - set { this.sessionId = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for SessionInfo // // // 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 SessionInfo : BaseCommand { public const byte ID_SessionInfo = 4; SessionId sessionId; public override string ToString() { return GetType().Name + "[" + " SessionId=" + SessionId + " ]"; } public override byte GetDataStructureType() { return ID_SessionInfo; } // Properties public SessionId SessionId { get { return sessionId; } set { this.sessionId = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs index 19b0f305ec..e9e45bd905 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs @@ -1,55 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for ShutdownInfo - // - // - // 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 ShutdownInfo : BaseCommand - { - public const byte ID_ShutdownInfo = 11; - - - public override string ToString() { - return GetType().Name + "[" - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_ShutdownInfo; - } - - - // Properties - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for ShutdownInfo // // // 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 ShutdownInfo : BaseCommand { public const byte ID_ShutdownInfo = 11; public override string ToString() { return GetType().Name + "[" + " ]"; } public override byte GetDataStructureType() { return ID_ShutdownInfo; } // Properties } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs index 85b84e530d..ca0ebda1c3 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs @@ -1,87 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for SubscriptionInfo - // - // - // 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 SubscriptionInfo : AbstractCommand - { - public const byte ID_SubscriptionInfo = 55; - - string clientId; - ActiveMQDestination destination; - string selector; - string subcriptionName; - - public override string ToString() { - return GetType().Name + "[" - + " ClientId=" + ClientId - + " Destination=" + Destination - + " Selector=" + Selector - + " SubcriptionName=" + SubcriptionName - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_SubscriptionInfo; - } - - - // Properties - - public string ClientId - { - get { return clientId; } - set { this.clientId = value; } - } - - public ActiveMQDestination Destination - { - get { return destination; } - set { this.destination = value; } - } - - public string Selector - { - get { return selector; } - set { this.selector = value; } - } - - public string SubcriptionName - { - get { return subcriptionName; } - set { this.subcriptionName = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for SubscriptionInfo // // // 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 SubscriptionInfo : AbstractCommand, DataStructure { public const byte ID_SubscriptionInfo = 55; string clientId; ActiveMQDestination destination; string selector; string subcriptionName; public override string ToString() { return GetType().Name + "[" + " ClientId=" + ClientId + " Destination=" + Destination + " Selector=" + Selector + " SubcriptionName=" + SubcriptionName + " ]"; } public override byte GetDataStructureType() { return ID_SubscriptionInfo; } // Properties public string ClientId { get { return clientId; } set { this.clientId = value; } } public ActiveMQDestination Destination { get { return destination; } set { this.destination = value; } } public string Selector { get { return selector; } set { this.selector = value; } } public string SubcriptionName { get { return subcriptionName; } set { this.subcriptionName = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs index ae2af1f045..ef495d742e 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs @@ -1,75 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for TransactionId - // - // - // 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 TransactionId : AbstractCommand - { - public const byte ID_TransactionId = 0; - - - public override int GetHashCode() { - int answer = 0; - return answer; - - } - - - public override bool Equals(object that) { - if (that is TransactionId) { - return Equals((TransactionId) that); - } - return false; - } - - public virtual bool Equals(TransactionId that) { - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_TransactionId; - } - - - // Properties - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for TransactionId // // // 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 TransactionId : AbstractCommand, DataStructure { public const byte ID_TransactionId = 0; public override int GetHashCode() { int answer = 0; return answer; } public override bool Equals(object that) { if (that is TransactionId) { return Equals((TransactionId) that); } return false; } public virtual bool Equals(TransactionId that) { return true; } public override string ToString() { return GetType().Name + "[" + " ]"; } public override byte GetDataStructureType() { return ID_TransactionId; } // Properties } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs index 45acbbd7db..af348241e3 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs @@ -1,79 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for TransactionInfo - // - // - // 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 TransactionInfo : BaseCommand - { - public const byte ID_TransactionInfo = 7; - - ConnectionId connectionId; - TransactionId transactionId; - byte type; - - public override string ToString() { - return GetType().Name + "[" - + " ConnectionId=" + ConnectionId - + " TransactionId=" + TransactionId - + " Type=" + Type - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_TransactionInfo; - } - - - // Properties - - public ConnectionId ConnectionId - { - get { return connectionId; } - set { this.connectionId = value; } - } - - public TransactionId TransactionId - { - get { return transactionId; } - set { this.transactionId = value; } - } - - public byte Type - { - get { return type; } - set { this.type = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for TransactionInfo // // // 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 TransactionInfo : BaseCommand { public const byte ID_TransactionInfo = 7; ConnectionId connectionId; TransactionId transactionId; byte type; public override string ToString() { return GetType().Name + "[" + " ConnectionId=" + ConnectionId + " TransactionId=" + TransactionId + " Type=" + Type + " ]"; } public override byte GetDataStructureType() { return ID_TransactionInfo; } // Properties public ConnectionId ConnectionId { get { return connectionId; } set { this.connectionId = value; } } public TransactionId TransactionId { get { return transactionId; } set { this.transactionId = value; } } public byte Type { get { return type; } set { this.type = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs index b8a29e36bb..d10a6bc2f9 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs @@ -1,111 +1,124 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for WireFormatInfo - // - // - // 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 WireFormatInfo : AbstractCommand - { - public const byte ID_WireFormatInfo = 1; - - byte[] magic; - int version; - bool cacheEnabled; - bool stackTraceEnabled; - bool tcpNoDelayEnabled; - bool prefixPacketSize; - bool tightEncodingEnabled; - - public override string ToString() { - return GetType().Name + "[" - + " Magic=" + Magic - + " Version=" + Version - + " CacheEnabled=" + CacheEnabled - + " StackTraceEnabled=" + StackTraceEnabled - + " TcpNoDelayEnabled=" + TcpNoDelayEnabled - + " PrefixPacketSize=" + PrefixPacketSize - + " TightEncodingEnabled=" + TightEncodingEnabled - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_WireFormatInfo; - } - - - // Properties - - public byte[] Magic - { - get { return magic; } - set { this.magic = value; } - } - - public int Version - { - get { return version; } - set { this.version = value; } - } - - public bool CacheEnabled - { - get { return cacheEnabled; } - set { this.cacheEnabled = value; } - } - - public bool StackTraceEnabled - { - get { return stackTraceEnabled; } - set { this.stackTraceEnabled = value; } - } - - public bool TcpNoDelayEnabled - { - get { return tcpNoDelayEnabled; } - set { this.tcpNoDelayEnabled = value; } - } - - public bool PrefixPacketSize - { - get { return prefixPacketSize; } - set { this.prefixPacketSize = value; } - } - - public bool TightEncodingEnabled - { - get { return tightEncodingEnabled; } - set { this.tightEncodingEnabled = value; } - } - - } -} +/* +* Copyright 2006 The Apache Software Foundation or its licensors, as +* applicable. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Collections; + +using ActiveMQ.OpenWire; +using ActiveMQ.Commands; +using JMS; + +namespace ActiveMQ.Commands +{ + // + // Marshalling code for Open Wire Format for WireFormatInfo + // + // + public class WireFormatInfo : AbstractCommand, Command, MarshallAware + { + public const byte ID_WireFormatInfo = 1; + + byte[] magic; + int version; + byte[] marshalledProperties; + + protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper(); + private PrimitiveMap properties; + + public override string ToString() { + return GetType().Name + "[" + + " Magic=" + Magic + + " Version=" + Version + + " MarshalledProperties=" + MarshalledProperties + + " ]"; + + } + + public override byte GetDataStructureType() { + return ID_WireFormatInfo; + } + + + // Properties + public byte[] Magic + { + get { return magic; } + set { this.magic = value; } + } + + public int Version + { + get { return version; } + set { this.version = value; } + } + + public byte[] MarshalledProperties + { + get { return marshalledProperties; } + set { this.marshalledProperties = value; } + } + + public IPrimitiveMap Properties + { + get { + if (properties == null) + { + properties = PrimitiveMap.Unmarshal(MarshalledProperties); + } + return properties; + } + } + + public bool StackTraceEnabled + { + get { return true.Equals(Properties["stackTrace"]) ; } + set { Properties["stackTrace"] = value; } + } + public bool TcpNoDelayEnabled + { + get { return true.Equals(Properties["tcpNoDelay"]); } + set { Properties["tcpNoDelay"] = value; } + } + public bool PrefixPacketSize + { + get { return true.Equals(Properties["prefixPacketSize"]); } + set { Properties["prefixPacketSize"] = value; } + } + public bool TightEncodingEnabled + { + get { return true.Equals(Properties["tightEncodingEnabled"]); } + set { Properties["tightEncodingEnabled"] = value; } + } + + // MarshallAware interface + public override bool IsMarshallAware() + { + return true; + } + + public override void BeforeMarshall(OpenWireFormat wireFormat) + { + MarshalledProperties = null; + if (properties != null) + { + MarshalledProperties = properties.Marshal(); + } + } + + + } +} diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs index 1b48b297c4..92ae012f4d 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs @@ -1,105 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -using System; -using System.Collections; - -using ActiveMQ.OpenWire; -using ActiveMQ.Commands; - -namespace ActiveMQ.Commands -{ - // - // Marshalling code for Open Wire Format for XATransactionId - // - // - // 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 XATransactionId : TransactionId - { - public const byte ID_XATransactionId = 112; - - int formatId; - byte[] globalTransactionId; - byte[] branchQualifier; - - public override int GetHashCode() { - int answer = 0; - answer = (answer * 37) + HashCode(FormatId); - answer = (answer * 37) + HashCode(GlobalTransactionId); - answer = (answer * 37) + HashCode(BranchQualifier); - return answer; - - } - - - public override bool Equals(object that) { - if (that is XATransactionId) { - return Equals((XATransactionId) that); - } - return false; - } - - public virtual bool Equals(XATransactionId that) { - if (! Equals(this.FormatId, that.FormatId)) return false; - if (! Equals(this.GlobalTransactionId, that.GlobalTransactionId)) return false; - if (! Equals(this.BranchQualifier, that.BranchQualifier)) return false; - return true; - - } - - - public override string ToString() { - return GetType().Name + "[" - + " FormatId=" + FormatId - + " GlobalTransactionId=" + GlobalTransactionId - + " BranchQualifier=" + BranchQualifier - + " ]"; - - } - - - - public override byte GetDataStructureType() { - return ID_XATransactionId; - } - - - // Properties - - public int FormatId - { - get { return formatId; } - set { this.formatId = value; } - } - - public byte[] GlobalTransactionId - { - get { return globalTransactionId; } - set { this.globalTransactionId = value; } - } - - public byte[] BranchQualifier - { - get { return branchQualifier; } - set { this.branchQualifier = value; } - } - - } -} +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ using System; using System.Collections; using ActiveMQ.OpenWire; using ActiveMQ.Commands; namespace ActiveMQ.Commands { // // Marshalling code for Open Wire Format for XATransactionId // // // 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 XATransactionId : TransactionId, Xid { public const byte ID_XATransactionId = 112; int formatId; byte[] globalTransactionId; byte[] branchQualifier; public override int GetHashCode() { int answer = 0; answer = (answer * 37) + HashCode(FormatId); answer = (answer * 37) + HashCode(GlobalTransactionId); answer = (answer * 37) + HashCode(BranchQualifier); return answer; } public override bool Equals(object that) { if (that is XATransactionId) { return Equals((XATransactionId) that); } return false; } public virtual bool Equals(XATransactionId that) { if (! Equals(this.FormatId, that.FormatId)) return false; if (! Equals(this.GlobalTransactionId, that.GlobalTransactionId)) return false; if (! Equals(this.BranchQualifier, that.BranchQualifier)) return false; return true; } public override string ToString() { return GetType().Name + "[" + " FormatId=" + FormatId + " GlobalTransactionId=" + GlobalTransactionId + " BranchQualifier=" + BranchQualifier + " ]"; } public override byte GetDataStructureType() { return ID_XATransactionId; } // Properties public int FormatId { get { return formatId; } set { this.formatId = value; } } public byte[] GlobalTransactionId { get { return globalTransactionId; } set { this.globalTransactionId = value; } } public byte[] BranchQualifier { get { return branchQualifier; } set { this.branchQualifier = value; } } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Xid.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Xid.cs new file mode 100644 index 0000000000..a76681db44 --- /dev/null +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Xid.cs @@ -0,0 +1,22 @@ +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +namespace ActiveMQ.Commands +{ + public interface Xid + { + } +} diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs index 7beb349fd4..fd2bbb971a 100755 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs @@ -1,789 +1,750 @@ -/* - * Copyright 2006 The Apache Software Foundation or its licensors, as - * applicable. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using ActiveMQ.Commands; -using System; -using System.Collections; -using System.IO; -using System.Text; - -namespace ActiveMQ.OpenWire - -{ - /// - /// A base class with useful implementation inheritence methods - /// for creating marshallers of the OpenWire protocol - /// - public abstract class BaseDataStreamMarshaller - { - public const byte NULL = 0; - public const byte BOOLEAN_TYPE = 1; - public const byte BYTE_TYPE = 2; - public const byte CHAR_TYPE = 3; - public const byte SHORT_TYPE = 4; - public const byte INTEGER_TYPE = 5; - public const byte LONG_TYPE = 6; - public const byte DOUBLE_TYPE = 7; - public const byte FLOAT_TYPE = 8; - public const byte STRING_TYPE = 9; - public const byte BYTE_ARRAY_TYPE = 10; - - private static String[] HEX_TABLE = new String[]{ - "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "0a", "0b", "0c", "0d", "0e", "0f", - "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "1a", "1b", "1c", "1d", "1e", "1f", - "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "2a", "2b", "2c", "2d", "2e", "2f", - "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "3a", "3b", "3c", "3d", "3e", "3f", - "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "4a", "4b", "4c", "4d", "4e", "4f", - "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "5a", "5b", "5c", "5d", "5e", "5f", - "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "6a", "6b", "6c", "6d", "6e", "6f", - "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "7a", "7b", "7c", "7d", "7e", "7f", - "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "8a", "8b", "8c", "8d", "8e", "8f", - "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "9a", "9b", "9c", "9d", "9e", "9f", - "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "aa", "ab", "ac", "ad", "ae", "af", - "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7", "b8", "b9", "ba", "bb", "bc", "bd", "be", "bf", - "c0", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "ca", "cb", "cc", "cd", "ce", "cf", - "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8", "d9", "da", "db", "dc", "dd", "de", "df", - "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "ea", "eb", "ec", "ed", "ee", "ef", - "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "fa", "fb", "fc", "fd", "fe", "ff", - }; - - public abstract DataStructure CreateObject(); - public abstract byte GetDataStructureType(); - - public virtual int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) - { - return 0; - } - public virtual void TightMarshal2( - OpenWireFormat wireFormat, - Object o, - BinaryWriter dataOut, - BooleanStream bs) - { - } - - public virtual void TightUnmarshal( - OpenWireFormat wireFormat, - Object o, - BinaryReader dataIn, - BooleanStream bs) - { - } - - - protected virtual DataStructure TightUnmarshalNestedObject( - OpenWireFormat wireFormat, - BinaryReader dataIn, - BooleanStream bs) - { - return wireFormat.TightUnmarshalNestedObject(dataIn, bs); - } - - protected virtual int TightMarshalNestedObject1( - OpenWireFormat wireFormat, - DataStructure o, - BooleanStream bs) - { - return wireFormat.TightMarshalNestedObject1(o, bs); - } - - protected virtual void TightMarshalNestedObject2( - OpenWireFormat wireFormat, - DataStructure o, - BinaryWriter dataOut, - BooleanStream bs) - { - wireFormat.TightMarshalNestedObject2(o, dataOut, bs); - } - - protected virtual DataStructure TightUnmarshalCachedObject( - OpenWireFormat wireFormat, - BinaryReader dataIn, - BooleanStream bs) - { - /* - if (wireFormat.isCacheEnabled()) { - if (bs.ReadBoolean()) { - short index = dataIndataIn.ReadInt16()Int16(); - DataStructure value = wireFormat.UnmarshalNestedObject(dataIn, bs); - wireFormat.setInUnmarshallCache(index, value); - return value; - } else { - short index = dataIn.ReadInt16(); - return wireFormat.getFromUnmarshallCache(index); - } - } else { - return wireFormat.UnmarshalNestedObject(dataIn, bs); - } - */ - return wireFormat.TightUnmarshalNestedObject(dataIn, bs); - } - - protected virtual int TightMarshalCachedObject1( - OpenWireFormat wireFormat, - DataStructure o, - BooleanStream bs) - { - /* - if (wireFormat.isCacheEnabled()) { - Short index = wireFormat.getMarshallCacheIndex(o); - bs.WriteBoolean(index == null); - if (index == null) { - int rc = wireFormat.Marshal1NestedObject(o, bs); - wireFormat.addToMarshallCache(o); - return 2 + rc; - } else { - return 2; - } - } else { - return wireFormat.Marshal1NestedObject(o, bs); - } - */ - return wireFormat.TightMarshalNestedObject1(o, bs); - } - - protected virtual void TightMarshalCachedObject2( - OpenWireFormat wireFormat, - DataStructure o, - BinaryWriter dataOut, - BooleanStream bs) - { - /* - if (wireFormat.isCacheEnabled()) { - Short index = wireFormat.getMarshallCacheIndex(o); - if (bs.ReadBoolean()) { - dataOut.Write(index.shortValue(), dataOut); - wireFormat.Marshal2NestedObject(o, dataOut, bs); - } else { - dataOut.Write(index.shortValue(), dataOut); - } - } else { - wireFormat.Marshal2NestedObject(o, dataOut, bs); - } - */ - wireFormat.TightMarshalNestedObject2(o, dataOut, bs); - } - - - - protected virtual String TightUnmarshalString(BinaryReader dataIn, BooleanStream bs) - { - if (bs.ReadBoolean()) - { - if (bs.ReadBoolean()) - { - return ReadAsciiString(dataIn); - } - else - { - return dataIn.ReadString(); - } - } - else - { - return null; - } - } - - protected virtual String ReadAsciiString(BinaryReader dataIn) - { - int size = dataIn.ReadInt16(); - byte[] data = new byte[size]; - dataIn.Read(data, 0, size); - char[] text = new char[size]; - for (int i = 0; i < size; i++) - { - text[i] = (char) data[i]; - } - return new String(text); - } - - protected virtual int TightMarshalString1(String value, BooleanStream bs) - { - bs.WriteBoolean(value != null); - if (value != null) - { - int strlen = value.Length; - - int utflen = 0; - int c = 0; - bool isOnlyAscii = true; - char[] charr = value.ToCharArray(); - for (int i = 0; i < strlen; i++) - { - c = charr[i]; - if ((c >= 0x0001) && (c <= 0x007F)) - { - utflen++; - } - else if (c > 0x07FF) - { - utflen += 3; - isOnlyAscii = false; - } - else - { - isOnlyAscii = false; - utflen += 2; - } - } - - if (utflen >= Int16.MaxValue) - throw new IOException("Encountered a String value that is too long to encode."); - - bs.WriteBoolean(isOnlyAscii); - return utflen + 2; - } - else - { - return 0; - } - } - - public static void TightMarshalString2(String value, BinaryWriter dataOut, BooleanStream bs) - { - if (bs.ReadBoolean()) - { - // If we verified it only holds ascii values - if (bs.ReadBoolean()) - { - dataOut.Write((short) value.Length); - // now lets write the bytes - char[] chars = value.ToCharArray(); - for (int i = 0; i < chars.Length; i++) - { - dataOut.Write((byte)(chars[i]&0xFF00>>8)); - } - } - else - { - dataOut.Write(value); - } - } - } - - public virtual int TightMarshalLong1(OpenWireFormat wireFormat, long o, BooleanStream bs) - { - if (o == 0L) - { - bs.WriteBoolean(false); - bs.WriteBoolean(false); - return 0; - } - else - { - ulong ul = (ulong) o; - if ((ul & 0xFFFFFFFFFFFF0000ul) == 0L) - { - bs.WriteBoolean(false); - bs.WriteBoolean(true); - return 2; - } - else if ((ul & 0xFFFFFFFF00000000ul) == 0L) - { - bs.WriteBoolean(true); - bs.WriteBoolean(false); - return 4; - } - else - { - bs.WriteBoolean(true); - bs.WriteBoolean(true); - return 8; - } - } - } - - public virtual void TightMarshalLong2( - OpenWireFormat wireFormat, - long o, - BinaryWriter dataOut, - BooleanStream bs) - { - if (bs.ReadBoolean()) - { - if (bs.ReadBoolean()) - { - dataOut.Write(o); - } - else - { - dataOut.Write((int)o); - } - } - else - { - if (bs.ReadBoolean()) - { - dataOut.Write((short)o); - } - } - } - public virtual long TightUnmarshalLong(OpenWireFormat wireFormat, BinaryReader dataIn, BooleanStream bs) - { - if (bs.ReadBoolean()) - { - if (bs.ReadBoolean()) - { - return dataIn.ReadInt64(); // dataIn.ReadInt64(); - } - else - { - return dataIn.ReadInt32(); - } - } - else - { - if (bs.ReadBoolean()) - { - return dataIn.ReadInt16(); - } - else - { - return 0; - } - } - } - protected virtual int TightMarshalObjectArray1( - OpenWireFormat wireFormat, - DataStructure[] objects, - BooleanStream bs) - { - if (objects != null) - { - int rc = 0; - bs.WriteBoolean(true); - rc += 2; - for (int i = 0; i < objects.Length; i++) - { - rc += TightMarshalNestedObject1(wireFormat, objects[i], bs); - } - return rc; - } - else - { - bs.WriteBoolean(false); - return 0; - } - } - - protected virtual void TightMarshalObjectArray2( - OpenWireFormat wireFormat, - DataStructure[] objects, - BinaryWriter dataOut, - BooleanStream bs) - { - if (bs.ReadBoolean()) - { - dataOut.Write((short) objects.Length); - for (int i = 0; i < objects.Length; i++) - { - TightMarshalNestedObject2(wireFormat, objects[i], dataOut, bs); - } - } - } - - protected virtual byte[] ReadBytes(BinaryReader dataIn, bool flag) - { - if (flag) - { - int size = dataIn.ReadInt32(); - return dataIn.ReadBytes(size); - } - else - { - return null; - } - } - - protected virtual byte[] ReadBytes(BinaryReader dataIn) - { - int size = dataIn.ReadInt32(); - return dataIn.ReadBytes(size); - } - - protected virtual byte[] ReadBytes(BinaryReader dataIn, int size) - { - return dataIn.ReadBytes(size); - } - - protected virtual void WriteBytes(byte[] command, BinaryWriter dataOut) - { - dataOut.Write(command.Length); - dataOut.Write(command); - } - - protected virtual BrokerError TightUnmarshalBrokerError( - OpenWireFormat wireFormat, - BinaryReader dataIn, - BooleanStream bs) - { - if (bs.ReadBoolean()) - { - BrokerError answer = new BrokerError(); - - answer.ExceptionClass = TightUnmarshalString(dataIn, bs); - answer.Message = TightUnmarshalString(dataIn, bs); - if (wireFormat.StackTraceEnabled) - { - short length = dataIn.ReadInt16(); - StackTraceElement[] stackTrace = new StackTraceElement[length]; - for (int i = 0; i < stackTrace.Length; i++) - { - StackTraceElement element = new StackTraceElement(); - element.ClassName = TightUnmarshalString(dataIn, bs); - element.MethodName = TightUnmarshalString(dataIn, bs); - element.FileName = TightUnmarshalString(dataIn, bs); - element.LineNumber = dataIn.ReadInt32(); - stackTrace[i] = element; - } - answer.StackTraceElements = stackTrace; - answer.Cause = TightUnmarshalBrokerError(wireFormat, dataIn, bs); - } - return answer; - } - else - { - return null; - } - } - - protected int TightMarshalBrokerError1(OpenWireFormat wireFormat, BrokerError o, BooleanStream bs) - { - if (o == null) - { - bs.WriteBoolean(false); - return 0; - } - else - { - int rc = 0; - bs.WriteBoolean(true); - rc += TightMarshalString1(o.ExceptionClass, bs); - rc += TightMarshalString1(o.Message, bs); - if (wireFormat.StackTraceEnabled) - { - rc += 2; - StackTraceElement[] stackTrace = o.StackTraceElements; - for (int i = 0; i < stackTrace.Length; i++) - { - StackTraceElement element = stackTrace[i]; - rc += TightMarshalString1(element.ClassName, bs); - rc += TightMarshalString1(element.MethodName, bs); - rc += TightMarshalString1(element.FileName, bs); - rc += 4; - } - rc += TightMarshalBrokerError1(wireFormat, o.Cause, bs); - } - - return rc; - } - } - - protected void TightMarshalBrokerError2( - OpenWireFormat wireFormat, - BrokerError o, - BinaryWriter dataOut, - BooleanStream bs) - { - if (bs.ReadBoolean()) - { - TightMarshalString2(o.ExceptionClass, dataOut, bs); - TightMarshalString2(o.Message, dataOut, bs); - if (wireFormat.StackTraceEnabled) - { - StackTraceElement[] stackTrace = o.StackTraceElements; - dataOut.Write((short) stackTrace.Length); - - for (int i = 0; i < stackTrace.Length; i++) - { - StackTraceElement element = stackTrace[i]; - TightMarshalString2(element.ClassName, dataOut, bs); - TightMarshalString2(element.MethodName, dataOut, bs); - TightMarshalString2(element.FileName, dataOut, bs); - dataOut.Write(element.LineNumber); - } - TightMarshalBrokerError2(wireFormat, o.Cause, dataOut, bs); - } - } - } - - /// - /// Marshals the primitive type map to a byte array - /// - public static byte[] MarshalPrimitiveMap(IDictionary map) - { - if (map == null) - { - return null; - } - else - { - MemoryStream memoryStream = new MemoryStream(); - MarshalPrimitiveMap(map, new OpenWireBinaryWriter(memoryStream)); - return memoryStream.GetBuffer(); - } - } - public static void MarshalPrimitiveMap(IDictionary map, BinaryWriter dataOut) - { - if (map == null) - { - dataOut.Write((int)-1); - } - else - { - dataOut.Write(map.Count); - foreach (DictionaryEntry entry in map) - { - String name = (String) entry.Key; - dataOut.Write(name); - Object value = entry.Value; - MarshalPrimitive(dataOut, value); - } - }} - - - - /// - /// Unmarshals the primitive type map from the given byte array - /// - public static IDictionary UnmarshalPrimitiveMap(byte[] data) - { - if (data == null) - { - return new Hashtable(); - } - else - { - return UnmarshalPrimitiveMap(new OpenWireBinaryReader(new MemoryStream(data))); - } - } - - public static IDictionary UnmarshalPrimitiveMap(BinaryReader dataIn) - { - int size = dataIn.ReadInt32(); - if (size < 0) - { - return null; - } - else - { - IDictionary answer = new Hashtable(size); - for (int i=0; i < size; i++) - { - String name = dataIn.ReadString(); - answer[name] = UnmarshalPrimitive(dataIn); - } - return answer; - } - - } - - public static void MarshalPrimitive(BinaryWriter dataOut, Object value) - { - if (value == null) - { - dataOut.Write(NULL); - } - else if (value is bool) - { - dataOut.Write(BOOLEAN_TYPE); - dataOut.Write((bool) value); - } - else if (value is byte) - { - dataOut.Write(BYTE_TYPE); - dataOut.Write(((Byte)value)); - } - else if (value is char) - { - dataOut.Write(CHAR_TYPE); - dataOut.Write((char) value); - } - else if (value is short) - { - dataOut.Write(SHORT_TYPE); - dataOut.Write((short) value); - } - else if (value is int) - { - dataOut.Write(INTEGER_TYPE); - dataOut.Write((int) value); - } - else if (value is long) - { - dataOut.Write(LONG_TYPE); - dataOut.Write((long) value); - } - else if (value is float) - { - dataOut.Write(FLOAT_TYPE); - dataOut.Write((float) value); - } - else if (value is double) - { - dataOut.Write(DOUBLE_TYPE); - dataOut.Write((double) value); - } - else if (value is byte[]) - { - byte[] data = (byte[]) value; - dataOut.Write(BYTE_ARRAY_TYPE); - dataOut.Write(data.Length); - dataOut.Write(data); - } - else if (value is string) - { - dataOut.Write(STRING_TYPE); - dataOut.Write((string) value); - } - else - { - throw new IOException("Object is not a primitive: " + value); - } - } - - public static Object UnmarshalPrimitive(BinaryReader dataIn) - { - Object value=null; - switch (dataIn.ReadByte()) - { - case BYTE_TYPE: - value = dataIn.ReadByte(); - break; - case BOOLEAN_TYPE: - value = dataIn.ReadBoolean(); - break; - case CHAR_TYPE: - value = dataIn.ReadChar(); - break; - case SHORT_TYPE: - value = dataIn.ReadInt16(); - break; - case INTEGER_TYPE: - value = dataIn.ReadInt32(); - break; - case LONG_TYPE: - value = dataIn.ReadInt64(); - break; - case FLOAT_TYPE: - value = ReadFloat(dataIn); - break; - case DOUBLE_TYPE: - value = ReadDouble(dataIn); - break; - case BYTE_ARRAY_TYPE: - int size = dataIn.ReadInt32(); - byte[] data = new byte[size]; - dataIn.Read(data, 0, size); - value = data; - break; - case STRING_TYPE: - value = dataIn.ReadString(); - break; - } - return value; - } - - private static Object ReadDouble(BinaryReader dataIn) - { - // TODO: Implement this method - return dataIn.ReadDouble(); - } - - /// - /// Method ReadFloat - /// - private static Object ReadFloat(BinaryReader dataIn) - { - // TODO: Implement this method - return (float) dataIn.ReadDouble(); - } - - private static Object ReadBoolean(BinaryReader dataIn) - { - // TODO: Implement this method - return dataIn.ReadBoolean(); - } - - private static void WriteDouble(double value, BinaryWriter dataOut) - { - // TODO: Implement this method - dataOut.Write(value); - } - - private static void WriteFloat(float value, BinaryWriter dataOut) - { - // TODO: Implement this method - dataOut.Write(value); - } - - private static void WriteBoolean(bool value, BinaryWriter dataOut) - { - // TODO: Implement this method - dataOut.Write(value); - } - - /// - /// Converts the object to a String - /// - public static string ToString(MessageId id) - { - return ToString(id.ProducerId) + ":" + id.ProducerSequenceId; - } - /// - /// Converts the object to a String - /// - public static string ToString(ProducerId id) - { - return id.ConnectionId + ":" + id.SessionId + ":" + id.Value; - } - - - /// - /// Converts the given transaction ID into a String - /// - public static String ToString(TransactionId txnId) - { - if (txnId is LocalTransactionId) - { - LocalTransactionId ltxnId = (LocalTransactionId) txnId; - return "" + ltxnId.Value; - } - else if (txnId is XATransactionId) - { - XATransactionId xaTxnId = (XATransactionId) txnId; - return "XID:" + xaTxnId.FormatId + ":" + ToHexFromBytes(xaTxnId.GlobalTransactionId) + ":" + ToHexFromBytes(xaTxnId.BranchQualifier); - } - return null; - } - - /// - /// Creates the byte array into hexidecimal - /// - public static String ToHexFromBytes(byte[] data) - { - StringBuilder buffer = new StringBuilder(data.Length * 2); - for (int i = 0; i < data.Length; i++) - { - buffer.Append(HEX_TABLE[0xFF & data[i]]); - } - return buffer.ToString(); - } - - } -} - +/* + * Copyright 2006 The Apache Software Foundation or its licensors, as + * applicable. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using ActiveMQ.Commands; +using System; +using System.Collections; +using System.IO; +using System.Text; + +namespace ActiveMQ.OpenWire + +{ + /// + /// A base class with useful implementation inheritence methods + /// for creating marshallers of the OpenWire protocol + /// + public abstract class BaseDataStreamMarshaller + { + public const byte NULL = 0; + public const byte BOOLEAN_TYPE = 1; + public const byte BYTE_TYPE = 2; + public const byte CHAR_TYPE = 3; + public const byte SHORT_TYPE = 4; + public const byte INTEGER_TYPE = 5; + public const byte LONG_TYPE = 6; + public const byte DOUBLE_TYPE = 7; + public const byte FLOAT_TYPE = 8; + public const byte STRING_TYPE = 9; + public const byte BYTE_ARRAY_TYPE = 10; + + private static String[] HEX_TABLE = new String[]{ + "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "0a", "0b", "0c", "0d", "0e", "0f", + "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "1a", "1b", "1c", "1d", "1e", "1f", + "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "2a", "2b", "2c", "2d", "2e", "2f", + "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "3a", "3b", "3c", "3d", "3e", "3f", + "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "4a", "4b", "4c", "4d", "4e", "4f", + "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "5a", "5b", "5c", "5d", "5e", "5f", + "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "6a", "6b", "6c", "6d", "6e", "6f", + "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "7a", "7b", "7c", "7d", "7e", "7f", + "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "8a", "8b", "8c", "8d", "8e", "8f", + "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "9a", "9b", "9c", "9d", "9e", "9f", + "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "aa", "ab", "ac", "ad", "ae", "af", + "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7", "b8", "b9", "ba", "bb", "bc", "bd", "be", "bf", + "c0", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "ca", "cb", "cc", "cd", "ce", "cf", + "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8", "d9", "da", "db", "dc", "dd", "de", "df", + "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "ea", "eb", "ec", "ed", "ee", "ef", + "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "fa", "fb", "fc", "fd", "fe", "ff", + }; + + public abstract DataStructure CreateObject(); + public abstract byte GetDataStructureType(); + + public virtual int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) + { + return 0; + } + public virtual void TightMarshal2( + OpenWireFormat wireFormat, + Object o, + BinaryWriter dataOut, + BooleanStream bs) + { + } + + public virtual void TightUnmarshal( + OpenWireFormat wireFormat, + Object o, + BinaryReader dataIn, + BooleanStream bs) + { + } + + + protected virtual DataStructure TightUnmarshalNestedObject( + OpenWireFormat wireFormat, + BinaryReader dataIn, + BooleanStream bs) + { + return wireFormat.TightUnmarshalNestedObject(dataIn, bs); + } + + protected virtual int TightMarshalNestedObject1( + OpenWireFormat wireFormat, + DataStructure o, + BooleanStream bs) + { + return wireFormat.TightMarshalNestedObject1(o, bs); + } + + protected virtual void TightMarshalNestedObject2( + OpenWireFormat wireFormat, + DataStructure o, + BinaryWriter dataOut, + BooleanStream bs) + { + wireFormat.TightMarshalNestedObject2(o, dataOut, bs); + } + + protected virtual DataStructure TightUnmarshalCachedObject( + OpenWireFormat wireFormat, + BinaryReader dataIn, + BooleanStream bs) + { + /* + if (wireFormat.isCacheEnabled()) { + if (bs.ReadBoolean()) { + short index = dataIndataIn.ReadInt16()Int16(); + DataStructure value = wireFormat.UnmarshalNestedObject(dataIn, bs); + wireFormat.setInUnmarshallCache(index, value); + return value; + } else { + short index = dataIn.ReadInt16(); + return wireFormat.getFromUnmarshallCache(index); + } + } else { + return wireFormat.UnmarshalNestedObject(dataIn, bs); + } + */ + return wireFormat.TightUnmarshalNestedObject(dataIn, bs); + } + + protected virtual int TightMarshalCachedObject1( + OpenWireFormat wireFormat, + DataStructure o, + BooleanStream bs) + { + /* + if (wireFormat.isCacheEnabled()) { + Short index = wireFormat.getMarshallCacheIndex(o); + bs.WriteBoolean(index == null); + if (index == null) { + int rc = wireFormat.Marshal1NestedObject(o, bs); + wireFormat.addToMarshallCache(o); + return 2 + rc; + } else { + return 2; + } + } else { + return wireFormat.Marshal1NestedObject(o, bs); + } + */ + return wireFormat.TightMarshalNestedObject1(o, bs); + } + + protected virtual void TightMarshalCachedObject2( + OpenWireFormat wireFormat, + DataStructure o, + BinaryWriter dataOut, + BooleanStream bs) + { + /* + if (wireFormat.isCacheEnabled()) { + Short index = wireFormat.getMarshallCacheIndex(o); + if (bs.ReadBoolean()) { + dataOut.Write(index.shortValue(), dataOut); + wireFormat.Marshal2NestedObject(o, dataOut, bs); + } else { + dataOut.Write(index.shortValue(), dataOut); + } + } else { + wireFormat.Marshal2NestedObject(o, dataOut, bs); + } + */ + wireFormat.TightMarshalNestedObject2(o, dataOut, bs); + } + + + + protected virtual String TightUnmarshalString(BinaryReader dataIn, BooleanStream bs) + { + if (bs.ReadBoolean()) + { + if (bs.ReadBoolean()) + { + return ReadAsciiString(dataIn); + } + else + { + return dataIn.ReadString(); + } + } + else + { + return null; + } + } + + protected virtual String ReadAsciiString(BinaryReader dataIn) + { + int size = dataIn.ReadInt16(); + byte[] data = new byte[size]; + dataIn.Read(data, 0, size); + char[] text = new char[size]; + for (int i = 0; i < size; i++) + { + text[i] = (char) data[i]; + } + return new String(text); + } + + protected virtual int TightMarshalString1(String value, BooleanStream bs) + { + bs.WriteBoolean(value != null); + if (value != null) + { + int strlen = value.Length; + + int utflen = 0; + int c = 0; + bool isOnlyAscii = true; + char[] charr = value.ToCharArray(); + for (int i = 0; i < strlen; i++) + { + c = charr[i]; + if ((c >= 0x0001) && (c <= 0x007F)) + { + utflen++; + } + else if (c > 0x07FF) + { + utflen += 3; + isOnlyAscii = false; + } + else + { + isOnlyAscii = false; + utflen += 2; + } + } + + if (utflen >= Int16.MaxValue) + throw new IOException("Encountered a String value that is too long to encode."); + + bs.WriteBoolean(isOnlyAscii); + return utflen + 2; + } + else + { + return 0; + } + } + + public static void TightMarshalString2(String value, BinaryWriter dataOut, BooleanStream bs) + { + if (bs.ReadBoolean()) + { + // If we verified it only holds ascii values + if (bs.ReadBoolean()) + { + dataOut.Write((short) value.Length); + // now lets write the bytes + char[] chars = value.ToCharArray(); + for (int i = 0; i < chars.Length; i++) + { + dataOut.Write((byte)(chars[i]&0xFF00>>8)); + } + } + else + { + dataOut.Write(value); + } + } + } + + public virtual int TightMarshalLong1(OpenWireFormat wireFormat, long o, BooleanStream bs) + { + if (o == 0L) + { + bs.WriteBoolean(false); + bs.WriteBoolean(false); + return 0; + } + else + { + ulong ul = (ulong) o; + if ((ul & 0xFFFFFFFFFFFF0000ul) == 0L) + { + bs.WriteBoolean(false); + bs.WriteBoolean(true); + return 2; + } + else if ((ul & 0xFFFFFFFF00000000ul) == 0L) + { + bs.WriteBoolean(true); + bs.WriteBoolean(false); + return 4; + } + else + { + bs.WriteBoolean(true); + bs.WriteBoolean(true); + return 8; + } + } + } + + public virtual void TightMarshalLong2( + OpenWireFormat wireFormat, + long o, + BinaryWriter dataOut, + BooleanStream bs) + { + if (bs.ReadBoolean()) + { + if (bs.ReadBoolean()) + { + dataOut.Write(o); + } + else + { + dataOut.Write((int)o); + } + } + else + { + if (bs.ReadBoolean()) + { + dataOut.Write((short)o); + } + } + } + public virtual long TightUnmarshalLong(OpenWireFormat wireFormat, BinaryReader dataIn, BooleanStream bs) + { + if (bs.ReadBoolean()) + { + if (bs.ReadBoolean()) + { + return dataIn.ReadInt64(); // dataIn.ReadInt64(); + } + else + { + return dataIn.ReadInt32(); + } + } + else + { + if (bs.ReadBoolean()) + { + return dataIn.ReadInt16(); + } + else + { + return 0; + } + } + } + protected virtual int TightMarshalObjectArray1( + OpenWireFormat wireFormat, + DataStructure[] objects, + BooleanStream bs) + { + if (objects != null) + { + int rc = 0; + bs.WriteBoolean(true); + rc += 2; + for (int i = 0; i < objects.Length; i++) + { + rc += TightMarshalNestedObject1(wireFormat, objects[i], bs); + } + return rc; + } + else + { + bs.WriteBoolean(false); + return 0; + } + } + + protected virtual void TightMarshalObjectArray2( + OpenWireFormat wireFormat, + DataStructure[] objects, + BinaryWriter dataOut, + BooleanStream bs) + { + if (bs.ReadBoolean()) + { + dataOut.Write((short) objects.Length); + for (int i = 0; i < objects.Length; i++) + { + TightMarshalNestedObject2(wireFormat, objects[i], dataOut, bs); + } + } + } + + protected virtual byte[] ReadBytes(BinaryReader dataIn, bool flag) + { + if (flag) + { + int size = dataIn.ReadInt32(); + return dataIn.ReadBytes(size); + } + else + { + return null; + } + } + + protected virtual byte[] ReadBytes(BinaryReader dataIn) + { + int size = dataIn.ReadInt32(); + return dataIn.ReadBytes(size); + } + + protected virtual byte[] ReadBytes(BinaryReader dataIn, int size) + { + return dataIn.ReadBytes(size); + } + + protected virtual void WriteBytes(byte[] command, BinaryWriter dataOut) + { + dataOut.Write(command.Length); + dataOut.Write(command); + } + + protected virtual BrokerError TightUnmarshalBrokerError( + OpenWireFormat wireFormat, + BinaryReader dataIn, + BooleanStream bs) + { + if (bs.ReadBoolean()) + { + BrokerError answer = new BrokerError(); + + answer.ExceptionClass = TightUnmarshalString(dataIn, bs); + answer.Message = TightUnmarshalString(dataIn, bs); + if (wireFormat.StackTraceEnabled) + { + short length = dataIn.ReadInt16(); + StackTraceElement[] stackTrace = new StackTraceElement[length]; + for (int i = 0; i < stackTrace.Length; i++) + { + StackTraceElement element = new StackTraceElement(); + element.ClassName = TightUnmarshalString(dataIn, bs); + element.MethodName = TightUnmarshalString(dataIn, bs); + element.FileName = TightUnmarshalString(dataIn, bs); + element.LineNumber = dataIn.ReadInt32(); + stackTrace[i] = element; + } + answer.StackTraceElements = stackTrace; + answer.Cause = TightUnmarshalBrokerError(wireFormat, dataIn, bs); + } + return answer; + } + else + { + return null; + } + } + + protected int TightMarshalBrokerError1(OpenWireFormat wireFormat, BrokerError o, BooleanStream bs) + { + if (o == null) + { + bs.WriteBoolean(false); + return 0; + } + else + { + int rc = 0; + bs.WriteBoolean(true); + rc += TightMarshalString1(o.ExceptionClass, bs); + rc += TightMarshalString1(o.Message, bs); + if (wireFormat.StackTraceEnabled) + { + rc += 2; + StackTraceElement[] stackTrace = o.StackTraceElements; + for (int i = 0; i < stackTrace.Length; i++) + { + StackTraceElement element = stackTrace[i]; + rc += TightMarshalString1(element.ClassName, bs); + rc += TightMarshalString1(element.MethodName, bs); + rc += TightMarshalString1(element.FileName, bs); + rc += 4; + } + rc += TightMarshalBrokerError1(wireFormat, o.Cause, bs); + } + + return rc; + } + } + + protected void TightMarshalBrokerError2( + OpenWireFormat wireFormat, + BrokerError o, + BinaryWriter dataOut, + BooleanStream bs) + { + if (bs.ReadBoolean()) + { + TightMarshalString2(o.ExceptionClass, dataOut, bs); + TightMarshalString2(o.Message, dataOut, bs); + if (wireFormat.StackTraceEnabled) + { + StackTraceElement[] stackTrace = o.StackTraceElements; + dataOut.Write((short) stackTrace.Length); + + for (int i = 0; i < stackTrace.Length; i++) + { + StackTraceElement element = stackTrace[i]; + TightMarshalString2(element.ClassName, dataOut, bs); + TightMarshalString2(element.MethodName, dataOut, bs); + TightMarshalString2(element.FileName, dataOut, bs); + dataOut.Write(element.LineNumber); + } + TightMarshalBrokerError2(wireFormat, o.Cause, dataOut, bs); + } + } + } + + /// + /// Marshals the primitive type map to a byte array + /// + public static byte[] MarshalPrimitiveMap(IDictionary map) + { + if (map == null) + { + return null; + } + else + { + MemoryStream memoryStream = new MemoryStream(); + MarshalPrimitiveMap(map, new OpenWireBinaryWriter(memoryStream)); + return memoryStream.GetBuffer(); + } + } + public static void MarshalPrimitiveMap(IDictionary map, BinaryWriter dataOut) + { + if (map == null) + { + dataOut.Write((int)-1); + } + else + { + dataOut.Write(map.Count); + foreach (DictionaryEntry entry in map) + { + String name = (String) entry.Key; + dataOut.Write(name); + Object value = entry.Value; + MarshalPrimitive(dataOut, value); + } + }} + + + + /// + /// Unmarshals the primitive type map from the given byte array + /// + public static IDictionary UnmarshalPrimitiveMap(byte[] data) + { + if (data == null) + { + return new Hashtable(); + } + else + { + return UnmarshalPrimitiveMap(new OpenWireBinaryReader(new MemoryStream(data))); + } + } + + public static IDictionary UnmarshalPrimitiveMap(BinaryReader dataIn) + { + int size = dataIn.ReadInt32(); + if (size < 0) + { + return null; + } + else + { + IDictionary answer = new Hashtable(size); + for (int i=0; i < size; i++) + { + String name = dataIn.ReadString(); + answer[name] = UnmarshalPrimitive(dataIn); + } + return answer; + } + + } + + public static void MarshalPrimitive(BinaryWriter dataOut, Object value) + { + if (value == null) + { + dataOut.Write(NULL); + } + else if (value is bool) + { + dataOut.Write(BOOLEAN_TYPE); + dataOut.Write((bool) value); + } + else if (value is byte) + { + dataOut.Write(BYTE_TYPE); + dataOut.Write(((Byte)value)); + } + else if (value is char) + { + dataOut.Write(CHAR_TYPE); + dataOut.Write((char) value); + } + else if (value is short) + { + dataOut.Write(SHORT_TYPE); + dataOut.Write((short) value); + } + else if (value is int) + { + dataOut.Write(INTEGER_TYPE); + dataOut.Write((int) value); + } + else if (value is long) + { + dataOut.Write(LONG_TYPE); + dataOut.Write((long) value); + } + else if (value is float) + { + dataOut.Write(FLOAT_TYPE); + dataOut.Write((float) value); + } + else if (value is double) + { + dataOut.Write(DOUBLE_TYPE); + dataOut.Write((double) value); + } + else if (value is byte[]) + { + byte[] data = (byte[]) value; + dataOut.Write(BYTE_ARRAY_TYPE); + dataOut.Write(data.Length); + dataOut.Write(data); + } + else if (value is string) + { + dataOut.Write(STRING_TYPE); + dataOut.Write((string) value); + } + else + { + throw new IOException("Object is not a primitive: " + value); + } + } + + public static Object UnmarshalPrimitive(BinaryReader dataIn) + { + Object value=null; + switch (dataIn.ReadByte()) + { + case BYTE_TYPE: + value = dataIn.ReadByte(); + break; + case BOOLEAN_TYPE: + value = dataIn.ReadBoolean(); + break; + case CHAR_TYPE: + value = dataIn.ReadChar(); + break; + case SHORT_TYPE: + value = dataIn.ReadInt16(); + break; + case INTEGER_TYPE: + value = dataIn.ReadInt32(); + break; + case LONG_TYPE: + value = dataIn.ReadInt64(); + break; + case FLOAT_TYPE: + value = dataIn.ReadSingle(); + break; + case DOUBLE_TYPE: + value = dataIn.ReadDouble(); + break; + case BYTE_ARRAY_TYPE: + int size = dataIn.ReadInt32(); + byte[] data = new byte[size]; + dataIn.Read(data, 0, size); + value = data; + break; + case STRING_TYPE: + value = dataIn.ReadString(); + break; + } + return value; + } + + /// + /// Converts the object to a String + /// + public static string ToString(MessageId id) + { + return ToString(id.ProducerId) + ":" + id.ProducerSequenceId; + } + /// + /// Converts the object to a String + /// + public static string ToString(ProducerId id) + { + return id.ConnectionId + ":" + id.SessionId + ":" + id.Value; + } + + + /// + /// Converts the given transaction ID into a String + /// + public static String ToString(TransactionId txnId) + { + if (txnId is LocalTransactionId) + { + LocalTransactionId ltxnId = (LocalTransactionId) txnId; + return "" + ltxnId.Value; + } + else if (txnId is XATransactionId) + { + XATransactionId xaTxnId = (XATransactionId) txnId; + return "XID:" + xaTxnId.FormatId + ":" + ToHexFromBytes(xaTxnId.GlobalTransactionId) + ":" + ToHexFromBytes(xaTxnId.BranchQualifier); + } + return null; + } + + /// + /// Creates the byte array into hexidecimal + /// + public static String ToHexFromBytes(byte[] data) + { + StringBuilder buffer = new StringBuilder(data.Length * 2); + for (int i = 0; i < data.Length; i++) + { + buffer.Append(HEX_TABLE[0xFF & data[i]]); + } + return buffer.ToString(); + } + + } +} + diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs index ea983cff34..b9cf5d26b5 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs @@ -82,7 +82,7 @@ namespace ActiveMQ.OpenWire.V1 BrokerInfo info = (BrokerInfo)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.BrokerId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.BrokerId, bs); rc += TightMarshalString1(info.BrokerURL, bs); rc += TightMarshalObjectArray1(wireFormat, info.PeerBrokerInfos, bs); rc += TightMarshalString1(info.BrokerName, bs); @@ -98,7 +98,7 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); BrokerInfo info = (BrokerInfo)o; - TightMarshalCachedObject2(wireFormat, info.BrokerId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.BrokerId, dataOut, bs); TightMarshalString2(info.BrokerURL, dataOut, bs); TightMarshalObjectArray2(wireFormat, info.PeerBrokerInfos, dataOut, bs); TightMarshalString2(info.BrokerName, dataOut, bs); diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs index fb197c20e9..38da47e41f 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs @@ -69,7 +69,7 @@ namespace ActiveMQ.OpenWire.V1 int rc = base.TightMarshal1(wireFormat, info, bs); rc += TightMarshalBrokerError1(wireFormat, info.Exception, bs); - rc += TightMarshalNestedObject1(wireFormat, info.ConnectionId, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.ConnectionId, bs); return rc + 0; } @@ -82,7 +82,7 @@ namespace ActiveMQ.OpenWire.V1 ConnectionError info = (ConnectionError)o; TightMarshalBrokerError2(wireFormat, info.Exception, dataOut, bs); - TightMarshalNestedObject2(wireFormat, info.ConnectionId, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs); } } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs index 10f79d3856..8be7823ae8 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs @@ -82,7 +82,7 @@ namespace ActiveMQ.OpenWire.V1 ConnectionInfo info = (ConnectionInfo)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConnectionId, bs); rc += TightMarshalString1(info.ClientId, bs); rc += TightMarshalString1(info.Password, bs); rc += TightMarshalString1(info.UserName, bs); @@ -98,7 +98,7 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); ConnectionInfo info = (ConnectionInfo)o; - TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs); TightMarshalString2(info.ClientId, dataOut, bs); TightMarshalString2(info.Password, dataOut, bs); TightMarshalString2(info.UserName, dataOut, bs); diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs index 44ad3f7b83..b83f025a45 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs @@ -79,6 +79,7 @@ namespace ActiveMQ.OpenWire.V1 else { info.BrokerPath = null; } + info.AdditionalPredicate = (BooleanExpression) TightUnmarshalNestedObject(wireFormat, dataIn, bs); info.NetworkSubscription = bs.ReadBoolean(); } @@ -91,9 +92,9 @@ namespace ActiveMQ.OpenWire.V1 ConsumerInfo info = (ConsumerInfo)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs); bs.WriteBoolean(info.Browser); - rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); bs.WriteBoolean(info.DispatchAsync); rc += TightMarshalString1(info.Selector, bs); rc += TightMarshalString1(info.SubcriptionName, bs); @@ -101,6 +102,7 @@ namespace ActiveMQ.OpenWire.V1 bs.WriteBoolean(info.Exclusive); bs.WriteBoolean(info.Retroactive); rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.AdditionalPredicate, bs); bs.WriteBoolean(info.NetworkSubscription); return rc + 9; @@ -113,9 +115,9 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); ConsumerInfo info = (ConsumerInfo)o; - TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs); bs.ReadBoolean(); - TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); dataOut.Write(info.PrefetchSize); dataOut.Write(info.MaximumPendingMessageLimit); bs.ReadBoolean(); @@ -126,6 +128,7 @@ namespace ActiveMQ.OpenWire.V1 bs.ReadBoolean(); dataOut.Write(info.Priority); TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.AdditionalPredicate, dataOut, bs); bs.ReadBoolean(); } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs index 0caf79931f..62c4674ef3 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs @@ -67,7 +67,7 @@ namespace ActiveMQ.OpenWire.V1 DataResponse info = (DataResponse)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalNestedObject1(wireFormat, info.Data, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.Data, bs); return rc + 0; } @@ -79,7 +79,7 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); DataResponse info = (DataResponse)o; - TightMarshalNestedObject2(wireFormat, info.Data, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.Data, dataOut, bs); } } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs index eafeef0629..fe0d6565b2 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs @@ -82,8 +82,8 @@ namespace ActiveMQ.OpenWire.V1 DestinationInfo info = (DestinationInfo)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs); - rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConnectionId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); rc += TightMarshalLong1(wireFormat, info.Timeout, bs); rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs); @@ -97,8 +97,8 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); DestinationInfo info = (DestinationInfo)o; - TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); dataOut.Write(info.OperationType); TightMarshalLong2(wireFormat, info.Timeout, dataOut, bs); TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs); diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs index c9532bea58..8b8f7ec3a9 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs @@ -68,8 +68,8 @@ namespace ActiveMQ.OpenWire.V1 JournalQueueAck info = (JournalQueueAck)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalNestedObject1(wireFormat, info.Destination, bs); - rc += TightMarshalNestedObject1(wireFormat, info.MessageAck, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.Destination, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageAck, bs); return rc + 0; } @@ -81,8 +81,8 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); JournalQueueAck info = (JournalQueueAck)o; - TightMarshalNestedObject2(wireFormat, info.Destination, dataOut, bs); - TightMarshalNestedObject2(wireFormat, info.MessageAck, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageAck, dataOut, bs); } } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs index c8726086be..e5d9b285ea 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs @@ -72,12 +72,12 @@ namespace ActiveMQ.OpenWire.V1 JournalTopicAck info = (JournalTopicAck)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalNestedObject1(wireFormat, info.Destination, bs); - rc += TightMarshalNestedObject1(wireFormat, info.MessageId, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.Destination, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageId, bs); rc += TightMarshalLong1(wireFormat, info.MessageSequenceId, bs); rc += TightMarshalString1(info.SubscritionName, bs); rc += TightMarshalString1(info.ClientId, bs); - rc += TightMarshalNestedObject1(wireFormat, info.TransactionId, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.TransactionId, bs); return rc + 0; } @@ -89,12 +89,12 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); JournalTopicAck info = (JournalTopicAck)o; - TightMarshalNestedObject2(wireFormat, info.Destination, dataOut, bs); - TightMarshalNestedObject2(wireFormat, info.MessageId, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs); TightMarshalLong2(wireFormat, info.MessageSequenceId, dataOut, bs); TightMarshalString2(info.SubscritionName, dataOut, bs); TightMarshalString2(info.ClientId, dataOut, bs); - TightMarshalNestedObject2(wireFormat, info.TransactionId, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs); } } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs index b993022807..242fd3216b 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs @@ -69,7 +69,7 @@ namespace ActiveMQ.OpenWire.V1 JournalTransaction info = (JournalTransaction)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalNestedObject1(wireFormat, info.TransactionId, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.TransactionId, bs); bs.WriteBoolean(info.WasPrepared); return rc + 1; @@ -82,7 +82,7 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); JournalTransaction info = (JournalTransaction)o; - TightMarshalNestedObject2(wireFormat, info.TransactionId, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs); dataOut.Write(info.Type); bs.ReadBoolean(); diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs index 74832b4b04..44fab74822 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs @@ -69,7 +69,7 @@ namespace ActiveMQ.OpenWire.V1 int rc = base.TightMarshal1(wireFormat, info, bs); rc += TightMarshalLong1(wireFormat, info.Value, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConnectionId, bs); return rc + 0; } @@ -82,7 +82,7 @@ namespace ActiveMQ.OpenWire.V1 LocalTransactionId info = (LocalTransactionId)o; TightMarshalLong2(wireFormat, info.Value, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs); } } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs index c13712b4bf..139d9ddc7b 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs @@ -15,7 +15,7 @@ // limitations under the License. // -// Marshalling code for Open Wire Format for ExceptionResponse +// Marshalling code for Open Wire Format for DestinationMap // // // NOTE!: This file is autogenerated - do not modify! @@ -38,52 +38,53 @@ namespace ActiveMQ.OpenWire.V1 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 MessageIdMarshaller()); + format.addMarshaller(new ActiveMQTempQueueMarshaller()); + format.addMarshaller(new RemoveSubscriptionInfoMarshaller()); + format.addMarshaller(new SessionIdMarshaller()); + format.addMarshaller(new DataArrayResponseMarshaller()); + format.addMarshaller(new JournalQueueAckMarshaller()); + format.addMarshaller(new ResponseMarshaller()); + format.addMarshaller(new ConnectionErrorMarshaller()); + format.addMarshaller(new ConsumerInfoMarshaller()); + format.addMarshaller(new XATransactionIdMarshaller()); + format.addMarshaller(new JournalTraceMarshaller()); + format.addMarshaller(new ConsumerIdMarshaller()); + format.addMarshaller(new ActiveMQTextMessageMarshaller()); + format.addMarshaller(new SubscriptionInfoMarshaller()); format.addMarshaller(new JournalTransactionMarshaller()); - format.addMarshaller(new RemoveInfoMarshaller()); format.addMarshaller(new ControlCommandMarshaller()); + format.addMarshaller(new NetworkBridgeFilterMarshaller()); + format.addMarshaller(new ActiveMQBytesMessageMarshaller()); + format.addMarshaller(new WireFormatInfoMarshaller()); + format.addMarshaller(new ActiveMQTempTopicMarshaller()); + format.addMarshaller(new DiscoveryEventMarshaller()); + format.addMarshaller(new ActiveMQTopicMarshaller()); + format.addMarshaller(new BrokerInfoMarshaller()); + format.addMarshaller(new DestinationInfoMarshaller()); + format.addMarshaller(new ShutdownInfoMarshaller()); + format.addMarshaller(new DataResponseMarshaller()); + format.addMarshaller(new KeepAliveInfoMarshaller()); + format.addMarshaller(new FlushCommandMarshaller()); + format.addMarshaller(new JournalTopicAckMarshaller()); + format.addMarshaller(new BrokerIdMarshaller()); + format.addMarshaller(new MessageDispatchMarshaller()); + format.addMarshaller(new ActiveMQMapMessageMarshaller()); + format.addMarshaller(new ActiveMQMessageMarshaller()); + format.addMarshaller(new RemoveInfoMarshaller()); format.addMarshaller(new ExceptionResponseMarshaller()); } } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs index 439ef4ece7..1d908adcff 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs @@ -73,11 +73,11 @@ namespace ActiveMQ.OpenWire.V1 MessageAck info = (MessageAck)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs); - rc += TightMarshalCachedObject1(wireFormat, info.TransactionId, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs); - rc += TightMarshalNestedObject1(wireFormat, info.FirstMessageId, bs); - rc += TightMarshalNestedObject1(wireFormat, info.LastMessageId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TransactionId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.FirstMessageId, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.LastMessageId, bs); return rc + 5; } @@ -89,12 +89,12 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); MessageAck info = (MessageAck)o; - TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.TransactionId, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs); dataOut.Write(info.AckType); - TightMarshalNestedObject2(wireFormat, info.FirstMessageId, dataOut, bs); - TightMarshalNestedObject2(wireFormat, info.LastMessageId, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.FirstMessageId, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.LastMessageId, dataOut, bs); dataOut.Write(info.MessageCount); } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs index ccc2c9bb42..a3ab93d880 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs @@ -70,9 +70,9 @@ namespace ActiveMQ.OpenWire.V1 MessageDispatch info = (MessageDispatch)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs); - rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs); - rc += TightMarshalNestedObject1(wireFormat, info.Message, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConsumerId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.Message, bs); return rc + 4; } @@ -84,9 +84,9 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); MessageDispatch info = (MessageDispatch)o; - TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs); - TightMarshalNestedObject2(wireFormat, info.Message, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.Message, dataOut, bs); dataOut.Write(info.RedeliveryCounter); } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs index 871b2c2f6c..9f4f6403a8 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs @@ -1,95 +1 @@ -// -// -// 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.Commands; -using ActiveMQ.OpenWire; -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); - - } - } -} +// // // 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.Commands; using ActiveMQ.OpenWire; 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, (DataStructure)info.ConsumerId, bs); rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); rc += TightMarshalLong1(wireFormat, info.DeliverySequenceId, bs); rc += TightMarshalNestedObject1(wireFormat, (DataStructure)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, (DataStructure)info.ConsumerId, dataOut, bs); TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); TightMarshalLong2(wireFormat, info.DeliverySequenceId, dataOut, bs); TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs); } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs index 1d51e84ba5..38443c700c 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs @@ -69,7 +69,7 @@ namespace ActiveMQ.OpenWire.V1 MessageId info = (MessageId)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ProducerId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs); rc += TightMarshalLong1(wireFormat, info.ProducerSequenceId, bs); rc += TightMarshalLong1(wireFormat, info.BrokerSequenceId, bs); @@ -83,7 +83,7 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); MessageId info = (MessageId)o; - TightMarshalCachedObject2(wireFormat, info.ProducerId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs); TightMarshalLong2(wireFormat, info.ProducerSequenceId, dataOut, bs); TightMarshalLong2(wireFormat, info.BrokerSequenceId, dataOut, bs); diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs index 63d3312032..d55b6b5152 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs @@ -91,25 +91,25 @@ namespace ActiveMQ.OpenWire.V1 Message info = (Message)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ProducerId, bs); - rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs); - rc += TightMarshalCachedObject1(wireFormat, info.TransactionId, bs); - rc += TightMarshalCachedObject1(wireFormat, info.OriginalDestination, bs); - rc += TightMarshalNestedObject1(wireFormat, info.MessageId, bs); - rc += TightMarshalCachedObject1(wireFormat, info.OriginalTransactionId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TransactionId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.OriginalDestination, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.MessageId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.OriginalTransactionId, bs); rc += TightMarshalString1(info.GroupID, bs); rc += TightMarshalString1(info.CorrelationId, bs); bs.WriteBoolean(info.Persistent); rc += TightMarshalLong1(wireFormat, info.Expiration, bs); - rc += TightMarshalNestedObject1(wireFormat, info.ReplyTo, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.ReplyTo, bs); rc += TightMarshalLong1(wireFormat, info.Timestamp, bs); rc += TightMarshalString1(info.Type, bs); bs.WriteBoolean(info.Content!=null); rc += info.Content==null ? 0 : info.Content.Length+4; bs.WriteBoolean(info.MarshalledProperties!=null); rc += info.MarshalledProperties==null ? 0 : info.MarshalledProperties.Length+4; - rc += TightMarshalNestedObject1(wireFormat, info.DataStructure, bs); - rc += TightMarshalCachedObject1(wireFormat, info.TargetConsumerId, bs); + rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.DataStructure, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TargetConsumerId, bs); bs.WriteBoolean(info.Compressed); rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs); rc += TightMarshalLong1(wireFormat, info.Arrival, bs); @@ -126,19 +126,19 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); Message info = (Message)o; - TightMarshalCachedObject2(wireFormat, info.ProducerId, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.TransactionId, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.OriginalDestination, dataOut, bs); - TightMarshalNestedObject2(wireFormat, info.MessageId, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.OriginalTransactionId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.OriginalDestination, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.MessageId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.OriginalTransactionId, dataOut, bs); TightMarshalString2(info.GroupID, dataOut, bs); dataOut.Write(info.GroupSequence); TightMarshalString2(info.CorrelationId, dataOut, bs); bs.ReadBoolean(); TightMarshalLong2(wireFormat, info.Expiration, dataOut, bs); dataOut.Write(info.Priority); - TightMarshalNestedObject2(wireFormat, info.ReplyTo, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.ReplyTo, dataOut, bs); TightMarshalLong2(wireFormat, info.Timestamp, dataOut, bs); TightMarshalString2(info.Type, dataOut, bs); if(bs.ReadBoolean()) { @@ -149,8 +149,8 @@ namespace ActiveMQ.OpenWire.V1 dataOut.Write(info.MarshalledProperties.Length); dataOut.Write(info.MarshalledProperties); } - TightMarshalNestedObject2(wireFormat, info.DataStructure, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.TargetConsumerId, dataOut, bs); + TightMarshalNestedObject2(wireFormat, (DataStructure)info.DataStructure, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.TargetConsumerId, dataOut, bs); bs.ReadBoolean(); dataOut.Write(info.RedeliveryCounter); TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs); diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs new file mode 100644 index 0000000000..5a1003fb21 --- /dev/null +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/NetworkBridgeFilterMarshaller.cs @@ -0,0 +1 @@ +// // // 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.Commands; using ActiveMQ.OpenWire; using ActiveMQ.OpenWire.V1; namespace ActiveMQ.OpenWire.V1 { // // Marshalling code for Open Wire Format for NetworkBridgeFilter // // // 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 NetworkBridgeFilterMarshaller : BaseDataStreamMarshaller { public override DataStructure CreateObject() { return new NetworkBridgeFilter(); } public override byte GetDataStructureType() { return NetworkBridgeFilter.ID_NetworkBridgeFilter; } // // 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); NetworkBridgeFilter info = (NetworkBridgeFilter)o; info.NetworkTTL = dataIn.ReadInt32(); info.NetworkBrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs); } // // Write the booleans that this object uses to a BooleanStream // public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) { NetworkBridgeFilter info = (NetworkBridgeFilter)o; int rc = base.TightMarshal1(wireFormat, info, bs); rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.NetworkBrokerId, bs); return rc + 4; } // // 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); NetworkBridgeFilter info = (NetworkBridgeFilter)o; dataOut.Write(info.NetworkTTL); TightMarshalCachedObject2(wireFormat, (DataStructure)info.NetworkBrokerId, dataOut, bs); } } } \ No newline at end of file diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs index 05191e5c15..028ea151d0 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs @@ -80,8 +80,8 @@ namespace ActiveMQ.OpenWire.V1 ProducerInfo info = (ProducerInfo)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ProducerId, bs); - rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ProducerId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs); return rc + 0; @@ -94,8 +94,8 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); ProducerInfo info = (ProducerInfo)o; - TightMarshalCachedObject2(wireFormat, info.ProducerId, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ProducerId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs); } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs index 85b4cd683c..035a357bfc 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs @@ -67,7 +67,7 @@ namespace ActiveMQ.OpenWire.V1 RemoveInfo info = (RemoveInfo)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ObjectId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ObjectId, bs); return rc + 0; } @@ -79,7 +79,7 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); RemoveInfo info = (RemoveInfo)o; - TightMarshalCachedObject2(wireFormat, info.ObjectId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ObjectId, dataOut, bs); } } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs index 8cd9898c73..69f213ca7e 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs @@ -69,7 +69,7 @@ namespace ActiveMQ.OpenWire.V1 RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConnectionId, bs); rc += TightMarshalString1(info.SubcriptionName, bs); rc += TightMarshalString1(info.ClientId, bs); @@ -83,7 +83,7 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; - TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs); TightMarshalString2(info.SubcriptionName, dataOut, bs); TightMarshalString2(info.ClientId, dataOut, bs); diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs index bc734c407b..84a003a66c 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs @@ -67,7 +67,7 @@ namespace ActiveMQ.OpenWire.V1 SessionInfo info = (SessionInfo)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.SessionId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.SessionId, bs); return rc + 0; } @@ -79,7 +79,7 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); SessionInfo info = (SessionInfo)o; - TightMarshalCachedObject2(wireFormat, info.SessionId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.SessionId, dataOut, bs); } } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs index dca2689351..bf9c973e4c 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs @@ -71,7 +71,7 @@ namespace ActiveMQ.OpenWire.V1 int rc = base.TightMarshal1(wireFormat, info, bs); rc += TightMarshalString1(info.ClientId, bs); - rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.Destination, bs); rc += TightMarshalString1(info.Selector, bs); rc += TightMarshalString1(info.SubcriptionName, bs); @@ -86,7 +86,7 @@ namespace ActiveMQ.OpenWire.V1 SubscriptionInfo info = (SubscriptionInfo)o; TightMarshalString2(info.ClientId, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.Destination, dataOut, bs); TightMarshalString2(info.Selector, dataOut, bs); TightMarshalString2(info.SubcriptionName, dataOut, bs); diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs index c51f3facc2..e131b04d42 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs @@ -69,8 +69,8 @@ namespace ActiveMQ.OpenWire.V1 TransactionInfo info = (TransactionInfo)o; int rc = base.TightMarshal1(wireFormat, info, bs); - rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs); - rc += TightMarshalCachedObject1(wireFormat, info.TransactionId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.ConnectionId, bs); + rc += TightMarshalCachedObject1(wireFormat, (DataStructure)info.TransactionId, bs); return rc + 1; } @@ -82,8 +82,8 @@ namespace ActiveMQ.OpenWire.V1 base.TightMarshal2(wireFormat, o, dataOut, bs); TransactionInfo info = (TransactionInfo)o; - TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs); - TightMarshalCachedObject2(wireFormat, info.TransactionId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.ConnectionId, dataOut, bs); + TightMarshalCachedObject2(wireFormat, (DataStructure)info.TransactionId, dataOut, bs); dataOut.Write(info.Type); } diff --git a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs index cb783006cd..26e98cea45 100644 --- a/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs +++ b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs @@ -57,11 +57,7 @@ namespace ActiveMQ.OpenWire.V1 WireFormatInfo info = (WireFormatInfo)o; info.Magic = ReadBytes(dataIn, 8); info.Version = dataIn.ReadInt32(); - info.CacheEnabled = bs.ReadBoolean(); - info.StackTraceEnabled = bs.ReadBoolean(); - info.TcpNoDelayEnabled = bs.ReadBoolean(); - info.PrefixPacketSize = bs.ReadBoolean(); - info.TightEncodingEnabled = bs.ReadBoolean(); + info.MarshalledProperties = ReadBytes(dataIn, bs.ReadBoolean()); } @@ -73,11 +69,8 @@ namespace ActiveMQ.OpenWire.V1 WireFormatInfo info = (WireFormatInfo)o; int rc = base.TightMarshal1(wireFormat, info, bs); - bs.WriteBoolean(info.CacheEnabled); - bs.WriteBoolean(info.StackTraceEnabled); - bs.WriteBoolean(info.TcpNoDelayEnabled); - bs.WriteBoolean(info.PrefixPacketSize); - bs.WriteBoolean(info.TightEncodingEnabled); + bs.WriteBoolean(info.MarshalledProperties!=null); + rc += info.MarshalledProperties==null ? 0 : info.MarshalledProperties.Length+4; return rc + 12; } @@ -91,11 +84,10 @@ namespace ActiveMQ.OpenWire.V1 WireFormatInfo info = (WireFormatInfo)o; dataOut.Write(info.Magic, 0, 8); dataOut.Write(info.Version); - bs.ReadBoolean(); - bs.ReadBoolean(); - bs.ReadBoolean(); - bs.ReadBoolean(); - bs.ReadBoolean(); + if(bs.ReadBoolean()) { + dataOut.Write(info.MarshalledProperties.Length); + dataOut.Write(info.MarshalledProperties); + } } } diff --git a/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs b/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs new file mode 100644 index 0000000000..6218726b5e --- /dev/null +++ b/activemq-dotnet/src/main/csharp/CommonAssemblyInfo.cs @@ -0,0 +1,27 @@ +using System; +using System.Reflection; +using System.Runtime.InteropServices; + +// ------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Mono Runtime Version: 1.1.4322.2032 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +// ------------------------------------------------------------------------------ + +[assembly: ComVisibleAttribute(false)] +[assembly: CLSCompliantAttribute(false)] +[assembly: AssemblyTitleAttribute("ActiveMQ .NET")] +[assembly: AssemblyDescriptionAttribute("A .NET Library for talking to ActiveMQ")] +[assembly: AssemblyConfigurationAttribute("SNAPSHOT")] +[assembly: AssemblyCompanyAttribute("http://activemq.org/")] +[assembly: AssemblyProductAttribute("ActiveMQ")] +[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2006 Apache Software Foundation")] +[assembly: AssemblyTrademarkAttribute("")] +[assembly: AssemblyCultureAttribute("")] +[assembly: AssemblyVersionAttribute("4.0.2256.0")] +[assembly: AssemblyInformationalVersionAttribute("4.0")] + diff --git a/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs b/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs new file mode 100644 index 0000000000..332fee01a7 --- /dev/null +++ b/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs @@ -0,0 +1,27 @@ +using System; +using System.Reflection; +using System.Runtime.InteropServices; + +// ------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Mono Runtime Version: 1.1.4322.2032 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +// ------------------------------------------------------------------------------ + +[assembly: ComVisibleAttribute(false)] +[assembly: CLSCompliantAttribute(false)] +[assembly: AssemblyTitleAttribute("ActiveMQ .NET Test")] +[assembly: AssemblyDescriptionAttribute("A .NET Library for testing the ActiveMQ .NET Library")] +[assembly: AssemblyConfigurationAttribute("SNAPSHOT")] +[assembly: AssemblyCompanyAttribute("http://activemq.org/")] +[assembly: AssemblyProductAttribute("ActiveMQ")] +[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2006 Apache Software Foundation")] +[assembly: AssemblyTrademarkAttribute("")] +[assembly: AssemblyCultureAttribute("")] +[assembly: AssemblyVersionAttribute("4.0.2256.0")] +[assembly: AssemblyInformationalVersionAttribute("4.0")] + diff --git a/openwire-c/src/libopenwire/ow_commands_v1.c b/openwire-c/src/libopenwire/ow_commands_v1.c index 94cc1c7d64..7c715f3338 100644 --- a/openwire-c/src/libopenwire/ow_commands_v1.c +++ b/openwire-c/src/libopenwire/ow_commands_v1.c @@ -30,156 +30,6 @@ #define SUCCESS_CHECK( f ) { apr_status_t rc=f; if(rc!=APR_SUCCESS) return rc; } -ow_boolean ow_is_a_MessageId(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_MESSAGEID_TYPE: - return 1; - } - return 0; -} - - -ow_MessageId *ow_MessageId_create(apr_pool_t *pool) -{ - ow_MessageId *value = apr_pcalloc(pool,sizeof(ow_MessageId)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_MESSAGEID_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_MessageId(ow_bit_buffer *buffer, ow_MessageId *object) -{ - ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->producerId)); - ow_marshal1_long(buffer, object->producerSequenceId); - ow_marshal1_long(buffer, object->brokerSequenceId); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_MessageId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_MessageId *object) -{ - ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->producerId)); - SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->producerSequenceId)); - SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->brokerSequenceId)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_MessageId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_MessageId *object, apr_pool_t *pool) -{ - ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->producerId, pool)); - SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->producerSequenceId, pool)); - SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->brokerSequenceId, pool)); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_BrokerInfo(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_BROKERINFO_TYPE: - return 1; - } - return 0; -} - - -ow_BrokerInfo *ow_BrokerInfo_create(apr_pool_t *pool) -{ - ow_BrokerInfo *value = apr_pcalloc(pool,sizeof(ow_BrokerInfo)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_BROKERINFO_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_BrokerInfo(ow_bit_buffer *buffer, ow_BrokerInfo *object) -{ - ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->brokerId)); - ow_marshal1_string(buffer, object->brokerURL); - SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->peerBrokerInfos)); - ow_marshal1_string(buffer, object->brokerName); - ow_bit_buffer_append(buffer, object->slaveBroker); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_BrokerInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_BrokerInfo *object) -{ - ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->brokerId)); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->brokerURL)); - SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->peerBrokerInfos)); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->brokerName)); - ow_bit_buffer_read(bitbuffer); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_BrokerInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_BrokerInfo *object, apr_pool_t *pool) -{ - ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->brokerId, pool)); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->brokerURL, pool)); - SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->peerBrokerInfos, pool)); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->brokerName, pool)); - object->slaveBroker = ow_bit_buffer_read(bitbuffer); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_ActiveMQTempQueue(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_ACTIVEMQTEMPQUEUE_TYPE: - return 1; - } - return 0; -} - - -ow_ActiveMQTempQueue *ow_ActiveMQTempQueue_create(apr_pool_t *pool) -{ - ow_ActiveMQTempQueue *value = apr_pcalloc(pool,sizeof(ow_ActiveMQTempQueue)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_ACTIVEMQTEMPQUEUE_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_ActiveMQTempQueue(ow_bit_buffer *buffer, ow_ActiveMQTempQueue *object) -{ - ow_marshal1_ActiveMQTempDestination(buffer, (ow_ActiveMQTempDestination*)object); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ActiveMQTempQueue(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTempQueue *object) -{ - ow_marshal2_ActiveMQTempDestination(buffer, bitbuffer, (ow_ActiveMQTempDestination*)object); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ActiveMQTempQueue(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTempQueue *object, apr_pool_t *pool) -{ - ow_unmarshal_ActiveMQTempDestination(buffer, bitbuffer, (ow_ActiveMQTempDestination*)object, pool); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_LocalTransactionId(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -228,57 +78,6 @@ apr_status_t ow_unmarshal_LocalTransactionId(ow_byte_array *buffer, ow_bit_buffe return APR_SUCCESS; } -ow_boolean ow_is_a_RemoveSubscriptionInfo(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_REMOVESUBSCRIPTIONINFO_TYPE: - return 1; - } - return 0; -} - - -ow_RemoveSubscriptionInfo *ow_RemoveSubscriptionInfo_create(apr_pool_t *pool) -{ - ow_RemoveSubscriptionInfo *value = apr_pcalloc(pool,sizeof(ow_RemoveSubscriptionInfo)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_REMOVESUBSCRIPTIONINFO_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_RemoveSubscriptionInfo(ow_bit_buffer *buffer, ow_RemoveSubscriptionInfo *object) -{ - ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId)); - ow_marshal1_string(buffer, object->subcriptionName); - ow_marshal1_string(buffer, object->clientId); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_RemoveSubscriptionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_RemoveSubscriptionInfo *object) -{ - ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId)); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->subcriptionName)); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_RemoveSubscriptionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_RemoveSubscriptionInfo *object, apr_pool_t *pool) -{ - ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool)); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->subcriptionName, pool)); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool)); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_IntegerResponse(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -366,188 +165,680 @@ apr_status_t ow_unmarshal_ActiveMQQueue(ow_byte_array *buffer, ow_bit_buffer *bi return APR_SUCCESS; } -ow_boolean ow_is_a_DestinationInfo(ow_DataStructure *object) { +ow_boolean ow_is_a_TransactionId(ow_DataStructure *object) { if( object == 0 ) return 0; switch(object->structType) { - case OW_DESTINATIONINFO_TYPE: + case OW_LOCALTRANSACTIONID_TYPE: + case OW_XATRANSACTIONID_TYPE: return 1; } return 0; } -ow_DestinationInfo *ow_DestinationInfo_create(apr_pool_t *pool) +apr_status_t ow_marshal1_TransactionId(ow_bit_buffer *buffer, ow_TransactionId *object) { - ow_DestinationInfo *value = apr_pcalloc(pool,sizeof(ow_DestinationInfo)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_DESTINATIONINFO_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_DestinationInfo(ow_bit_buffer *buffer, ow_DestinationInfo *object) -{ - ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId)); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination)); - - ow_marshal1_long(buffer, object->timeout); - SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath)); + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); return APR_SUCCESS; } -apr_status_t ow_marshal2_DestinationInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_DestinationInfo *object) +apr_status_t ow_marshal2_TransactionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_TransactionId *object) { - ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId)); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination)); - SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->operationType)); - SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->timeout)); - SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath)); + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); return APR_SUCCESS; } -apr_status_t ow_unmarshal_DestinationInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_DestinationInfo *object, apr_pool_t *pool) +apr_status_t ow_unmarshal_TransactionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_TransactionId *object, apr_pool_t *pool) { - ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool)); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool)); - SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->operationType)); - SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->timeout, pool)); - SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool)); + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); return APR_SUCCESS; } -ow_boolean ow_is_a_ActiveMQBytesMessage(ow_DataStructure *object) { +ow_boolean ow_is_a_ActiveMQObjectMessage(ow_DataStructure *object) { if( object == 0 ) return 0; switch(object->structType) { - case OW_ACTIVEMQBYTESMESSAGE_TYPE: + case OW_ACTIVEMQOBJECTMESSAGE_TYPE: return 1; } return 0; } -ow_ActiveMQBytesMessage *ow_ActiveMQBytesMessage_create(apr_pool_t *pool) +ow_ActiveMQObjectMessage *ow_ActiveMQObjectMessage_create(apr_pool_t *pool) { - ow_ActiveMQBytesMessage *value = apr_pcalloc(pool,sizeof(ow_ActiveMQBytesMessage)); + ow_ActiveMQObjectMessage *value = apr_pcalloc(pool,sizeof(ow_ActiveMQObjectMessage)); if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_ACTIVEMQBYTESMESSAGE_TYPE; + ((ow_DataStructure*)value)->structType = OW_ACTIVEMQOBJECTMESSAGE_TYPE; } return value; } -apr_status_t ow_marshal1_ActiveMQBytesMessage(ow_bit_buffer *buffer, ow_ActiveMQBytesMessage *object) +apr_status_t ow_marshal1_ActiveMQObjectMessage(ow_bit_buffer *buffer, ow_ActiveMQObjectMessage *object) { ow_marshal1_ActiveMQMessage(buffer, (ow_ActiveMQMessage*)object); return APR_SUCCESS; } -apr_status_t ow_marshal2_ActiveMQBytesMessage(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQBytesMessage *object) +apr_status_t ow_marshal2_ActiveMQObjectMessage(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQObjectMessage *object) { ow_marshal2_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object); return APR_SUCCESS; } -apr_status_t ow_unmarshal_ActiveMQBytesMessage(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQBytesMessage *object, apr_pool_t *pool) +apr_status_t ow_unmarshal_ActiveMQObjectMessage(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQObjectMessage *object, apr_pool_t *pool) { ow_unmarshal_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object, pool); return APR_SUCCESS; } -ow_boolean ow_is_a_ShutdownInfo(ow_DataStructure *object) { +ow_boolean ow_is_a_ConnectionId(ow_DataStructure *object) { if( object == 0 ) return 0; switch(object->structType) { - case OW_SHUTDOWNINFO_TYPE: + case OW_CONNECTIONID_TYPE: return 1; } return 0; } -ow_ShutdownInfo *ow_ShutdownInfo_create(apr_pool_t *pool) +ow_ConnectionId *ow_ConnectionId_create(apr_pool_t *pool) { - ow_ShutdownInfo *value = apr_pcalloc(pool,sizeof(ow_ShutdownInfo)); + ow_ConnectionId *value = apr_pcalloc(pool,sizeof(ow_ConnectionId)); if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_SHUTDOWNINFO_TYPE; + ((ow_DataStructure*)value)->structType = OW_CONNECTIONID_TYPE; } return value; } -apr_status_t ow_marshal1_ShutdownInfo(ow_bit_buffer *buffer, ow_ShutdownInfo *object) +apr_status_t ow_marshal1_ConnectionId(ow_bit_buffer *buffer, ow_ConnectionId *object) +{ + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); + ow_marshal1_string(buffer, object->value); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ConnectionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionId *object) +{ + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->value)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ConnectionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionId *object, apr_pool_t *pool) +{ + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->value, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_ConnectionInfo(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_CONNECTIONINFO_TYPE: + return 1; + } + return 0; +} + + +ow_ConnectionInfo *ow_ConnectionInfo_create(apr_pool_t *pool) +{ + ow_ConnectionInfo *value = apr_pcalloc(pool,sizeof(ow_ConnectionInfo)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_CONNECTIONINFO_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_ConnectionInfo(ow_bit_buffer *buffer, ow_ConnectionInfo *object) { ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId)); + ow_marshal1_string(buffer, object->clientId); + ow_marshal1_string(buffer, object->password); + ow_marshal1_string(buffer, object->userName); + SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath)); return APR_SUCCESS; } -apr_status_t ow_marshal2_ShutdownInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ShutdownInfo *object) +apr_status_t ow_marshal2_ConnectionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionInfo *object) { ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId)); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId)); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->password)); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->userName)); + SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath)); return APR_SUCCESS; } -apr_status_t ow_unmarshal_ShutdownInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ShutdownInfo *object, apr_pool_t *pool) +apr_status_t ow_unmarshal_ConnectionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionInfo *object, apr_pool_t *pool) { ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool)); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool)); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->password, pool)); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->userName, pool)); + SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool)); return APR_SUCCESS; } -ow_boolean ow_is_a_DataResponse(ow_DataStructure *object) { +ow_boolean ow_is_a_ProducerInfo(ow_DataStructure *object) { if( object == 0 ) return 0; switch(object->structType) { - case OW_DATARESPONSE_TYPE: + case OW_PRODUCERINFO_TYPE: return 1; } return 0; } -ow_DataResponse *ow_DataResponse_create(apr_pool_t *pool) +ow_ProducerInfo *ow_ProducerInfo_create(apr_pool_t *pool) { - ow_DataResponse *value = apr_pcalloc(pool,sizeof(ow_DataResponse)); + ow_ProducerInfo *value = apr_pcalloc(pool,sizeof(ow_ProducerInfo)); if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_DATARESPONSE_TYPE; + ((ow_DataStructure*)value)->structType = OW_PRODUCERINFO_TYPE; } return value; } -apr_status_t ow_marshal1_DataResponse(ow_bit_buffer *buffer, ow_DataResponse *object) +apr_status_t ow_marshal1_ProducerInfo(ow_bit_buffer *buffer, ow_ProducerInfo *object) { - ow_marshal1_Response(buffer, (ow_Response*)object); - SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->data)); + ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->producerId)); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination)); + SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath)); return APR_SUCCESS; } -apr_status_t ow_marshal2_DataResponse(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_DataResponse *object) +apr_status_t ow_marshal2_ProducerInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ProducerInfo *object) { - ow_marshal2_Response(buffer, bitbuffer, (ow_Response*)object); - SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->data)); + ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->producerId)); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination)); + SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath)); return APR_SUCCESS; } -apr_status_t ow_unmarshal_DataResponse(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_DataResponse *object, apr_pool_t *pool) +apr_status_t ow_unmarshal_ProducerInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ProducerInfo *object, apr_pool_t *pool) { - ow_unmarshal_Response(buffer, bitbuffer, (ow_Response*)object, pool); - SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->data, pool)); + ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->producerId, pool)); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool)); + SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_MessageDispatchNotification(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_MESSAGEDISPATCHNOTIFICATION_TYPE: + return 1; + } + return 0; +} + + +ow_MessageDispatchNotification *ow_MessageDispatchNotification_create(apr_pool_t *pool) +{ + ow_MessageDispatchNotification *value = apr_pcalloc(pool,sizeof(ow_MessageDispatchNotification)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_MESSAGEDISPATCHNOTIFICATION_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_MessageDispatchNotification(ow_bit_buffer *buffer, ow_MessageDispatchNotification *object) +{ + ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->consumerId)); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination)); + ow_marshal1_long(buffer, object->deliverySequenceId); + SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->messageId)); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_MessageDispatchNotification(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_MessageDispatchNotification *object) +{ + ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->consumerId)); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination)); + SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->deliverySequenceId)); + SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->messageId)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_MessageDispatchNotification(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_MessageDispatchNotification *object, apr_pool_t *pool) +{ + ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->consumerId, pool)); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool)); + SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->deliverySequenceId, pool)); + SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->messageId, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_SessionInfo(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_SESSIONINFO_TYPE: + return 1; + } + return 0; +} + + +ow_SessionInfo *ow_SessionInfo_create(apr_pool_t *pool) +{ + ow_SessionInfo *value = apr_pcalloc(pool,sizeof(ow_SessionInfo)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_SESSIONINFO_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_SessionInfo(ow_bit_buffer *buffer, ow_SessionInfo *object) +{ + ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->sessionId)); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_SessionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_SessionInfo *object) +{ + ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->sessionId)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_SessionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_SessionInfo *object, apr_pool_t *pool) +{ + ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->sessionId, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_TransactionInfo(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_TRANSACTIONINFO_TYPE: + return 1; + } + return 0; +} + + +ow_TransactionInfo *ow_TransactionInfo_create(apr_pool_t *pool) +{ + ow_TransactionInfo *value = apr_pcalloc(pool,sizeof(ow_TransactionInfo)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_TRANSACTIONINFO_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_TransactionInfo(ow_bit_buffer *buffer, ow_TransactionInfo *object) +{ + ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId)); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->transactionId)); + + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_TransactionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_TransactionInfo *object) +{ + ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId)); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId)); + SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->type)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_TransactionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_TransactionInfo *object, apr_pool_t *pool) +{ + ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool)); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool)); + SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->type)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_ActiveMQStreamMessage(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_ACTIVEMQSTREAMMESSAGE_TYPE: + return 1; + } + return 0; +} + + +ow_ActiveMQStreamMessage *ow_ActiveMQStreamMessage_create(apr_pool_t *pool) +{ + ow_ActiveMQStreamMessage *value = apr_pcalloc(pool,sizeof(ow_ActiveMQStreamMessage)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_ACTIVEMQSTREAMMESSAGE_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_ActiveMQStreamMessage(ow_bit_buffer *buffer, ow_ActiveMQStreamMessage *object) +{ + ow_marshal1_ActiveMQMessage(buffer, (ow_ActiveMQMessage*)object); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ActiveMQStreamMessage(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQStreamMessage *object) +{ + ow_marshal2_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ActiveMQStreamMessage(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQStreamMessage *object, apr_pool_t *pool) +{ + ow_unmarshal_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object, pool); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_MessageAck(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_MESSAGEACK_TYPE: + return 1; + } + return 0; +} + + +ow_MessageAck *ow_MessageAck_create(apr_pool_t *pool) +{ + ow_MessageAck *value = apr_pcalloc(pool,sizeof(ow_MessageAck)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_MESSAGEACK_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_MessageAck(ow_bit_buffer *buffer, ow_MessageAck *object) +{ + ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination)); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->transactionId)); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->consumerId)); + + SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->firstMessageId)); + SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->lastMessageId)); + + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_MessageAck(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_MessageAck *object) +{ + ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination)); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId)); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->consumerId)); + SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->ackType)); + SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->firstMessageId)); + SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->lastMessageId)); + SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->messageCount)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_MessageAck(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_MessageAck *object, apr_pool_t *pool) +{ + ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool)); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool)); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->consumerId, pool)); + SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->ackType)); + SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->firstMessageId, pool)); + SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->lastMessageId, pool)); + SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->messageCount)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_ProducerId(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_PRODUCERID_TYPE: + return 1; + } + return 0; +} + + +ow_ProducerId *ow_ProducerId_create(apr_pool_t *pool) +{ + ow_ProducerId *value = apr_pcalloc(pool,sizeof(ow_ProducerId)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_PRODUCERID_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_ProducerId(ow_bit_buffer *buffer, ow_ProducerId *object) +{ + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); + ow_marshal1_string(buffer, object->connectionId); + ow_marshal1_long(buffer, object->value); + ow_marshal1_long(buffer, object->sessionId); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ProducerId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ProducerId *object) +{ + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->connectionId)); + SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->value)); + SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->sessionId)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ProducerId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ProducerId *object, apr_pool_t *pool) +{ + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->connectionId, pool)); + SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->value, pool)); + SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->sessionId, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_MessageId(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_MESSAGEID_TYPE: + return 1; + } + return 0; +} + + +ow_MessageId *ow_MessageId_create(apr_pool_t *pool) +{ + ow_MessageId *value = apr_pcalloc(pool,sizeof(ow_MessageId)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_MESSAGEID_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_MessageId(ow_bit_buffer *buffer, ow_MessageId *object) +{ + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->producerId)); + ow_marshal1_long(buffer, object->producerSequenceId); + ow_marshal1_long(buffer, object->brokerSequenceId); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_MessageId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_MessageId *object) +{ + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->producerId)); + SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->producerSequenceId)); + SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->brokerSequenceId)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_MessageId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_MessageId *object, apr_pool_t *pool) +{ + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->producerId, pool)); + SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->producerSequenceId, pool)); + SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->brokerSequenceId, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_ActiveMQTempQueue(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_ACTIVEMQTEMPQUEUE_TYPE: + return 1; + } + return 0; +} + + +ow_ActiveMQTempQueue *ow_ActiveMQTempQueue_create(apr_pool_t *pool) +{ + ow_ActiveMQTempQueue *value = apr_pcalloc(pool,sizeof(ow_ActiveMQTempQueue)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_ACTIVEMQTEMPQUEUE_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_ActiveMQTempQueue(ow_bit_buffer *buffer, ow_ActiveMQTempQueue *object) +{ + ow_marshal1_ActiveMQTempDestination(buffer, (ow_ActiveMQTempDestination*)object); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ActiveMQTempQueue(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTempQueue *object) +{ + ow_marshal2_ActiveMQTempDestination(buffer, bitbuffer, (ow_ActiveMQTempDestination*)object); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ActiveMQTempQueue(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTempQueue *object, apr_pool_t *pool) +{ + ow_unmarshal_ActiveMQTempDestination(buffer, bitbuffer, (ow_ActiveMQTempDestination*)object, pool); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_RemoveSubscriptionInfo(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_REMOVESUBSCRIPTIONINFO_TYPE: + return 1; + } + return 0; +} + + +ow_RemoveSubscriptionInfo *ow_RemoveSubscriptionInfo_create(apr_pool_t *pool) +{ + ow_RemoveSubscriptionInfo *value = apr_pcalloc(pool,sizeof(ow_RemoveSubscriptionInfo)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_REMOVESUBSCRIPTIONINFO_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_RemoveSubscriptionInfo(ow_bit_buffer *buffer, ow_RemoveSubscriptionInfo *object) +{ + ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId)); + ow_marshal1_string(buffer, object->subcriptionName); + ow_marshal1_string(buffer, object->clientId); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_RemoveSubscriptionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_RemoveSubscriptionInfo *object) +{ + ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId)); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->subcriptionName)); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_RemoveSubscriptionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_RemoveSubscriptionInfo *object, apr_pool_t *pool) +{ + ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool)); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->subcriptionName, pool)); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool)); return APR_SUCCESS; } @@ -693,111 +984,15 @@ apr_status_t ow_unmarshal_JournalQueueAck(ow_byte_array *buffer, ow_bit_buffer * return APR_SUCCESS; } -ow_boolean ow_is_a_WireFormatInfo(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_WIREFORMATINFO_TYPE: - return 1; - } - return 0; -} - - -ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool) -{ - ow_WireFormatInfo *value = apr_pcalloc(pool,sizeof(ow_WireFormatInfo)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_WIREFORMATINFO_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_WireFormatInfo(ow_bit_buffer *buffer, ow_WireFormatInfo *object) -{ - ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); - - - ow_bit_buffer_append(buffer, object->cacheEnabled); - ow_bit_buffer_append(buffer, object->stackTraceEnabled); - ow_bit_buffer_append(buffer, object->tcpNoDelayEnabled); - ow_bit_buffer_append(buffer, object->prefixPacketSize); - ow_bit_buffer_append(buffer, object->tightEncodingEnabled); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_WireFormatInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_WireFormatInfo *object) -{ - ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal2_byte_array_const_size(buffer, object->magic, 8)); - SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->version)); - ow_bit_buffer_read(bitbuffer); - ow_bit_buffer_read(bitbuffer); - ow_bit_buffer_read(bitbuffer); - ow_bit_buffer_read(bitbuffer); - ow_bit_buffer_read(bitbuffer); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_WireFormatInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_WireFormatInfo *object, apr_pool_t *pool) -{ - ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); - SUCCESS_CHECK(ow_unmarshal_byte_array_const_size(buffer, &object->magic, 8, pool)); - SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->version)); - object->cacheEnabled = ow_bit_buffer_read(bitbuffer); - object->stackTraceEnabled = ow_bit_buffer_read(bitbuffer); - object->tcpNoDelayEnabled = ow_bit_buffer_read(bitbuffer); - object->prefixPacketSize = ow_bit_buffer_read(bitbuffer); - object->tightEncodingEnabled = ow_bit_buffer_read(bitbuffer); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_TransactionId(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_LOCALTRANSACTIONID_TYPE: - case OW_XATRANSACTIONID_TYPE: - return 1; - } - return 0; -} - - -apr_status_t ow_marshal1_TransactionId(ow_bit_buffer *buffer, ow_TransactionId *object) -{ - ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_TransactionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_TransactionId *object) -{ - ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_TransactionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_TransactionId *object, apr_pool_t *pool) -{ - ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_Response(ow_DataStructure *object) { if( object == 0 ) return 0; switch(object->structType) { case OW_INTEGERRESPONSE_TYPE: - case OW_DATARESPONSE_TYPE: case OW_DATAARRAYRESPONSE_TYPE: case OW_RESPONSE_TYPE: + case OW_DATARESPONSE_TYPE: case OW_EXCEPTIONRESPONSE_TYPE: return 1; } @@ -886,48 +1081,6 @@ apr_status_t ow_unmarshal_ConnectionError(ow_byte_array *buffer, ow_bit_buffer * return APR_SUCCESS; } -ow_boolean ow_is_a_ActiveMQObjectMessage(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_ACTIVEMQOBJECTMESSAGE_TYPE: - return 1; - } - return 0; -} - - -ow_ActiveMQObjectMessage *ow_ActiveMQObjectMessage_create(apr_pool_t *pool) -{ - ow_ActiveMQObjectMessage *value = apr_pcalloc(pool,sizeof(ow_ActiveMQObjectMessage)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_ACTIVEMQOBJECTMESSAGE_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_ActiveMQObjectMessage(ow_bit_buffer *buffer, ow_ActiveMQObjectMessage *object) -{ - ow_marshal1_ActiveMQMessage(buffer, (ow_ActiveMQMessage*)object); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ActiveMQObjectMessage(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQObjectMessage *object) -{ - ow_marshal2_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ActiveMQObjectMessage(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQObjectMessage *object, apr_pool_t *pool) -{ - ow_unmarshal_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object, pool); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_ConsumerInfo(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -966,6 +1119,7 @@ apr_status_t ow_marshal1_ConsumerInfo(ow_bit_buffer *buffer, ow_ConsumerInfo *ob ow_bit_buffer_append(buffer, object->retroactive); SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath)); + SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->additionalPredicate)); ow_bit_buffer_append(buffer, object->networkSubscription); return APR_SUCCESS; @@ -986,6 +1140,7 @@ apr_status_t ow_marshal2_ConsumerInfo(ow_byte_buffer *buffer, ow_bit_buffer *bit ow_bit_buffer_read(bitbuffer); SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->priority)); SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath)); + SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->additionalPredicate)); ow_bit_buffer_read(bitbuffer); return APR_SUCCESS; @@ -1007,11 +1162,498 @@ apr_status_t ow_unmarshal_ConsumerInfo(ow_byte_array *buffer, ow_bit_buffer *bit object->retroactive = ow_bit_buffer_read(bitbuffer); SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->priority)); SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool)); + SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->additionalPredicate, pool)); object->networkSubscription = ow_bit_buffer_read(bitbuffer); return APR_SUCCESS; } +ow_boolean ow_is_a_XATransactionId(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_XATRANSACTIONID_TYPE: + return 1; + } + return 0; +} + + +ow_XATransactionId *ow_XATransactionId_create(apr_pool_t *pool) +{ + ow_XATransactionId *value = apr_pcalloc(pool,sizeof(ow_XATransactionId)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_XATRANSACTIONID_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_XATransactionId(ow_bit_buffer *buffer, ow_XATransactionId *object) +{ + ow_marshal1_TransactionId(buffer, (ow_TransactionId*)object); + + + ow_bit_buffer_append(buffer, object->globalTransactionId!=0 ); + + + ow_bit_buffer_append(buffer, object->branchQualifier!=0 ); + + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_XATransactionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_XATransactionId *object) +{ + ow_marshal2_TransactionId(buffer, bitbuffer, (ow_TransactionId*)object); + SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->formatId)); + SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->globalTransactionId)); + SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->branchQualifier)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_XATransactionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_XATransactionId *object, apr_pool_t *pool) +{ + ow_unmarshal_TransactionId(buffer, bitbuffer, (ow_TransactionId*)object, pool); + SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->formatId)); + SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->globalTransactionId, pool)); + SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->branchQualifier, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_JournalTrace(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_JOURNALTRACE_TYPE: + return 1; + } + return 0; +} + + +ow_JournalTrace *ow_JournalTrace_create(apr_pool_t *pool) +{ + ow_JournalTrace *value = apr_pcalloc(pool,sizeof(ow_JournalTrace)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_JOURNALTRACE_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_JournalTrace(ow_bit_buffer *buffer, ow_JournalTrace *object) +{ + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); + ow_marshal1_string(buffer, object->message); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_JournalTrace(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTrace *object) +{ + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->message)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_JournalTrace(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTrace *object, apr_pool_t *pool) +{ + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->message, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_ConsumerId(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_CONSUMERID_TYPE: + return 1; + } + return 0; +} + + +ow_ConsumerId *ow_ConsumerId_create(apr_pool_t *pool) +{ + ow_ConsumerId *value = apr_pcalloc(pool,sizeof(ow_ConsumerId)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_CONSUMERID_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_ConsumerId(ow_bit_buffer *buffer, ow_ConsumerId *object) +{ + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); + ow_marshal1_string(buffer, object->connectionId); + ow_marshal1_long(buffer, object->sessionId); + ow_marshal1_long(buffer, object->value); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ConsumerId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ConsumerId *object) +{ + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->connectionId)); + SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->sessionId)); + SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->value)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ConsumerId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ConsumerId *object, apr_pool_t *pool) +{ + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->connectionId, pool)); + SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->sessionId, pool)); + SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->value, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_ActiveMQTextMessage(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_ACTIVEMQTEXTMESSAGE_TYPE: + return 1; + } + return 0; +} + + +ow_ActiveMQTextMessage *ow_ActiveMQTextMessage_create(apr_pool_t *pool) +{ + ow_ActiveMQTextMessage *value = apr_pcalloc(pool,sizeof(ow_ActiveMQTextMessage)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_ACTIVEMQTEXTMESSAGE_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_ActiveMQTextMessage(ow_bit_buffer *buffer, ow_ActiveMQTextMessage *object) +{ + ow_marshal1_ActiveMQMessage(buffer, (ow_ActiveMQMessage*)object); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ActiveMQTextMessage(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTextMessage *object) +{ + ow_marshal2_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ActiveMQTextMessage(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTextMessage *object, apr_pool_t *pool) +{ + ow_unmarshal_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object, pool); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_SubscriptionInfo(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_SUBSCRIPTIONINFO_TYPE: + return 1; + } + return 0; +} + + +ow_SubscriptionInfo *ow_SubscriptionInfo_create(apr_pool_t *pool) +{ + ow_SubscriptionInfo *value = apr_pcalloc(pool,sizeof(ow_SubscriptionInfo)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_SUBSCRIPTIONINFO_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_SubscriptionInfo(ow_bit_buffer *buffer, ow_SubscriptionInfo *object) +{ + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); + ow_marshal1_string(buffer, object->clientId); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination)); + ow_marshal1_string(buffer, object->selector); + ow_marshal1_string(buffer, object->subcriptionName); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_SubscriptionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_SubscriptionInfo *object) +{ + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId)); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination)); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->selector)); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->subcriptionName)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_SubscriptionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_SubscriptionInfo *object, apr_pool_t *pool) +{ + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool)); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool)); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->selector, pool)); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->subcriptionName, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_JournalTransaction(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_JOURNALTRANSACTION_TYPE: + return 1; + } + return 0; +} + + +ow_JournalTransaction *ow_JournalTransaction_create(apr_pool_t *pool) +{ + ow_JournalTransaction *value = apr_pcalloc(pool,sizeof(ow_JournalTransaction)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_JOURNALTRANSACTION_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_JournalTransaction(ow_bit_buffer *buffer, ow_JournalTransaction *object) +{ + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->transactionId)); + + ow_bit_buffer_append(buffer, object->wasPrepared); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_JournalTransaction(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTransaction *object) +{ + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId)); + SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->type)); + ow_bit_buffer_read(bitbuffer); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_JournalTransaction(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTransaction *object, apr_pool_t *pool) +{ + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); + SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool)); + SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->type)); + object->wasPrepared = ow_bit_buffer_read(bitbuffer); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_ControlCommand(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_CONTROLCOMMAND_TYPE: + return 1; + } + return 0; +} + + +ow_ControlCommand *ow_ControlCommand_create(apr_pool_t *pool) +{ + ow_ControlCommand *value = apr_pcalloc(pool,sizeof(ow_ControlCommand)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_CONTROLCOMMAND_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_ControlCommand(ow_bit_buffer *buffer, ow_ControlCommand *object) +{ + ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); + ow_marshal1_string(buffer, object->command); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ControlCommand(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ControlCommand *object) +{ + ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->command)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ControlCommand(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ControlCommand *object, apr_pool_t *pool) +{ + ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->command, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_NetworkBridgeFilter(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_NETWORKBRIDGEFILTER_TYPE: + return 1; + } + return 0; +} + + +ow_NetworkBridgeFilter *ow_NetworkBridgeFilter_create(apr_pool_t *pool) +{ + ow_NetworkBridgeFilter *value = apr_pcalloc(pool,sizeof(ow_NetworkBridgeFilter)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_NETWORKBRIDGEFILTER_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_NetworkBridgeFilter(ow_bit_buffer *buffer, ow_NetworkBridgeFilter *object) +{ + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); + + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->networkBrokerId)); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_NetworkBridgeFilter(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_NetworkBridgeFilter *object) +{ + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->networkTTL)); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->networkBrokerId)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_NetworkBridgeFilter(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_NetworkBridgeFilter *object, apr_pool_t *pool) +{ + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); + SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->networkTTL)); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->networkBrokerId, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_ActiveMQBytesMessage(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_ACTIVEMQBYTESMESSAGE_TYPE: + return 1; + } + return 0; +} + + +ow_ActiveMQBytesMessage *ow_ActiveMQBytesMessage_create(apr_pool_t *pool) +{ + ow_ActiveMQBytesMessage *value = apr_pcalloc(pool,sizeof(ow_ActiveMQBytesMessage)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_ACTIVEMQBYTESMESSAGE_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_ActiveMQBytesMessage(ow_bit_buffer *buffer, ow_ActiveMQBytesMessage *object) +{ + ow_marshal1_ActiveMQMessage(buffer, (ow_ActiveMQMessage*)object); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ActiveMQBytesMessage(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQBytesMessage *object) +{ + ow_marshal2_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ActiveMQBytesMessage(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQBytesMessage *object, apr_pool_t *pool) +{ + ow_unmarshal_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object, pool); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_WireFormatInfo(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_WIREFORMATINFO_TYPE: + return 1; + } + return 0; +} + + +ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool) +{ + ow_WireFormatInfo *value = apr_pcalloc(pool,sizeof(ow_WireFormatInfo)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_WIREFORMATINFO_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_WireFormatInfo(ow_bit_buffer *buffer, ow_WireFormatInfo *object) +{ + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); + + + + ow_bit_buffer_append(buffer, object->marshalledProperties!=0 ); + + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_WireFormatInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_WireFormatInfo *object) +{ + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal2_byte_array_const_size(buffer, object->magic, 8)); + SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->version)); + SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->marshalledProperties)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_WireFormatInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_WireFormatInfo *object, apr_pool_t *pool) +{ + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); + SUCCESS_CHECK(ow_unmarshal_byte_array_const_size(buffer, &object->magic, 8, pool)); + SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->version)); + SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->marshalledProperties, pool)); + + return APR_SUCCESS; +} + ow_boolean ow_is_a_ActiveMQTempTopic(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -1054,51 +1696,6 @@ apr_status_t ow_unmarshal_ActiveMQTempTopic(ow_byte_array *buffer, ow_bit_buffer return APR_SUCCESS; } -ow_boolean ow_is_a_ConnectionId(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_CONNECTIONID_TYPE: - return 1; - } - return 0; -} - - -ow_ConnectionId *ow_ConnectionId_create(apr_pool_t *pool) -{ - ow_ConnectionId *value = apr_pcalloc(pool,sizeof(ow_ConnectionId)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_CONNECTIONID_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_ConnectionId(ow_bit_buffer *buffer, ow_ConnectionId *object) -{ - ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); - ow_marshal1_string(buffer, object->value); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ConnectionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionId *object) -{ - ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->value)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ConnectionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionId *object, apr_pool_t *pool) -{ - ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->value, pool)); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_DiscoveryEvent(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -1147,63 +1744,320 @@ apr_status_t ow_unmarshal_DiscoveryEvent(ow_byte_array *buffer, ow_bit_buffer *b return APR_SUCCESS; } -ow_boolean ow_is_a_ConnectionInfo(ow_DataStructure *object) { +ow_boolean ow_is_a_ActiveMQTempDestination(ow_DataStructure *object) { if( object == 0 ) return 0; switch(object->structType) { - case OW_CONNECTIONINFO_TYPE: + case OW_ACTIVEMQTEMPQUEUE_TYPE: + case OW_ACTIVEMQTEMPTOPIC_TYPE: return 1; } return 0; } -ow_ConnectionInfo *ow_ConnectionInfo_create(apr_pool_t *pool) +apr_status_t ow_marshal1_ActiveMQTempDestination(ow_bit_buffer *buffer, ow_ActiveMQTempDestination *object) { - ow_ConnectionInfo *value = apr_pcalloc(pool,sizeof(ow_ConnectionInfo)); + ow_marshal1_ActiveMQDestination(buffer, (ow_ActiveMQDestination*)object); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ActiveMQTempDestination(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTempDestination *object) +{ + ow_marshal2_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ActiveMQTempDestination(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTempDestination *object, apr_pool_t *pool) +{ + ow_unmarshal_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object, pool); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_ActiveMQDestination(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_ACTIVEMQQUEUE_TYPE: + case OW_ACTIVEMQTEMPQUEUE_TYPE: + case OW_ACTIVEMQTEMPTOPIC_TYPE: + case OW_ACTIVEMQTOPIC_TYPE: + return 1; + } + return 0; +} + + +apr_status_t ow_marshal1_ActiveMQDestination(ow_bit_buffer *buffer, ow_ActiveMQDestination *object) +{ + ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); + ow_marshal1_string(buffer, object->physicalName); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ActiveMQDestination(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQDestination *object) +{ + ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->physicalName)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ActiveMQDestination(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQDestination *object, apr_pool_t *pool) +{ + ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->physicalName, pool)); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_ActiveMQTopic(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_ACTIVEMQTOPIC_TYPE: + return 1; + } + return 0; +} + + +ow_ActiveMQTopic *ow_ActiveMQTopic_create(apr_pool_t *pool) +{ + ow_ActiveMQTopic *value = apr_pcalloc(pool,sizeof(ow_ActiveMQTopic)); if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_CONNECTIONINFO_TYPE; + ((ow_DataStructure*)value)->structType = OW_ACTIVEMQTOPIC_TYPE; } return value; } -apr_status_t ow_marshal1_ConnectionInfo(ow_bit_buffer *buffer, ow_ConnectionInfo *object) +apr_status_t ow_marshal1_ActiveMQTopic(ow_bit_buffer *buffer, ow_ActiveMQTopic *object) +{ + ow_marshal1_ActiveMQDestination(buffer, (ow_ActiveMQDestination*)object); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ActiveMQTopic(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTopic *object) +{ + ow_marshal2_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ActiveMQTopic(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTopic *object, apr_pool_t *pool) +{ + ow_unmarshal_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object, pool); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_BrokerInfo(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_BROKERINFO_TYPE: + return 1; + } + return 0; +} + + +ow_BrokerInfo *ow_BrokerInfo_create(apr_pool_t *pool) +{ + ow_BrokerInfo *value = apr_pcalloc(pool,sizeof(ow_BrokerInfo)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_BROKERINFO_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_BrokerInfo(ow_bit_buffer *buffer, ow_BrokerInfo *object) +{ + ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->brokerId)); + ow_marshal1_string(buffer, object->brokerURL); + SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->peerBrokerInfos)); + ow_marshal1_string(buffer, object->brokerName); + ow_bit_buffer_append(buffer, object->slaveBroker); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_BrokerInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_BrokerInfo *object) +{ + ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->brokerId)); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->brokerURL)); + SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->peerBrokerInfos)); + SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->brokerName)); + ow_bit_buffer_read(bitbuffer); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_BrokerInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_BrokerInfo *object, apr_pool_t *pool) +{ + ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->brokerId, pool)); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->brokerURL, pool)); + SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->peerBrokerInfos, pool)); + SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->brokerName, pool)); + object->slaveBroker = ow_bit_buffer_read(bitbuffer); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_DestinationInfo(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_DESTINATIONINFO_TYPE: + return 1; + } + return 0; +} + + +ow_DestinationInfo *ow_DestinationInfo_create(apr_pool_t *pool) +{ + ow_DestinationInfo *value = apr_pcalloc(pool,sizeof(ow_DestinationInfo)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_DESTINATIONINFO_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_DestinationInfo(ow_bit_buffer *buffer, ow_DestinationInfo *object) { ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId)); - ow_marshal1_string(buffer, object->clientId); - ow_marshal1_string(buffer, object->password); - ow_marshal1_string(buffer, object->userName); + SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination)); + + ow_marshal1_long(buffer, object->timeout); SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath)); return APR_SUCCESS; } -apr_status_t ow_marshal2_ConnectionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionInfo *object) +apr_status_t ow_marshal2_DestinationInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_DestinationInfo *object) { ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId)); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId)); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->password)); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->userName)); + SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination)); + SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->operationType)); + SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->timeout)); SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath)); return APR_SUCCESS; } -apr_status_t ow_unmarshal_ConnectionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ConnectionInfo *object, apr_pool_t *pool) +apr_status_t ow_unmarshal_DestinationInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_DestinationInfo *object, apr_pool_t *pool) { ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool)); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool)); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->password, pool)); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->userName, pool)); + SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool)); + SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->operationType)); + SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->timeout, pool)); SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool)); return APR_SUCCESS; } +ow_boolean ow_is_a_ShutdownInfo(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_SHUTDOWNINFO_TYPE: + return 1; + } + return 0; +} + + +ow_ShutdownInfo *ow_ShutdownInfo_create(apr_pool_t *pool) +{ + ow_ShutdownInfo *value = apr_pcalloc(pool,sizeof(ow_ShutdownInfo)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_SHUTDOWNINFO_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_ShutdownInfo(ow_bit_buffer *buffer, ow_ShutdownInfo *object) +{ + ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_ShutdownInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ShutdownInfo *object) +{ + ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_ShutdownInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ShutdownInfo *object, apr_pool_t *pool) +{ + ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); + + return APR_SUCCESS; +} + +ow_boolean ow_is_a_DataResponse(ow_DataStructure *object) { + if( object == 0 ) + return 0; + + switch(object->structType) { + case OW_DATARESPONSE_TYPE: + return 1; + } + return 0; +} + + +ow_DataResponse *ow_DataResponse_create(apr_pool_t *pool) +{ + ow_DataResponse *value = apr_pcalloc(pool,sizeof(ow_DataResponse)); + if( value!=0 ) { + ((ow_DataStructure*)value)->structType = OW_DATARESPONSE_TYPE; + } + return value; +} + + +apr_status_t ow_marshal1_DataResponse(ow_bit_buffer *buffer, ow_DataResponse *object) +{ + ow_marshal1_Response(buffer, (ow_Response*)object); + SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->data)); + + return APR_SUCCESS; +} +apr_status_t ow_marshal2_DataResponse(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_DataResponse *object) +{ + ow_marshal2_Response(buffer, bitbuffer, (ow_Response*)object); + SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->data)); + + return APR_SUCCESS; +} + +apr_status_t ow_unmarshal_DataResponse(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_DataResponse *object, apr_pool_t *pool) +{ + ow_unmarshal_Response(buffer, bitbuffer, (ow_Response*)object, pool); + SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->data, pool)); + + return APR_SUCCESS; +} + ow_boolean ow_is_a_KeepAliveInfo(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -1251,12 +2105,12 @@ ow_boolean ow_is_a_Message(ow_DataStructure *object) { return 0; switch(object->structType) { - case OW_ACTIVEMQBYTESMESSAGE_TYPE: case OW_ACTIVEMQOBJECTMESSAGE_TYPE: + case OW_ACTIVEMQSTREAMMESSAGE_TYPE: case OW_ACTIVEMQTEXTMESSAGE_TYPE: + case OW_ACTIVEMQBYTESMESSAGE_TYPE: case OW_ACTIVEMQMAPMESSAGE_TYPE: case OW_ACTIVEMQMESSAGE_TYPE: - case OW_ACTIVEMQSTREAMMESSAGE_TYPE: return 1; } return 0; @@ -1367,32 +2221,32 @@ ow_boolean ow_is_a_BaseCommand(ow_DataStructure *object) { return 0; switch(object->structType) { - case OW_BROKERINFO_TYPE: - case OW_REMOVESUBSCRIPTIONINFO_TYPE: case OW_INTEGERRESPONSE_TYPE: - case OW_DESTINATIONINFO_TYPE: - case OW_ACTIVEMQBYTESMESSAGE_TYPE: - case OW_SHUTDOWNINFO_TYPE: - case OW_DATARESPONSE_TYPE: - case OW_DATAARRAYRESPONSE_TYPE: - case OW_RESPONSE_TYPE: - case OW_CONNECTIONERROR_TYPE: case OW_ACTIVEMQOBJECTMESSAGE_TYPE: - case OW_CONSUMERINFO_TYPE: case OW_CONNECTIONINFO_TYPE: - case OW_FLUSHCOMMAND_TYPE: - case OW_ACTIVEMQTEXTMESSAGE_TYPE: - case OW_MESSAGEDISPATCH_TYPE: case OW_PRODUCERINFO_TYPE: - case OW_ACTIVEMQMAPMESSAGE_TYPE: case OW_MESSAGEDISPATCHNOTIFICATION_TYPE: case OW_SESSIONINFO_TYPE: - case OW_ACTIVEMQMESSAGE_TYPE: case OW_TRANSACTIONINFO_TYPE: case OW_ACTIVEMQSTREAMMESSAGE_TYPE: case OW_MESSAGEACK_TYPE: - case OW_REMOVEINFO_TYPE: + case OW_REMOVESUBSCRIPTIONINFO_TYPE: + case OW_DATAARRAYRESPONSE_TYPE: + case OW_RESPONSE_TYPE: + case OW_CONNECTIONERROR_TYPE: + case OW_CONSUMERINFO_TYPE: + case OW_ACTIVEMQTEXTMESSAGE_TYPE: case OW_CONTROLCOMMAND_TYPE: + case OW_ACTIVEMQBYTESMESSAGE_TYPE: + case OW_BROKERINFO_TYPE: + case OW_DESTINATIONINFO_TYPE: + case OW_SHUTDOWNINFO_TYPE: + case OW_DATARESPONSE_TYPE: + case OW_FLUSHCOMMAND_TYPE: + case OW_MESSAGEDISPATCH_TYPE: + case OW_ACTIVEMQMAPMESSAGE_TYPE: + case OW_ACTIVEMQMESSAGE_TYPE: + case OW_REMOVEINFO_TYPE: case OW_EXCEPTIONRESPONSE_TYPE: return 1; } @@ -1426,106 +2280,6 @@ apr_status_t ow_unmarshal_BaseCommand(ow_byte_array *buffer, ow_bit_buffer *bitb return APR_SUCCESS; } -ow_boolean ow_is_a_XATransactionId(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_XATRANSACTIONID_TYPE: - return 1; - } - return 0; -} - - -ow_XATransactionId *ow_XATransactionId_create(apr_pool_t *pool) -{ - ow_XATransactionId *value = apr_pcalloc(pool,sizeof(ow_XATransactionId)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_XATRANSACTIONID_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_XATransactionId(ow_bit_buffer *buffer, ow_XATransactionId *object) -{ - ow_marshal1_TransactionId(buffer, (ow_TransactionId*)object); - - - ow_bit_buffer_append(buffer, object->globalTransactionId!=0 ); - - - ow_bit_buffer_append(buffer, object->branchQualifier!=0 ); - - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_XATransactionId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_XATransactionId *object) -{ - ow_marshal2_TransactionId(buffer, bitbuffer, (ow_TransactionId*)object); - SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->formatId)); - SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->globalTransactionId)); - SUCCESS_CHECK(ow_marshal2_byte_array(buffer, bitbuffer, object->branchQualifier)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_XATransactionId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_XATransactionId *object, apr_pool_t *pool) -{ - ow_unmarshal_TransactionId(buffer, bitbuffer, (ow_TransactionId*)object, pool); - SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->formatId)); - SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->globalTransactionId, pool)); - SUCCESS_CHECK(ow_unmarshal_byte_array(buffer, bitbuffer, &object->branchQualifier, pool)); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_JournalTrace(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_JOURNALTRACE_TYPE: - return 1; - } - return 0; -} - - -ow_JournalTrace *ow_JournalTrace_create(apr_pool_t *pool) -{ - ow_JournalTrace *value = apr_pcalloc(pool,sizeof(ow_JournalTrace)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_JOURNALTRACE_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_JournalTrace(ow_bit_buffer *buffer, ow_JournalTrace *object) -{ - ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); - ow_marshal1_string(buffer, object->message); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_JournalTrace(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTrace *object) -{ - ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->message)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_JournalTrace(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTrace *object, apr_pool_t *pool) -{ - ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->message, pool)); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_FlushCommand(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -1568,90 +2322,6 @@ apr_status_t ow_unmarshal_FlushCommand(ow_byte_array *buffer, ow_bit_buffer *bit return APR_SUCCESS; } -ow_boolean ow_is_a_ActiveMQTempDestination(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_ACTIVEMQTEMPQUEUE_TYPE: - case OW_ACTIVEMQTEMPTOPIC_TYPE: - return 1; - } - return 0; -} - - -apr_status_t ow_marshal1_ActiveMQTempDestination(ow_bit_buffer *buffer, ow_ActiveMQTempDestination *object) -{ - ow_marshal1_ActiveMQDestination(buffer, (ow_ActiveMQDestination*)object); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ActiveMQTempDestination(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTempDestination *object) -{ - ow_marshal2_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ActiveMQTempDestination(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTempDestination *object, apr_pool_t *pool) -{ - ow_unmarshal_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object, pool); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_ConsumerId(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_CONSUMERID_TYPE: - return 1; - } - return 0; -} - - -ow_ConsumerId *ow_ConsumerId_create(apr_pool_t *pool) -{ - ow_ConsumerId *value = apr_pcalloc(pool,sizeof(ow_ConsumerId)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_CONSUMERID_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_ConsumerId(ow_bit_buffer *buffer, ow_ConsumerId *object) -{ - ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); - ow_marshal1_string(buffer, object->connectionId); - ow_marshal1_long(buffer, object->sessionId); - ow_marshal1_long(buffer, object->value); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ConsumerId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ConsumerId *object) -{ - ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->connectionId)); - SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->sessionId)); - SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->value)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ConsumerId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ConsumerId *object, apr_pool_t *pool) -{ - ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->connectionId, pool)); - SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->sessionId, pool)); - SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->value, pool)); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_JournalTopicAck(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -1712,48 +2382,6 @@ apr_status_t ow_unmarshal_JournalTopicAck(ow_byte_array *buffer, ow_bit_buffer * return APR_SUCCESS; } -ow_boolean ow_is_a_ActiveMQTextMessage(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_ACTIVEMQTEXTMESSAGE_TYPE: - return 1; - } - return 0; -} - - -ow_ActiveMQTextMessage *ow_ActiveMQTextMessage_create(apr_pool_t *pool) -{ - ow_ActiveMQTextMessage *value = apr_pcalloc(pool,sizeof(ow_ActiveMQTextMessage)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_ACTIVEMQTEXTMESSAGE_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_ActiveMQTextMessage(ow_bit_buffer *buffer, ow_ActiveMQTextMessage *object) -{ - ow_marshal1_ActiveMQMessage(buffer, (ow_ActiveMQMessage*)object); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ActiveMQTextMessage(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTextMessage *object) -{ - ow_marshal2_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ActiveMQTextMessage(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTextMessage *object, apr_pool_t *pool) -{ - ow_unmarshal_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object, pool); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_BrokerId(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -1853,111 +2481,6 @@ apr_status_t ow_unmarshal_MessageDispatch(ow_byte_array *buffer, ow_bit_buffer * return APR_SUCCESS; } -ow_boolean ow_is_a_ProducerInfo(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_PRODUCERINFO_TYPE: - return 1; - } - return 0; -} - - -ow_ProducerInfo *ow_ProducerInfo_create(apr_pool_t *pool) -{ - ow_ProducerInfo *value = apr_pcalloc(pool,sizeof(ow_ProducerInfo)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_PRODUCERINFO_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_ProducerInfo(ow_bit_buffer *buffer, ow_ProducerInfo *object) -{ - ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->producerId)); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination)); - SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath)); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ProducerInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ProducerInfo *object) -{ - ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->producerId)); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination)); - SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer, object->brokerPath)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ProducerInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ProducerInfo *object, apr_pool_t *pool) -{ - ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->producerId, pool)); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool)); - SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer, &object->brokerPath, pool)); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_SubscriptionInfo(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_SUBSCRIPTIONINFO_TYPE: - return 1; - } - return 0; -} - - -ow_SubscriptionInfo *ow_SubscriptionInfo_create(apr_pool_t *pool) -{ - ow_SubscriptionInfo *value = apr_pcalloc(pool,sizeof(ow_SubscriptionInfo)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_SUBSCRIPTIONINFO_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_SubscriptionInfo(ow_bit_buffer *buffer, ow_SubscriptionInfo *object) -{ - ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); - ow_marshal1_string(buffer, object->clientId); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination)); - ow_marshal1_string(buffer, object->selector); - ow_marshal1_string(buffer, object->subcriptionName); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_SubscriptionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_SubscriptionInfo *object) -{ - ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->clientId)); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination)); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->selector)); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->subcriptionName)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_SubscriptionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_SubscriptionInfo *object, apr_pool_t *pool) -{ - ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->clientId, pool)); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool)); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->selector, pool)); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->subcriptionName, pool)); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_ActiveMQMapMessage(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -2000,116 +2523,17 @@ apr_status_t ow_unmarshal_ActiveMQMapMessage(ow_byte_array *buffer, ow_bit_buffe return APR_SUCCESS; } -ow_boolean ow_is_a_MessageDispatchNotification(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_MESSAGEDISPATCHNOTIFICATION_TYPE: - return 1; - } - return 0; -} - - -ow_MessageDispatchNotification *ow_MessageDispatchNotification_create(apr_pool_t *pool) -{ - ow_MessageDispatchNotification *value = apr_pcalloc(pool,sizeof(ow_MessageDispatchNotification)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_MESSAGEDISPATCHNOTIFICATION_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_MessageDispatchNotification(ow_bit_buffer *buffer, ow_MessageDispatchNotification *object) -{ - ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->consumerId)); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination)); - ow_marshal1_long(buffer, object->deliverySequenceId); - SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->messageId)); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_MessageDispatchNotification(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_MessageDispatchNotification *object) -{ - ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->consumerId)); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination)); - SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->deliverySequenceId)); - SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->messageId)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_MessageDispatchNotification(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_MessageDispatchNotification *object, apr_pool_t *pool) -{ - ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->consumerId, pool)); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool)); - SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->deliverySequenceId, pool)); - SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->messageId, pool)); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_SessionInfo(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_SESSIONINFO_TYPE: - return 1; - } - return 0; -} - - -ow_SessionInfo *ow_SessionInfo_create(apr_pool_t *pool) -{ - ow_SessionInfo *value = apr_pcalloc(pool,sizeof(ow_SessionInfo)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_SESSIONINFO_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_SessionInfo(ow_bit_buffer *buffer, ow_SessionInfo *object) -{ - ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->sessionId)); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_SessionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_SessionInfo *object) -{ - ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->sessionId)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_SessionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_SessionInfo *object, apr_pool_t *pool) -{ - ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->sessionId, pool)); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_ActiveMQMessage(ow_DataStructure *object) { if( object == 0 ) return 0; switch(object->structType) { - case OW_ACTIVEMQBYTESMESSAGE_TYPE: case OW_ACTIVEMQOBJECTMESSAGE_TYPE: + case OW_ACTIVEMQSTREAMMESSAGE_TYPE: case OW_ACTIVEMQTEXTMESSAGE_TYPE: + case OW_ACTIVEMQBYTESMESSAGE_TYPE: case OW_ACTIVEMQMAPMESSAGE_TYPE: case OW_ACTIVEMQMESSAGE_TYPE: - case OW_ACTIVEMQSTREAMMESSAGE_TYPE: return 1; } return 0; @@ -2146,344 +2570,6 @@ apr_status_t ow_unmarshal_ActiveMQMessage(ow_byte_array *buffer, ow_bit_buffer * return APR_SUCCESS; } -ow_boolean ow_is_a_TransactionInfo(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_TRANSACTIONINFO_TYPE: - return 1; - } - return 0; -} - - -ow_TransactionInfo *ow_TransactionInfo_create(apr_pool_t *pool) -{ - ow_TransactionInfo *value = apr_pcalloc(pool,sizeof(ow_TransactionInfo)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_TRANSACTIONINFO_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_TransactionInfo(ow_bit_buffer *buffer, ow_TransactionInfo *object) -{ - ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->connectionId)); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->transactionId)); - - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_TransactionInfo(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_TransactionInfo *object) -{ - ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->connectionId)); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId)); - SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->type)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_TransactionInfo(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_TransactionInfo *object, apr_pool_t *pool) -{ - ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->connectionId, pool)); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool)); - SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->type)); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_ActiveMQStreamMessage(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_ACTIVEMQSTREAMMESSAGE_TYPE: - return 1; - } - return 0; -} - - -ow_ActiveMQStreamMessage *ow_ActiveMQStreamMessage_create(apr_pool_t *pool) -{ - ow_ActiveMQStreamMessage *value = apr_pcalloc(pool,sizeof(ow_ActiveMQStreamMessage)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_ACTIVEMQSTREAMMESSAGE_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_ActiveMQStreamMessage(ow_bit_buffer *buffer, ow_ActiveMQStreamMessage *object) -{ - ow_marshal1_ActiveMQMessage(buffer, (ow_ActiveMQMessage*)object); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ActiveMQStreamMessage(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQStreamMessage *object) -{ - ow_marshal2_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ActiveMQStreamMessage(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQStreamMessage *object, apr_pool_t *pool) -{ - ow_unmarshal_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object, pool); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_ActiveMQDestination(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_ACTIVEMQTEMPQUEUE_TYPE: - case OW_ACTIVEMQQUEUE_TYPE: - case OW_ACTIVEMQTEMPTOPIC_TYPE: - case OW_ACTIVEMQTOPIC_TYPE: - return 1; - } - return 0; -} - - -apr_status_t ow_marshal1_ActiveMQDestination(ow_bit_buffer *buffer, ow_ActiveMQDestination *object) -{ - ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); - ow_marshal1_string(buffer, object->physicalName); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ActiveMQDestination(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQDestination *object) -{ - ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->physicalName)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ActiveMQDestination(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQDestination *object, apr_pool_t *pool) -{ - ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->physicalName, pool)); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_MessageAck(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_MESSAGEACK_TYPE: - return 1; - } - return 0; -} - - -ow_MessageAck *ow_MessageAck_create(apr_pool_t *pool) -{ - ow_MessageAck *value = apr_pcalloc(pool,sizeof(ow_MessageAck)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_MESSAGEACK_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_MessageAck(ow_bit_buffer *buffer, ow_MessageAck *object) -{ - ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->destination)); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->transactionId)); - SUCCESS_CHECK(ow_marshal1_cached_object(buffer, (ow_DataStructure*)object->consumerId)); - - SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->firstMessageId)); - SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->lastMessageId)); - - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_MessageAck(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_MessageAck *object) -{ - ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->destination)); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId)); - SUCCESS_CHECK(ow_marshal2_cached_object(buffer, bitbuffer, (ow_DataStructure*)object->consumerId)); - SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->ackType)); - SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->firstMessageId)); - SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->lastMessageId)); - SUCCESS_CHECK(ow_byte_buffer_append_int(buffer, object->messageCount)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_MessageAck(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_MessageAck *object, apr_pool_t *pool) -{ - ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->destination, pool)); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool)); - SUCCESS_CHECK(ow_unmarshal_cached_object(buffer, bitbuffer, (ow_DataStructure**)&object->consumerId, pool)); - SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->ackType)); - SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->firstMessageId, pool)); - SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->lastMessageId, pool)); - SUCCESS_CHECK(ow_byte_array_read_int(buffer, &object->messageCount)); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_ProducerId(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_PRODUCERID_TYPE: - return 1; - } - return 0; -} - - -ow_ProducerId *ow_ProducerId_create(apr_pool_t *pool) -{ - ow_ProducerId *value = apr_pcalloc(pool,sizeof(ow_ProducerId)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_PRODUCERID_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_ProducerId(ow_bit_buffer *buffer, ow_ProducerId *object) -{ - ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); - ow_marshal1_string(buffer, object->connectionId); - ow_marshal1_long(buffer, object->value); - ow_marshal1_long(buffer, object->sessionId); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ProducerId(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ProducerId *object) -{ - ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->connectionId)); - SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->value)); - SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->sessionId)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ProducerId(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ProducerId *object, apr_pool_t *pool) -{ - ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->connectionId, pool)); - SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->value, pool)); - SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->sessionId, pool)); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_ActiveMQTopic(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_ACTIVEMQTOPIC_TYPE: - return 1; - } - return 0; -} - - -ow_ActiveMQTopic *ow_ActiveMQTopic_create(apr_pool_t *pool) -{ - ow_ActiveMQTopic *value = apr_pcalloc(pool,sizeof(ow_ActiveMQTopic)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_ACTIVEMQTOPIC_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_ActiveMQTopic(ow_bit_buffer *buffer, ow_ActiveMQTopic *object) -{ - ow_marshal1_ActiveMQDestination(buffer, (ow_ActiveMQDestination*)object); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ActiveMQTopic(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTopic *object) -{ - ow_marshal2_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ActiveMQTopic(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ActiveMQTopic *object, apr_pool_t *pool) -{ - ow_unmarshal_ActiveMQDestination(buffer, bitbuffer, (ow_ActiveMQDestination*)object, pool); - - return APR_SUCCESS; -} - -ow_boolean ow_is_a_JournalTransaction(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_JOURNALTRANSACTION_TYPE: - return 1; - } - return 0; -} - - -ow_JournalTransaction *ow_JournalTransaction_create(apr_pool_t *pool) -{ - ow_JournalTransaction *value = apr_pcalloc(pool,sizeof(ow_JournalTransaction)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_JOURNALTRANSACTION_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_JournalTransaction(ow_bit_buffer *buffer, ow_JournalTransaction *object) -{ - ow_marshal1_DataStructure(buffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal1_nested_object(buffer, (ow_DataStructure*)object->transactionId)); - - ow_bit_buffer_append(buffer, object->wasPrepared); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_JournalTransaction(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_JournalTransaction *object) -{ - ow_marshal2_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object); - SUCCESS_CHECK(ow_marshal2_nested_object(buffer, bitbuffer, (ow_DataStructure*)object->transactionId)); - SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->type)); - ow_bit_buffer_read(bitbuffer); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_JournalTransaction(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_JournalTransaction *object, apr_pool_t *pool) -{ - ow_unmarshal_DataStructure(buffer, bitbuffer, (ow_DataStructure*)object, pool); - SUCCESS_CHECK(ow_unmarshal_nested_object(buffer, bitbuffer, (ow_DataStructure**)&object->transactionId, pool)); - SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->type)); - object->wasPrepared = ow_bit_buffer_read(bitbuffer); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_RemoveInfo(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -2529,51 +2615,6 @@ apr_status_t ow_unmarshal_RemoveInfo(ow_byte_array *buffer, ow_bit_buffer *bitbu return APR_SUCCESS; } -ow_boolean ow_is_a_ControlCommand(ow_DataStructure *object) { - if( object == 0 ) - return 0; - - switch(object->structType) { - case OW_CONTROLCOMMAND_TYPE: - return 1; - } - return 0; -} - - -ow_ControlCommand *ow_ControlCommand_create(apr_pool_t *pool) -{ - ow_ControlCommand *value = apr_pcalloc(pool,sizeof(ow_ControlCommand)); - if( value!=0 ) { - ((ow_DataStructure*)value)->structType = OW_CONTROLCOMMAND_TYPE; - } - return value; -} - - -apr_status_t ow_marshal1_ControlCommand(ow_bit_buffer *buffer, ow_ControlCommand *object) -{ - ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object); - ow_marshal1_string(buffer, object->command); - - return APR_SUCCESS; -} -apr_status_t ow_marshal2_ControlCommand(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_ControlCommand *object) -{ - ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object); - SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->command)); - - return APR_SUCCESS; -} - -apr_status_t ow_unmarshal_ControlCommand(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_ControlCommand *object, apr_pool_t *pool) -{ - ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool); - SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->command, pool)); - - return APR_SUCCESS; -} - ow_boolean ow_is_a_ExceptionResponse(ow_DataStructure *object) { if( object == 0 ) return 0; @@ -2623,52 +2664,53 @@ ow_DataStructure *ow_create_object(ow_byte type, apr_pool_t *pool) { switch( type ) { - case OW_MESSAGEID_TYPE: return (ow_DataStructure *)ow_MessageId_create(pool); - case OW_BROKERINFO_TYPE: return (ow_DataStructure *)ow_BrokerInfo_create(pool); - case OW_ACTIVEMQTEMPQUEUE_TYPE: return (ow_DataStructure *)ow_ActiveMQTempQueue_create(pool); case OW_LOCALTRANSACTIONID_TYPE: return (ow_DataStructure *)ow_LocalTransactionId_create(pool); - case OW_REMOVESUBSCRIPTIONINFO_TYPE: return (ow_DataStructure *)ow_RemoveSubscriptionInfo_create(pool); case OW_INTEGERRESPONSE_TYPE: return (ow_DataStructure *)ow_IntegerResponse_create(pool); case OW_ACTIVEMQQUEUE_TYPE: return (ow_DataStructure *)ow_ActiveMQQueue_create(pool); - case OW_DESTINATIONINFO_TYPE: return (ow_DataStructure *)ow_DestinationInfo_create(pool); - case OW_ACTIVEMQBYTESMESSAGE_TYPE: return (ow_DataStructure *)ow_ActiveMQBytesMessage_create(pool); - case OW_SHUTDOWNINFO_TYPE: return (ow_DataStructure *)ow_ShutdownInfo_create(pool); - case OW_DATARESPONSE_TYPE: return (ow_DataStructure *)ow_DataResponse_create(pool); - case OW_SESSIONID_TYPE: return (ow_DataStructure *)ow_SessionId_create(pool); - case OW_DATAARRAYRESPONSE_TYPE: return (ow_DataStructure *)ow_DataArrayResponse_create(pool); - case OW_JOURNALQUEUEACK_TYPE: return (ow_DataStructure *)ow_JournalQueueAck_create(pool); - case OW_WIREFORMATINFO_TYPE: return (ow_DataStructure *)ow_WireFormatInfo_create(pool); - case OW_RESPONSE_TYPE: return (ow_DataStructure *)ow_Response_create(pool); - case OW_CONNECTIONERROR_TYPE: return (ow_DataStructure *)ow_ConnectionError_create(pool); case OW_ACTIVEMQOBJECTMESSAGE_TYPE: return (ow_DataStructure *)ow_ActiveMQObjectMessage_create(pool); - case OW_CONSUMERINFO_TYPE: return (ow_DataStructure *)ow_ConsumerInfo_create(pool); - case OW_ACTIVEMQTEMPTOPIC_TYPE: return (ow_DataStructure *)ow_ActiveMQTempTopic_create(pool); case OW_CONNECTIONID_TYPE: return (ow_DataStructure *)ow_ConnectionId_create(pool); - case OW_DISCOVERYEVENT_TYPE: return (ow_DataStructure *)ow_DiscoveryEvent_create(pool); case OW_CONNECTIONINFO_TYPE: return (ow_DataStructure *)ow_ConnectionInfo_create(pool); - case OW_KEEPALIVEINFO_TYPE: return (ow_DataStructure *)ow_KeepAliveInfo_create(pool); - case OW_XATRANSACTIONID_TYPE: return (ow_DataStructure *)ow_XATransactionId_create(pool); - case OW_JOURNALTRACE_TYPE: return (ow_DataStructure *)ow_JournalTrace_create(pool); - case OW_FLUSHCOMMAND_TYPE: return (ow_DataStructure *)ow_FlushCommand_create(pool); - case OW_CONSUMERID_TYPE: return (ow_DataStructure *)ow_ConsumerId_create(pool); - case OW_JOURNALTOPICACK_TYPE: return (ow_DataStructure *)ow_JournalTopicAck_create(pool); - case OW_ACTIVEMQTEXTMESSAGE_TYPE: return (ow_DataStructure *)ow_ActiveMQTextMessage_create(pool); - case OW_BROKERID_TYPE: return (ow_DataStructure *)ow_BrokerId_create(pool); - case OW_MESSAGEDISPATCH_TYPE: return (ow_DataStructure *)ow_MessageDispatch_create(pool); case OW_PRODUCERINFO_TYPE: return (ow_DataStructure *)ow_ProducerInfo_create(pool); - case OW_SUBSCRIPTIONINFO_TYPE: return (ow_DataStructure *)ow_SubscriptionInfo_create(pool); - case OW_ACTIVEMQMAPMESSAGE_TYPE: return (ow_DataStructure *)ow_ActiveMQMapMessage_create(pool); case OW_MESSAGEDISPATCHNOTIFICATION_TYPE: return (ow_DataStructure *)ow_MessageDispatchNotification_create(pool); case OW_SESSIONINFO_TYPE: return (ow_DataStructure *)ow_SessionInfo_create(pool); - case OW_ACTIVEMQMESSAGE_TYPE: return (ow_DataStructure *)ow_ActiveMQMessage_create(pool); case OW_TRANSACTIONINFO_TYPE: return (ow_DataStructure *)ow_TransactionInfo_create(pool); case OW_ACTIVEMQSTREAMMESSAGE_TYPE: return (ow_DataStructure *)ow_ActiveMQStreamMessage_create(pool); case OW_MESSAGEACK_TYPE: return (ow_DataStructure *)ow_MessageAck_create(pool); case OW_PRODUCERID_TYPE: return (ow_DataStructure *)ow_ProducerId_create(pool); - case OW_ACTIVEMQTOPIC_TYPE: return (ow_DataStructure *)ow_ActiveMQTopic_create(pool); + case OW_MESSAGEID_TYPE: return (ow_DataStructure *)ow_MessageId_create(pool); + case OW_ACTIVEMQTEMPQUEUE_TYPE: return (ow_DataStructure *)ow_ActiveMQTempQueue_create(pool); + case OW_REMOVESUBSCRIPTIONINFO_TYPE: return (ow_DataStructure *)ow_RemoveSubscriptionInfo_create(pool); + case OW_SESSIONID_TYPE: return (ow_DataStructure *)ow_SessionId_create(pool); + case OW_DATAARRAYRESPONSE_TYPE: return (ow_DataStructure *)ow_DataArrayResponse_create(pool); + case OW_JOURNALQUEUEACK_TYPE: return (ow_DataStructure *)ow_JournalQueueAck_create(pool); + case OW_RESPONSE_TYPE: return (ow_DataStructure *)ow_Response_create(pool); + case OW_CONNECTIONERROR_TYPE: return (ow_DataStructure *)ow_ConnectionError_create(pool); + case OW_CONSUMERINFO_TYPE: return (ow_DataStructure *)ow_ConsumerInfo_create(pool); + case OW_XATRANSACTIONID_TYPE: return (ow_DataStructure *)ow_XATransactionId_create(pool); + case OW_JOURNALTRACE_TYPE: return (ow_DataStructure *)ow_JournalTrace_create(pool); + case OW_CONSUMERID_TYPE: return (ow_DataStructure *)ow_ConsumerId_create(pool); + case OW_ACTIVEMQTEXTMESSAGE_TYPE: return (ow_DataStructure *)ow_ActiveMQTextMessage_create(pool); + case OW_SUBSCRIPTIONINFO_TYPE: return (ow_DataStructure *)ow_SubscriptionInfo_create(pool); case OW_JOURNALTRANSACTION_TYPE: return (ow_DataStructure *)ow_JournalTransaction_create(pool); - case OW_REMOVEINFO_TYPE: return (ow_DataStructure *)ow_RemoveInfo_create(pool); case OW_CONTROLCOMMAND_TYPE: return (ow_DataStructure *)ow_ControlCommand_create(pool); + case OW_NETWORKBRIDGEFILTER_TYPE: return (ow_DataStructure *)ow_NetworkBridgeFilter_create(pool); + case OW_ACTIVEMQBYTESMESSAGE_TYPE: return (ow_DataStructure *)ow_ActiveMQBytesMessage_create(pool); + case OW_WIREFORMATINFO_TYPE: return (ow_DataStructure *)ow_WireFormatInfo_create(pool); + case OW_ACTIVEMQTEMPTOPIC_TYPE: return (ow_DataStructure *)ow_ActiveMQTempTopic_create(pool); + case OW_DISCOVERYEVENT_TYPE: return (ow_DataStructure *)ow_DiscoveryEvent_create(pool); + case OW_ACTIVEMQTOPIC_TYPE: return (ow_DataStructure *)ow_ActiveMQTopic_create(pool); + case OW_BROKERINFO_TYPE: return (ow_DataStructure *)ow_BrokerInfo_create(pool); + case OW_DESTINATIONINFO_TYPE: return (ow_DataStructure *)ow_DestinationInfo_create(pool); + case OW_SHUTDOWNINFO_TYPE: return (ow_DataStructure *)ow_ShutdownInfo_create(pool); + case OW_DATARESPONSE_TYPE: return (ow_DataStructure *)ow_DataResponse_create(pool); + case OW_KEEPALIVEINFO_TYPE: return (ow_DataStructure *)ow_KeepAliveInfo_create(pool); + case OW_FLUSHCOMMAND_TYPE: return (ow_DataStructure *)ow_FlushCommand_create(pool); + case OW_JOURNALTOPICACK_TYPE: return (ow_DataStructure *)ow_JournalTopicAck_create(pool); + case OW_BROKERID_TYPE: return (ow_DataStructure *)ow_BrokerId_create(pool); + case OW_MESSAGEDISPATCH_TYPE: return (ow_DataStructure *)ow_MessageDispatch_create(pool); + case OW_ACTIVEMQMAPMESSAGE_TYPE: return (ow_DataStructure *)ow_ActiveMQMapMessage_create(pool); + case OW_ACTIVEMQMESSAGE_TYPE: return (ow_DataStructure *)ow_ActiveMQMessage_create(pool); + case OW_REMOVEINFO_TYPE: return (ow_DataStructure *)ow_RemoveInfo_create(pool); case OW_EXCEPTIONRESPONSE_TYPE: return (ow_DataStructure *)ow_ExceptionResponse_create(pool); } return 0; @@ -2678,52 +2720,53 @@ apr_status_t ow_marshal1_object(ow_bit_buffer *buffer, ow_DataStructure *object) { switch( object->structType ) { - case OW_MESSAGEID_TYPE: return ow_marshal1_MessageId(buffer, (ow_MessageId*)object); - case OW_BROKERINFO_TYPE: return ow_marshal1_BrokerInfo(buffer, (ow_BrokerInfo*)object); - case OW_ACTIVEMQTEMPQUEUE_TYPE: return ow_marshal1_ActiveMQTempQueue(buffer, (ow_ActiveMQTempQueue*)object); case OW_LOCALTRANSACTIONID_TYPE: return ow_marshal1_LocalTransactionId(buffer, (ow_LocalTransactionId*)object); - case OW_REMOVESUBSCRIPTIONINFO_TYPE: return ow_marshal1_RemoveSubscriptionInfo(buffer, (ow_RemoveSubscriptionInfo*)object); case OW_INTEGERRESPONSE_TYPE: return ow_marshal1_IntegerResponse(buffer, (ow_IntegerResponse*)object); case OW_ACTIVEMQQUEUE_TYPE: return ow_marshal1_ActiveMQQueue(buffer, (ow_ActiveMQQueue*)object); - case OW_DESTINATIONINFO_TYPE: return ow_marshal1_DestinationInfo(buffer, (ow_DestinationInfo*)object); - case OW_ACTIVEMQBYTESMESSAGE_TYPE: return ow_marshal1_ActiveMQBytesMessage(buffer, (ow_ActiveMQBytesMessage*)object); - case OW_SHUTDOWNINFO_TYPE: return ow_marshal1_ShutdownInfo(buffer, (ow_ShutdownInfo*)object); - case OW_DATARESPONSE_TYPE: return ow_marshal1_DataResponse(buffer, (ow_DataResponse*)object); - case OW_SESSIONID_TYPE: return ow_marshal1_SessionId(buffer, (ow_SessionId*)object); - case OW_DATAARRAYRESPONSE_TYPE: return ow_marshal1_DataArrayResponse(buffer, (ow_DataArrayResponse*)object); - case OW_JOURNALQUEUEACK_TYPE: return ow_marshal1_JournalQueueAck(buffer, (ow_JournalQueueAck*)object); - case OW_WIREFORMATINFO_TYPE: return ow_marshal1_WireFormatInfo(buffer, (ow_WireFormatInfo*)object); - case OW_RESPONSE_TYPE: return ow_marshal1_Response(buffer, (ow_Response*)object); - case OW_CONNECTIONERROR_TYPE: return ow_marshal1_ConnectionError(buffer, (ow_ConnectionError*)object); case OW_ACTIVEMQOBJECTMESSAGE_TYPE: return ow_marshal1_ActiveMQObjectMessage(buffer, (ow_ActiveMQObjectMessage*)object); - case OW_CONSUMERINFO_TYPE: return ow_marshal1_ConsumerInfo(buffer, (ow_ConsumerInfo*)object); - case OW_ACTIVEMQTEMPTOPIC_TYPE: return ow_marshal1_ActiveMQTempTopic(buffer, (ow_ActiveMQTempTopic*)object); case OW_CONNECTIONID_TYPE: return ow_marshal1_ConnectionId(buffer, (ow_ConnectionId*)object); - case OW_DISCOVERYEVENT_TYPE: return ow_marshal1_DiscoveryEvent(buffer, (ow_DiscoveryEvent*)object); case OW_CONNECTIONINFO_TYPE: return ow_marshal1_ConnectionInfo(buffer, (ow_ConnectionInfo*)object); - case OW_KEEPALIVEINFO_TYPE: return ow_marshal1_KeepAliveInfo(buffer, (ow_KeepAliveInfo*)object); - case OW_XATRANSACTIONID_TYPE: return ow_marshal1_XATransactionId(buffer, (ow_XATransactionId*)object); - case OW_JOURNALTRACE_TYPE: return ow_marshal1_JournalTrace(buffer, (ow_JournalTrace*)object); - case OW_FLUSHCOMMAND_TYPE: return ow_marshal1_FlushCommand(buffer, (ow_FlushCommand*)object); - case OW_CONSUMERID_TYPE: return ow_marshal1_ConsumerId(buffer, (ow_ConsumerId*)object); - case OW_JOURNALTOPICACK_TYPE: return ow_marshal1_JournalTopicAck(buffer, (ow_JournalTopicAck*)object); - case OW_ACTIVEMQTEXTMESSAGE_TYPE: return ow_marshal1_ActiveMQTextMessage(buffer, (ow_ActiveMQTextMessage*)object); - case OW_BROKERID_TYPE: return ow_marshal1_BrokerId(buffer, (ow_BrokerId*)object); - case OW_MESSAGEDISPATCH_TYPE: return ow_marshal1_MessageDispatch(buffer, (ow_MessageDispatch*)object); case OW_PRODUCERINFO_TYPE: return ow_marshal1_ProducerInfo(buffer, (ow_ProducerInfo*)object); - case OW_SUBSCRIPTIONINFO_TYPE: return ow_marshal1_SubscriptionInfo(buffer, (ow_SubscriptionInfo*)object); - case OW_ACTIVEMQMAPMESSAGE_TYPE: return ow_marshal1_ActiveMQMapMessage(buffer, (ow_ActiveMQMapMessage*)object); case OW_MESSAGEDISPATCHNOTIFICATION_TYPE: return ow_marshal1_MessageDispatchNotification(buffer, (ow_MessageDispatchNotification*)object); case OW_SESSIONINFO_TYPE: return ow_marshal1_SessionInfo(buffer, (ow_SessionInfo*)object); - case OW_ACTIVEMQMESSAGE_TYPE: return ow_marshal1_ActiveMQMessage(buffer, (ow_ActiveMQMessage*)object); case OW_TRANSACTIONINFO_TYPE: return ow_marshal1_TransactionInfo(buffer, (ow_TransactionInfo*)object); case OW_ACTIVEMQSTREAMMESSAGE_TYPE: return ow_marshal1_ActiveMQStreamMessage(buffer, (ow_ActiveMQStreamMessage*)object); case OW_MESSAGEACK_TYPE: return ow_marshal1_MessageAck(buffer, (ow_MessageAck*)object); case OW_PRODUCERID_TYPE: return ow_marshal1_ProducerId(buffer, (ow_ProducerId*)object); - case OW_ACTIVEMQTOPIC_TYPE: return ow_marshal1_ActiveMQTopic(buffer, (ow_ActiveMQTopic*)object); + case OW_MESSAGEID_TYPE: return ow_marshal1_MessageId(buffer, (ow_MessageId*)object); + case OW_ACTIVEMQTEMPQUEUE_TYPE: return ow_marshal1_ActiveMQTempQueue(buffer, (ow_ActiveMQTempQueue*)object); + case OW_REMOVESUBSCRIPTIONINFO_TYPE: return ow_marshal1_RemoveSubscriptionInfo(buffer, (ow_RemoveSubscriptionInfo*)object); + case OW_SESSIONID_TYPE: return ow_marshal1_SessionId(buffer, (ow_SessionId*)object); + case OW_DATAARRAYRESPONSE_TYPE: return ow_marshal1_DataArrayResponse(buffer, (ow_DataArrayResponse*)object); + case OW_JOURNALQUEUEACK_TYPE: return ow_marshal1_JournalQueueAck(buffer, (ow_JournalQueueAck*)object); + case OW_RESPONSE_TYPE: return ow_marshal1_Response(buffer, (ow_Response*)object); + case OW_CONNECTIONERROR_TYPE: return ow_marshal1_ConnectionError(buffer, (ow_ConnectionError*)object); + case OW_CONSUMERINFO_TYPE: return ow_marshal1_ConsumerInfo(buffer, (ow_ConsumerInfo*)object); + case OW_XATRANSACTIONID_TYPE: return ow_marshal1_XATransactionId(buffer, (ow_XATransactionId*)object); + case OW_JOURNALTRACE_TYPE: return ow_marshal1_JournalTrace(buffer, (ow_JournalTrace*)object); + case OW_CONSUMERID_TYPE: return ow_marshal1_ConsumerId(buffer, (ow_ConsumerId*)object); + case OW_ACTIVEMQTEXTMESSAGE_TYPE: return ow_marshal1_ActiveMQTextMessage(buffer, (ow_ActiveMQTextMessage*)object); + case OW_SUBSCRIPTIONINFO_TYPE: return ow_marshal1_SubscriptionInfo(buffer, (ow_SubscriptionInfo*)object); case OW_JOURNALTRANSACTION_TYPE: return ow_marshal1_JournalTransaction(buffer, (ow_JournalTransaction*)object); - case OW_REMOVEINFO_TYPE: return ow_marshal1_RemoveInfo(buffer, (ow_RemoveInfo*)object); case OW_CONTROLCOMMAND_TYPE: return ow_marshal1_ControlCommand(buffer, (ow_ControlCommand*)object); + case OW_NETWORKBRIDGEFILTER_TYPE: return ow_marshal1_NetworkBridgeFilter(buffer, (ow_NetworkBridgeFilter*)object); + case OW_ACTIVEMQBYTESMESSAGE_TYPE: return ow_marshal1_ActiveMQBytesMessage(buffer, (ow_ActiveMQBytesMessage*)object); + case OW_WIREFORMATINFO_TYPE: return ow_marshal1_WireFormatInfo(buffer, (ow_WireFormatInfo*)object); + case OW_ACTIVEMQTEMPTOPIC_TYPE: return ow_marshal1_ActiveMQTempTopic(buffer, (ow_ActiveMQTempTopic*)object); + case OW_DISCOVERYEVENT_TYPE: return ow_marshal1_DiscoveryEvent(buffer, (ow_DiscoveryEvent*)object); + case OW_ACTIVEMQTOPIC_TYPE: return ow_marshal1_ActiveMQTopic(buffer, (ow_ActiveMQTopic*)object); + case OW_BROKERINFO_TYPE: return ow_marshal1_BrokerInfo(buffer, (ow_BrokerInfo*)object); + case OW_DESTINATIONINFO_TYPE: return ow_marshal1_DestinationInfo(buffer, (ow_DestinationInfo*)object); + case OW_SHUTDOWNINFO_TYPE: return ow_marshal1_ShutdownInfo(buffer, (ow_ShutdownInfo*)object); + case OW_DATARESPONSE_TYPE: return ow_marshal1_DataResponse(buffer, (ow_DataResponse*)object); + case OW_KEEPALIVEINFO_TYPE: return ow_marshal1_KeepAliveInfo(buffer, (ow_KeepAliveInfo*)object); + case OW_FLUSHCOMMAND_TYPE: return ow_marshal1_FlushCommand(buffer, (ow_FlushCommand*)object); + case OW_JOURNALTOPICACK_TYPE: return ow_marshal1_JournalTopicAck(buffer, (ow_JournalTopicAck*)object); + case OW_BROKERID_TYPE: return ow_marshal1_BrokerId(buffer, (ow_BrokerId*)object); + case OW_MESSAGEDISPATCH_TYPE: return ow_marshal1_MessageDispatch(buffer, (ow_MessageDispatch*)object); + case OW_ACTIVEMQMAPMESSAGE_TYPE: return ow_marshal1_ActiveMQMapMessage(buffer, (ow_ActiveMQMapMessage*)object); + case OW_ACTIVEMQMESSAGE_TYPE: return ow_marshal1_ActiveMQMessage(buffer, (ow_ActiveMQMessage*)object); + case OW_REMOVEINFO_TYPE: return ow_marshal1_RemoveInfo(buffer, (ow_RemoveInfo*)object); case OW_EXCEPTIONRESPONSE_TYPE: return ow_marshal1_ExceptionResponse(buffer, (ow_ExceptionResponse*)object); } return APR_EGENERAL; @@ -2733,52 +2776,53 @@ apr_status_t ow_marshal2_object(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer { switch( object->structType ) { - case OW_MESSAGEID_TYPE: return ow_marshal2_MessageId(buffer, bitbuffer, (ow_MessageId*)object); - case OW_BROKERINFO_TYPE: return ow_marshal2_BrokerInfo(buffer, bitbuffer, (ow_BrokerInfo*)object); - case OW_ACTIVEMQTEMPQUEUE_TYPE: return ow_marshal2_ActiveMQTempQueue(buffer, bitbuffer, (ow_ActiveMQTempQueue*)object); case OW_LOCALTRANSACTIONID_TYPE: return ow_marshal2_LocalTransactionId(buffer, bitbuffer, (ow_LocalTransactionId*)object); - case OW_REMOVESUBSCRIPTIONINFO_TYPE: return ow_marshal2_RemoveSubscriptionInfo(buffer, bitbuffer, (ow_RemoveSubscriptionInfo*)object); case OW_INTEGERRESPONSE_TYPE: return ow_marshal2_IntegerResponse(buffer, bitbuffer, (ow_IntegerResponse*)object); case OW_ACTIVEMQQUEUE_TYPE: return ow_marshal2_ActiveMQQueue(buffer, bitbuffer, (ow_ActiveMQQueue*)object); - case OW_DESTINATIONINFO_TYPE: return ow_marshal2_DestinationInfo(buffer, bitbuffer, (ow_DestinationInfo*)object); - case OW_ACTIVEMQBYTESMESSAGE_TYPE: return ow_marshal2_ActiveMQBytesMessage(buffer, bitbuffer, (ow_ActiveMQBytesMessage*)object); - case OW_SHUTDOWNINFO_TYPE: return ow_marshal2_ShutdownInfo(buffer, bitbuffer, (ow_ShutdownInfo*)object); - case OW_DATARESPONSE_TYPE: return ow_marshal2_DataResponse(buffer, bitbuffer, (ow_DataResponse*)object); - case OW_SESSIONID_TYPE: return ow_marshal2_SessionId(buffer, bitbuffer, (ow_SessionId*)object); - case OW_DATAARRAYRESPONSE_TYPE: return ow_marshal2_DataArrayResponse(buffer, bitbuffer, (ow_DataArrayResponse*)object); - case OW_JOURNALQUEUEACK_TYPE: return ow_marshal2_JournalQueueAck(buffer, bitbuffer, (ow_JournalQueueAck*)object); - case OW_WIREFORMATINFO_TYPE: return ow_marshal2_WireFormatInfo(buffer, bitbuffer, (ow_WireFormatInfo*)object); - case OW_RESPONSE_TYPE: return ow_marshal2_Response(buffer, bitbuffer, (ow_Response*)object); - case OW_CONNECTIONERROR_TYPE: return ow_marshal2_ConnectionError(buffer, bitbuffer, (ow_ConnectionError*)object); case OW_ACTIVEMQOBJECTMESSAGE_TYPE: return ow_marshal2_ActiveMQObjectMessage(buffer, bitbuffer, (ow_ActiveMQObjectMessage*)object); - case OW_CONSUMERINFO_TYPE: return ow_marshal2_ConsumerInfo(buffer, bitbuffer, (ow_ConsumerInfo*)object); - case OW_ACTIVEMQTEMPTOPIC_TYPE: return ow_marshal2_ActiveMQTempTopic(buffer, bitbuffer, (ow_ActiveMQTempTopic*)object); case OW_CONNECTIONID_TYPE: return ow_marshal2_ConnectionId(buffer, bitbuffer, (ow_ConnectionId*)object); - case OW_DISCOVERYEVENT_TYPE: return ow_marshal2_DiscoveryEvent(buffer, bitbuffer, (ow_DiscoveryEvent*)object); case OW_CONNECTIONINFO_TYPE: return ow_marshal2_ConnectionInfo(buffer, bitbuffer, (ow_ConnectionInfo*)object); - case OW_KEEPALIVEINFO_TYPE: return ow_marshal2_KeepAliveInfo(buffer, bitbuffer, (ow_KeepAliveInfo*)object); - case OW_XATRANSACTIONID_TYPE: return ow_marshal2_XATransactionId(buffer, bitbuffer, (ow_XATransactionId*)object); - case OW_JOURNALTRACE_TYPE: return ow_marshal2_JournalTrace(buffer, bitbuffer, (ow_JournalTrace*)object); - case OW_FLUSHCOMMAND_TYPE: return ow_marshal2_FlushCommand(buffer, bitbuffer, (ow_FlushCommand*)object); - case OW_CONSUMERID_TYPE: return ow_marshal2_ConsumerId(buffer, bitbuffer, (ow_ConsumerId*)object); - case OW_JOURNALTOPICACK_TYPE: return ow_marshal2_JournalTopicAck(buffer, bitbuffer, (ow_JournalTopicAck*)object); - case OW_ACTIVEMQTEXTMESSAGE_TYPE: return ow_marshal2_ActiveMQTextMessage(buffer, bitbuffer, (ow_ActiveMQTextMessage*)object); - case OW_BROKERID_TYPE: return ow_marshal2_BrokerId(buffer, bitbuffer, (ow_BrokerId*)object); - case OW_MESSAGEDISPATCH_TYPE: return ow_marshal2_MessageDispatch(buffer, bitbuffer, (ow_MessageDispatch*)object); case OW_PRODUCERINFO_TYPE: return ow_marshal2_ProducerInfo(buffer, bitbuffer, (ow_ProducerInfo*)object); - case OW_SUBSCRIPTIONINFO_TYPE: return ow_marshal2_SubscriptionInfo(buffer, bitbuffer, (ow_SubscriptionInfo*)object); - case OW_ACTIVEMQMAPMESSAGE_TYPE: return ow_marshal2_ActiveMQMapMessage(buffer, bitbuffer, (ow_ActiveMQMapMessage*)object); case OW_MESSAGEDISPATCHNOTIFICATION_TYPE: return ow_marshal2_MessageDispatchNotification(buffer, bitbuffer, (ow_MessageDispatchNotification*)object); case OW_SESSIONINFO_TYPE: return ow_marshal2_SessionInfo(buffer, bitbuffer, (ow_SessionInfo*)object); - case OW_ACTIVEMQMESSAGE_TYPE: return ow_marshal2_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object); case OW_TRANSACTIONINFO_TYPE: return ow_marshal2_TransactionInfo(buffer, bitbuffer, (ow_TransactionInfo*)object); case OW_ACTIVEMQSTREAMMESSAGE_TYPE: return ow_marshal2_ActiveMQStreamMessage(buffer, bitbuffer, (ow_ActiveMQStreamMessage*)object); case OW_MESSAGEACK_TYPE: return ow_marshal2_MessageAck(buffer, bitbuffer, (ow_MessageAck*)object); case OW_PRODUCERID_TYPE: return ow_marshal2_ProducerId(buffer, bitbuffer, (ow_ProducerId*)object); - case OW_ACTIVEMQTOPIC_TYPE: return ow_marshal2_ActiveMQTopic(buffer, bitbuffer, (ow_ActiveMQTopic*)object); + case OW_MESSAGEID_TYPE: return ow_marshal2_MessageId(buffer, bitbuffer, (ow_MessageId*)object); + case OW_ACTIVEMQTEMPQUEUE_TYPE: return ow_marshal2_ActiveMQTempQueue(buffer, bitbuffer, (ow_ActiveMQTempQueue*)object); + case OW_REMOVESUBSCRIPTIONINFO_TYPE: return ow_marshal2_RemoveSubscriptionInfo(buffer, bitbuffer, (ow_RemoveSubscriptionInfo*)object); + case OW_SESSIONID_TYPE: return ow_marshal2_SessionId(buffer, bitbuffer, (ow_SessionId*)object); + case OW_DATAARRAYRESPONSE_TYPE: return ow_marshal2_DataArrayResponse(buffer, bitbuffer, (ow_DataArrayResponse*)object); + case OW_JOURNALQUEUEACK_TYPE: return ow_marshal2_JournalQueueAck(buffer, bitbuffer, (ow_JournalQueueAck*)object); + case OW_RESPONSE_TYPE: return ow_marshal2_Response(buffer, bitbuffer, (ow_Response*)object); + case OW_CONNECTIONERROR_TYPE: return ow_marshal2_ConnectionError(buffer, bitbuffer, (ow_ConnectionError*)object); + case OW_CONSUMERINFO_TYPE: return ow_marshal2_ConsumerInfo(buffer, bitbuffer, (ow_ConsumerInfo*)object); + case OW_XATRANSACTIONID_TYPE: return ow_marshal2_XATransactionId(buffer, bitbuffer, (ow_XATransactionId*)object); + case OW_JOURNALTRACE_TYPE: return ow_marshal2_JournalTrace(buffer, bitbuffer, (ow_JournalTrace*)object); + case OW_CONSUMERID_TYPE: return ow_marshal2_ConsumerId(buffer, bitbuffer, (ow_ConsumerId*)object); + case OW_ACTIVEMQTEXTMESSAGE_TYPE: return ow_marshal2_ActiveMQTextMessage(buffer, bitbuffer, (ow_ActiveMQTextMessage*)object); + case OW_SUBSCRIPTIONINFO_TYPE: return ow_marshal2_SubscriptionInfo(buffer, bitbuffer, (ow_SubscriptionInfo*)object); case OW_JOURNALTRANSACTION_TYPE: return ow_marshal2_JournalTransaction(buffer, bitbuffer, (ow_JournalTransaction*)object); - case OW_REMOVEINFO_TYPE: return ow_marshal2_RemoveInfo(buffer, bitbuffer, (ow_RemoveInfo*)object); case OW_CONTROLCOMMAND_TYPE: return ow_marshal2_ControlCommand(buffer, bitbuffer, (ow_ControlCommand*)object); + case OW_NETWORKBRIDGEFILTER_TYPE: return ow_marshal2_NetworkBridgeFilter(buffer, bitbuffer, (ow_NetworkBridgeFilter*)object); + case OW_ACTIVEMQBYTESMESSAGE_TYPE: return ow_marshal2_ActiveMQBytesMessage(buffer, bitbuffer, (ow_ActiveMQBytesMessage*)object); + case OW_WIREFORMATINFO_TYPE: return ow_marshal2_WireFormatInfo(buffer, bitbuffer, (ow_WireFormatInfo*)object); + case OW_ACTIVEMQTEMPTOPIC_TYPE: return ow_marshal2_ActiveMQTempTopic(buffer, bitbuffer, (ow_ActiveMQTempTopic*)object); + case OW_DISCOVERYEVENT_TYPE: return ow_marshal2_DiscoveryEvent(buffer, bitbuffer, (ow_DiscoveryEvent*)object); + case OW_ACTIVEMQTOPIC_TYPE: return ow_marshal2_ActiveMQTopic(buffer, bitbuffer, (ow_ActiveMQTopic*)object); + case OW_BROKERINFO_TYPE: return ow_marshal2_BrokerInfo(buffer, bitbuffer, (ow_BrokerInfo*)object); + case OW_DESTINATIONINFO_TYPE: return ow_marshal2_DestinationInfo(buffer, bitbuffer, (ow_DestinationInfo*)object); + case OW_SHUTDOWNINFO_TYPE: return ow_marshal2_ShutdownInfo(buffer, bitbuffer, (ow_ShutdownInfo*)object); + case OW_DATARESPONSE_TYPE: return ow_marshal2_DataResponse(buffer, bitbuffer, (ow_DataResponse*)object); + case OW_KEEPALIVEINFO_TYPE: return ow_marshal2_KeepAliveInfo(buffer, bitbuffer, (ow_KeepAliveInfo*)object); + case OW_FLUSHCOMMAND_TYPE: return ow_marshal2_FlushCommand(buffer, bitbuffer, (ow_FlushCommand*)object); + case OW_JOURNALTOPICACK_TYPE: return ow_marshal2_JournalTopicAck(buffer, bitbuffer, (ow_JournalTopicAck*)object); + case OW_BROKERID_TYPE: return ow_marshal2_BrokerId(buffer, bitbuffer, (ow_BrokerId*)object); + case OW_MESSAGEDISPATCH_TYPE: return ow_marshal2_MessageDispatch(buffer, bitbuffer, (ow_MessageDispatch*)object); + case OW_ACTIVEMQMAPMESSAGE_TYPE: return ow_marshal2_ActiveMQMapMessage(buffer, bitbuffer, (ow_ActiveMQMapMessage*)object); + case OW_ACTIVEMQMESSAGE_TYPE: return ow_marshal2_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object); + case OW_REMOVEINFO_TYPE: return ow_marshal2_RemoveInfo(buffer, bitbuffer, (ow_RemoveInfo*)object); case OW_EXCEPTIONRESPONSE_TYPE: return ow_marshal2_ExceptionResponse(buffer, bitbuffer, (ow_ExceptionResponse*)object); } return APR_EGENERAL; @@ -2788,52 +2832,53 @@ apr_status_t ow_unmarshal_object(ow_byte_array *buffer, ow_bit_buffer *bitbuffer { switch( object->structType ) { - case OW_MESSAGEID_TYPE: return ow_unmarshal_MessageId(buffer, bitbuffer, (ow_MessageId*)object, pool); - case OW_BROKERINFO_TYPE: return ow_unmarshal_BrokerInfo(buffer, bitbuffer, (ow_BrokerInfo*)object, pool); - case OW_ACTIVEMQTEMPQUEUE_TYPE: return ow_unmarshal_ActiveMQTempQueue(buffer, bitbuffer, (ow_ActiveMQTempQueue*)object, pool); case OW_LOCALTRANSACTIONID_TYPE: return ow_unmarshal_LocalTransactionId(buffer, bitbuffer, (ow_LocalTransactionId*)object, pool); - case OW_REMOVESUBSCRIPTIONINFO_TYPE: return ow_unmarshal_RemoveSubscriptionInfo(buffer, bitbuffer, (ow_RemoveSubscriptionInfo*)object, pool); case OW_INTEGERRESPONSE_TYPE: return ow_unmarshal_IntegerResponse(buffer, bitbuffer, (ow_IntegerResponse*)object, pool); case OW_ACTIVEMQQUEUE_TYPE: return ow_unmarshal_ActiveMQQueue(buffer, bitbuffer, (ow_ActiveMQQueue*)object, pool); - case OW_DESTINATIONINFO_TYPE: return ow_unmarshal_DestinationInfo(buffer, bitbuffer, (ow_DestinationInfo*)object, pool); - case OW_ACTIVEMQBYTESMESSAGE_TYPE: return ow_unmarshal_ActiveMQBytesMessage(buffer, bitbuffer, (ow_ActiveMQBytesMessage*)object, pool); - case OW_SHUTDOWNINFO_TYPE: return ow_unmarshal_ShutdownInfo(buffer, bitbuffer, (ow_ShutdownInfo*)object, pool); - case OW_DATARESPONSE_TYPE: return ow_unmarshal_DataResponse(buffer, bitbuffer, (ow_DataResponse*)object, pool); - case OW_SESSIONID_TYPE: return ow_unmarshal_SessionId(buffer, bitbuffer, (ow_SessionId*)object, pool); - case OW_DATAARRAYRESPONSE_TYPE: return ow_unmarshal_DataArrayResponse(buffer, bitbuffer, (ow_DataArrayResponse*)object, pool); - case OW_JOURNALQUEUEACK_TYPE: return ow_unmarshal_JournalQueueAck(buffer, bitbuffer, (ow_JournalQueueAck*)object, pool); - case OW_WIREFORMATINFO_TYPE: return ow_unmarshal_WireFormatInfo(buffer, bitbuffer, (ow_WireFormatInfo*)object, pool); - case OW_RESPONSE_TYPE: return ow_unmarshal_Response(buffer, bitbuffer, (ow_Response*)object, pool); - case OW_CONNECTIONERROR_TYPE: return ow_unmarshal_ConnectionError(buffer, bitbuffer, (ow_ConnectionError*)object, pool); case OW_ACTIVEMQOBJECTMESSAGE_TYPE: return ow_unmarshal_ActiveMQObjectMessage(buffer, bitbuffer, (ow_ActiveMQObjectMessage*)object, pool); - case OW_CONSUMERINFO_TYPE: return ow_unmarshal_ConsumerInfo(buffer, bitbuffer, (ow_ConsumerInfo*)object, pool); - case OW_ACTIVEMQTEMPTOPIC_TYPE: return ow_unmarshal_ActiveMQTempTopic(buffer, bitbuffer, (ow_ActiveMQTempTopic*)object, pool); case OW_CONNECTIONID_TYPE: return ow_unmarshal_ConnectionId(buffer, bitbuffer, (ow_ConnectionId*)object, pool); - case OW_DISCOVERYEVENT_TYPE: return ow_unmarshal_DiscoveryEvent(buffer, bitbuffer, (ow_DiscoveryEvent*)object, pool); case OW_CONNECTIONINFO_TYPE: return ow_unmarshal_ConnectionInfo(buffer, bitbuffer, (ow_ConnectionInfo*)object, pool); - case OW_KEEPALIVEINFO_TYPE: return ow_unmarshal_KeepAliveInfo(buffer, bitbuffer, (ow_KeepAliveInfo*)object, pool); - case OW_XATRANSACTIONID_TYPE: return ow_unmarshal_XATransactionId(buffer, bitbuffer, (ow_XATransactionId*)object, pool); - case OW_JOURNALTRACE_TYPE: return ow_unmarshal_JournalTrace(buffer, bitbuffer, (ow_JournalTrace*)object, pool); - case OW_FLUSHCOMMAND_TYPE: return ow_unmarshal_FlushCommand(buffer, bitbuffer, (ow_FlushCommand*)object, pool); - case OW_CONSUMERID_TYPE: return ow_unmarshal_ConsumerId(buffer, bitbuffer, (ow_ConsumerId*)object, pool); - case OW_JOURNALTOPICACK_TYPE: return ow_unmarshal_JournalTopicAck(buffer, bitbuffer, (ow_JournalTopicAck*)object, pool); - case OW_ACTIVEMQTEXTMESSAGE_TYPE: return ow_unmarshal_ActiveMQTextMessage(buffer, bitbuffer, (ow_ActiveMQTextMessage*)object, pool); - case OW_BROKERID_TYPE: return ow_unmarshal_BrokerId(buffer, bitbuffer, (ow_BrokerId*)object, pool); - case OW_MESSAGEDISPATCH_TYPE: return ow_unmarshal_MessageDispatch(buffer, bitbuffer, (ow_MessageDispatch*)object, pool); case OW_PRODUCERINFO_TYPE: return ow_unmarshal_ProducerInfo(buffer, bitbuffer, (ow_ProducerInfo*)object, pool); - case OW_SUBSCRIPTIONINFO_TYPE: return ow_unmarshal_SubscriptionInfo(buffer, bitbuffer, (ow_SubscriptionInfo*)object, pool); - case OW_ACTIVEMQMAPMESSAGE_TYPE: return ow_unmarshal_ActiveMQMapMessage(buffer, bitbuffer, (ow_ActiveMQMapMessage*)object, pool); case OW_MESSAGEDISPATCHNOTIFICATION_TYPE: return ow_unmarshal_MessageDispatchNotification(buffer, bitbuffer, (ow_MessageDispatchNotification*)object, pool); case OW_SESSIONINFO_TYPE: return ow_unmarshal_SessionInfo(buffer, bitbuffer, (ow_SessionInfo*)object, pool); - case OW_ACTIVEMQMESSAGE_TYPE: return ow_unmarshal_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object, pool); case OW_TRANSACTIONINFO_TYPE: return ow_unmarshal_TransactionInfo(buffer, bitbuffer, (ow_TransactionInfo*)object, pool); case OW_ACTIVEMQSTREAMMESSAGE_TYPE: return ow_unmarshal_ActiveMQStreamMessage(buffer, bitbuffer, (ow_ActiveMQStreamMessage*)object, pool); case OW_MESSAGEACK_TYPE: return ow_unmarshal_MessageAck(buffer, bitbuffer, (ow_MessageAck*)object, pool); case OW_PRODUCERID_TYPE: return ow_unmarshal_ProducerId(buffer, bitbuffer, (ow_ProducerId*)object, pool); - case OW_ACTIVEMQTOPIC_TYPE: return ow_unmarshal_ActiveMQTopic(buffer, bitbuffer, (ow_ActiveMQTopic*)object, pool); + case OW_MESSAGEID_TYPE: return ow_unmarshal_MessageId(buffer, bitbuffer, (ow_MessageId*)object, pool); + case OW_ACTIVEMQTEMPQUEUE_TYPE: return ow_unmarshal_ActiveMQTempQueue(buffer, bitbuffer, (ow_ActiveMQTempQueue*)object, pool); + case OW_REMOVESUBSCRIPTIONINFO_TYPE: return ow_unmarshal_RemoveSubscriptionInfo(buffer, bitbuffer, (ow_RemoveSubscriptionInfo*)object, pool); + case OW_SESSIONID_TYPE: return ow_unmarshal_SessionId(buffer, bitbuffer, (ow_SessionId*)object, pool); + case OW_DATAARRAYRESPONSE_TYPE: return ow_unmarshal_DataArrayResponse(buffer, bitbuffer, (ow_DataArrayResponse*)object, pool); + case OW_JOURNALQUEUEACK_TYPE: return ow_unmarshal_JournalQueueAck(buffer, bitbuffer, (ow_JournalQueueAck*)object, pool); + case OW_RESPONSE_TYPE: return ow_unmarshal_Response(buffer, bitbuffer, (ow_Response*)object, pool); + case OW_CONNECTIONERROR_TYPE: return ow_unmarshal_ConnectionError(buffer, bitbuffer, (ow_ConnectionError*)object, pool); + case OW_CONSUMERINFO_TYPE: return ow_unmarshal_ConsumerInfo(buffer, bitbuffer, (ow_ConsumerInfo*)object, pool); + case OW_XATRANSACTIONID_TYPE: return ow_unmarshal_XATransactionId(buffer, bitbuffer, (ow_XATransactionId*)object, pool); + case OW_JOURNALTRACE_TYPE: return ow_unmarshal_JournalTrace(buffer, bitbuffer, (ow_JournalTrace*)object, pool); + case OW_CONSUMERID_TYPE: return ow_unmarshal_ConsumerId(buffer, bitbuffer, (ow_ConsumerId*)object, pool); + case OW_ACTIVEMQTEXTMESSAGE_TYPE: return ow_unmarshal_ActiveMQTextMessage(buffer, bitbuffer, (ow_ActiveMQTextMessage*)object, pool); + case OW_SUBSCRIPTIONINFO_TYPE: return ow_unmarshal_SubscriptionInfo(buffer, bitbuffer, (ow_SubscriptionInfo*)object, pool); case OW_JOURNALTRANSACTION_TYPE: return ow_unmarshal_JournalTransaction(buffer, bitbuffer, (ow_JournalTransaction*)object, pool); - case OW_REMOVEINFO_TYPE: return ow_unmarshal_RemoveInfo(buffer, bitbuffer, (ow_RemoveInfo*)object, pool); case OW_CONTROLCOMMAND_TYPE: return ow_unmarshal_ControlCommand(buffer, bitbuffer, (ow_ControlCommand*)object, pool); + case OW_NETWORKBRIDGEFILTER_TYPE: return ow_unmarshal_NetworkBridgeFilter(buffer, bitbuffer, (ow_NetworkBridgeFilter*)object, pool); + case OW_ACTIVEMQBYTESMESSAGE_TYPE: return ow_unmarshal_ActiveMQBytesMessage(buffer, bitbuffer, (ow_ActiveMQBytesMessage*)object, pool); + case OW_WIREFORMATINFO_TYPE: return ow_unmarshal_WireFormatInfo(buffer, bitbuffer, (ow_WireFormatInfo*)object, pool); + case OW_ACTIVEMQTEMPTOPIC_TYPE: return ow_unmarshal_ActiveMQTempTopic(buffer, bitbuffer, (ow_ActiveMQTempTopic*)object, pool); + case OW_DISCOVERYEVENT_TYPE: return ow_unmarshal_DiscoveryEvent(buffer, bitbuffer, (ow_DiscoveryEvent*)object, pool); + case OW_ACTIVEMQTOPIC_TYPE: return ow_unmarshal_ActiveMQTopic(buffer, bitbuffer, (ow_ActiveMQTopic*)object, pool); + case OW_BROKERINFO_TYPE: return ow_unmarshal_BrokerInfo(buffer, bitbuffer, (ow_BrokerInfo*)object, pool); + case OW_DESTINATIONINFO_TYPE: return ow_unmarshal_DestinationInfo(buffer, bitbuffer, (ow_DestinationInfo*)object, pool); + case OW_SHUTDOWNINFO_TYPE: return ow_unmarshal_ShutdownInfo(buffer, bitbuffer, (ow_ShutdownInfo*)object, pool); + case OW_DATARESPONSE_TYPE: return ow_unmarshal_DataResponse(buffer, bitbuffer, (ow_DataResponse*)object, pool); + case OW_KEEPALIVEINFO_TYPE: return ow_unmarshal_KeepAliveInfo(buffer, bitbuffer, (ow_KeepAliveInfo*)object, pool); + case OW_FLUSHCOMMAND_TYPE: return ow_unmarshal_FlushCommand(buffer, bitbuffer, (ow_FlushCommand*)object, pool); + case OW_JOURNALTOPICACK_TYPE: return ow_unmarshal_JournalTopicAck(buffer, bitbuffer, (ow_JournalTopicAck*)object, pool); + case OW_BROKERID_TYPE: return ow_unmarshal_BrokerId(buffer, bitbuffer, (ow_BrokerId*)object, pool); + case OW_MESSAGEDISPATCH_TYPE: return ow_unmarshal_MessageDispatch(buffer, bitbuffer, (ow_MessageDispatch*)object, pool); + case OW_ACTIVEMQMAPMESSAGE_TYPE: return ow_unmarshal_ActiveMQMapMessage(buffer, bitbuffer, (ow_ActiveMQMapMessage*)object, pool); + case OW_ACTIVEMQMESSAGE_TYPE: return ow_unmarshal_ActiveMQMessage(buffer, bitbuffer, (ow_ActiveMQMessage*)object, pool); + case OW_REMOVEINFO_TYPE: return ow_unmarshal_RemoveInfo(buffer, bitbuffer, (ow_RemoveInfo*)object, pool); case OW_EXCEPTIONRESPONSE_TYPE: return ow_unmarshal_ExceptionResponse(buffer, bitbuffer, (ow_ExceptionResponse*)object, pool); } return APR_EGENERAL; diff --git a/openwire-c/src/libopenwire/ow_commands_v1.h b/openwire-c/src/libopenwire/ow_commands_v1.h index 8ec566b40f..d7dd0f0d25 100644 --- a/openwire-c/src/libopenwire/ow_commands_v1.h +++ b/openwire-c/src/libopenwire/ow_commands_v1.h @@ -39,41 +39,6 @@ extern "C" { apr_status_t ow_bitmarshall(ow_bit_buffer *buffer, ow_DataStructure *object); apr_status_t ow_marshall(ow_byte_buffer *buffer, ow_DataStructure *object); -typedef struct ow_MessageId { - - ow_byte structType; - struct ow_ProducerId *producerId; - ow_long producerSequenceId; - ow_long brokerSequenceId; - -} ow_MessageId; -ow_MessageId *ow_MessageId_create(apr_pool_t *pool); -ow_boolean ow_is_a_MessageId(ow_DataStructure *object); - -typedef struct ow_BrokerInfo { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_BrokerId *brokerId; - ow_string *brokerURL; - ow_DataStructure_array *peerBrokerInfos; - ow_string *brokerName; - ow_boolean slaveBroker; - -} ow_BrokerInfo; -ow_BrokerInfo *ow_BrokerInfo_create(apr_pool_t *pool); -ow_boolean ow_is_a_BrokerInfo(ow_DataStructure *object); - -typedef struct ow_ActiveMQTempQueue { - - ow_byte structType; - ow_string *physicalName; - -} ow_ActiveMQTempQueue; -ow_ActiveMQTempQueue *ow_ActiveMQTempQueue_create(apr_pool_t *pool); -ow_boolean ow_is_a_ActiveMQTempQueue(ow_DataStructure *object); - typedef struct ow_LocalTransactionId { ow_byte structType; @@ -84,19 +49,6 @@ typedef struct ow_LocalTransactionId { ow_LocalTransactionId *ow_LocalTransactionId_create(apr_pool_t *pool); ow_boolean ow_is_a_LocalTransactionId(ow_DataStructure *object); -typedef struct ow_RemoveSubscriptionInfo { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_ConnectionId *connectionId; - ow_string *subcriptionName; - ow_string *clientId; - -} ow_RemoveSubscriptionInfo; -ow_RemoveSubscriptionInfo *ow_RemoveSubscriptionInfo_create(apr_pool_t *pool); -ow_boolean ow_is_a_RemoveSubscriptionInfo(ow_DataStructure *object); - typedef struct ow_IntegerResponse { ow_byte structType; @@ -118,125 +70,6 @@ typedef struct ow_ActiveMQQueue { ow_ActiveMQQueue *ow_ActiveMQQueue_create(apr_pool_t *pool); ow_boolean ow_is_a_ActiveMQQueue(ow_DataStructure *object); -typedef struct ow_DestinationInfo { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_ConnectionId *connectionId; - struct ow_ActiveMQDestination *destination; - ow_byte operationType; - ow_long timeout; - ow_DataStructure_array *brokerPath; - -} ow_DestinationInfo; -ow_DestinationInfo *ow_DestinationInfo_create(apr_pool_t *pool); -ow_boolean ow_is_a_DestinationInfo(ow_DataStructure *object); - -typedef struct ow_ActiveMQBytesMessage { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_ProducerId *producerId; - struct ow_ActiveMQDestination *destination; - struct ow_TransactionId *transactionId; - struct ow_ActiveMQDestination *originalDestination; - struct ow_MessageId *messageId; - struct ow_TransactionId *originalTransactionId; - ow_string *groupID; - ow_int groupSequence; - ow_string *correlationId; - ow_boolean persistent; - ow_long expiration; - ow_byte priority; - struct ow_ActiveMQDestination *replyTo; - ow_long timestamp; - ow_string *type; - ow_byte_array *content; - ow_byte_array *marshalledProperties; - struct ow_DataStructure *dataStructure; - struct ow_ConsumerId *targetConsumerId; - ow_boolean compressed; - ow_int redeliveryCounter; - ow_DataStructure_array *brokerPath; - ow_long arrival; - ow_string *userID; - ow_boolean recievedByDFBridge; - -} ow_ActiveMQBytesMessage; -ow_ActiveMQBytesMessage *ow_ActiveMQBytesMessage_create(apr_pool_t *pool); -ow_boolean ow_is_a_ActiveMQBytesMessage(ow_DataStructure *object); - -typedef struct ow_ShutdownInfo { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - -} ow_ShutdownInfo; -ow_ShutdownInfo *ow_ShutdownInfo_create(apr_pool_t *pool); -ow_boolean ow_is_a_ShutdownInfo(ow_DataStructure *object); - -typedef struct ow_DataResponse { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - ow_short correlationId; - struct ow_DataStructure *data; - -} ow_DataResponse; -ow_DataResponse *ow_DataResponse_create(apr_pool_t *pool); -ow_boolean ow_is_a_DataResponse(ow_DataStructure *object); - -typedef struct ow_SessionId { - - ow_byte structType; - ow_string *connectionId; - ow_long value; - -} ow_SessionId; -ow_SessionId *ow_SessionId_create(apr_pool_t *pool); -ow_boolean ow_is_a_SessionId(ow_DataStructure *object); - -typedef struct ow_DataArrayResponse { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - ow_short correlationId; - ow_DataStructure_array *data; - -} ow_DataArrayResponse; -ow_DataArrayResponse *ow_DataArrayResponse_create(apr_pool_t *pool); -ow_boolean ow_is_a_DataArrayResponse(ow_DataStructure *object); - -typedef struct ow_JournalQueueAck { - - ow_byte structType; - struct ow_ActiveMQDestination *destination; - struct ow_MessageAck *messageAck; - -} ow_JournalQueueAck; -ow_JournalQueueAck *ow_JournalQueueAck_create(apr_pool_t *pool); -ow_boolean ow_is_a_JournalQueueAck(ow_DataStructure *object); - -typedef struct ow_WireFormatInfo { - - ow_byte structType; - ow_byte_array *magic; - ow_int version; - ow_boolean cacheEnabled; - ow_boolean stackTraceEnabled; - ow_boolean tcpNoDelayEnabled; - ow_boolean prefixPacketSize; - ow_boolean tightEncodingEnabled; - -} ow_WireFormatInfo; -ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool); -ow_boolean ow_is_a_WireFormatInfo(ow_DataStructure *object); - typedef struct ow_TransactionId { ow_byte structType; @@ -245,29 +78,6 @@ typedef struct ow_TransactionId { ow_TransactionId *ow_TransactionId_create(apr_pool_t *pool); ow_boolean ow_is_a_TransactionId(ow_DataStructure *object); -typedef struct ow_Response { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - ow_short correlationId; - -} ow_Response; -ow_Response *ow_Response_create(apr_pool_t *pool); -ow_boolean ow_is_a_Response(ow_DataStructure *object); - -typedef struct ow_ConnectionError { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - ow_throwable *exception; - struct ow_ConnectionId *connectionId; - -} ow_ConnectionError; -ow_ConnectionError *ow_ConnectionError_create(apr_pool_t *pool); -ow_boolean ow_is_a_ConnectionError(ow_DataStructure *object); - typedef struct ow_ActiveMQObjectMessage { ow_byte structType; @@ -303,6 +113,232 @@ typedef struct ow_ActiveMQObjectMessage { ow_ActiveMQObjectMessage *ow_ActiveMQObjectMessage_create(apr_pool_t *pool); ow_boolean ow_is_a_ActiveMQObjectMessage(ow_DataStructure *object); +typedef struct ow_ConnectionId { + + ow_byte structType; + ow_string *value; + +} ow_ConnectionId; +ow_ConnectionId *ow_ConnectionId_create(apr_pool_t *pool); +ow_boolean ow_is_a_ConnectionId(ow_DataStructure *object); + +typedef struct ow_ConnectionInfo { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_ConnectionId *connectionId; + ow_string *clientId; + ow_string *password; + ow_string *userName; + ow_DataStructure_array *brokerPath; + +} ow_ConnectionInfo; +ow_ConnectionInfo *ow_ConnectionInfo_create(apr_pool_t *pool); +ow_boolean ow_is_a_ConnectionInfo(ow_DataStructure *object); + +typedef struct ow_ProducerInfo { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_ProducerId *producerId; + struct ow_ActiveMQDestination *destination; + ow_DataStructure_array *brokerPath; + +} ow_ProducerInfo; +ow_ProducerInfo *ow_ProducerInfo_create(apr_pool_t *pool); +ow_boolean ow_is_a_ProducerInfo(ow_DataStructure *object); + +typedef struct ow_MessageDispatchNotification { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_ConsumerId *consumerId; + struct ow_ActiveMQDestination *destination; + ow_long deliverySequenceId; + struct ow_MessageId *messageId; + +} ow_MessageDispatchNotification; +ow_MessageDispatchNotification *ow_MessageDispatchNotification_create(apr_pool_t *pool); +ow_boolean ow_is_a_MessageDispatchNotification(ow_DataStructure *object); + +typedef struct ow_SessionInfo { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_SessionId *sessionId; + +} ow_SessionInfo; +ow_SessionInfo *ow_SessionInfo_create(apr_pool_t *pool); +ow_boolean ow_is_a_SessionInfo(ow_DataStructure *object); + +typedef struct ow_TransactionInfo { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_ConnectionId *connectionId; + struct ow_TransactionId *transactionId; + ow_byte type; + +} ow_TransactionInfo; +ow_TransactionInfo *ow_TransactionInfo_create(apr_pool_t *pool); +ow_boolean ow_is_a_TransactionInfo(ow_DataStructure *object); + +typedef struct ow_ActiveMQStreamMessage { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_ProducerId *producerId; + struct ow_ActiveMQDestination *destination; + struct ow_TransactionId *transactionId; + struct ow_ActiveMQDestination *originalDestination; + struct ow_MessageId *messageId; + struct ow_TransactionId *originalTransactionId; + ow_string *groupID; + ow_int groupSequence; + ow_string *correlationId; + ow_boolean persistent; + ow_long expiration; + ow_byte priority; + struct ow_ActiveMQDestination *replyTo; + ow_long timestamp; + ow_string *type; + ow_byte_array *content; + ow_byte_array *marshalledProperties; + struct ow_DataStructure *dataStructure; + struct ow_ConsumerId *targetConsumerId; + ow_boolean compressed; + ow_int redeliveryCounter; + ow_DataStructure_array *brokerPath; + ow_long arrival; + ow_string *userID; + ow_boolean recievedByDFBridge; + +} ow_ActiveMQStreamMessage; +ow_ActiveMQStreamMessage *ow_ActiveMQStreamMessage_create(apr_pool_t *pool); +ow_boolean ow_is_a_ActiveMQStreamMessage(ow_DataStructure *object); + +typedef struct ow_MessageAck { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_ActiveMQDestination *destination; + struct ow_TransactionId *transactionId; + struct ow_ConsumerId *consumerId; + ow_byte ackType; + struct ow_MessageId *firstMessageId; + struct ow_MessageId *lastMessageId; + ow_int messageCount; + +} ow_MessageAck; +ow_MessageAck *ow_MessageAck_create(apr_pool_t *pool); +ow_boolean ow_is_a_MessageAck(ow_DataStructure *object); + +typedef struct ow_ProducerId { + + ow_byte structType; + ow_string *connectionId; + ow_long value; + ow_long sessionId; + +} ow_ProducerId; +ow_ProducerId *ow_ProducerId_create(apr_pool_t *pool); +ow_boolean ow_is_a_ProducerId(ow_DataStructure *object); + +typedef struct ow_MessageId { + + ow_byte structType; + struct ow_ProducerId *producerId; + ow_long producerSequenceId; + ow_long brokerSequenceId; + +} ow_MessageId; +ow_MessageId *ow_MessageId_create(apr_pool_t *pool); +ow_boolean ow_is_a_MessageId(ow_DataStructure *object); + +typedef struct ow_ActiveMQTempQueue { + + ow_byte structType; + ow_string *physicalName; + +} ow_ActiveMQTempQueue; +ow_ActiveMQTempQueue *ow_ActiveMQTempQueue_create(apr_pool_t *pool); +ow_boolean ow_is_a_ActiveMQTempQueue(ow_DataStructure *object); + +typedef struct ow_RemoveSubscriptionInfo { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_ConnectionId *connectionId; + ow_string *subcriptionName; + ow_string *clientId; + +} ow_RemoveSubscriptionInfo; +ow_RemoveSubscriptionInfo *ow_RemoveSubscriptionInfo_create(apr_pool_t *pool); +ow_boolean ow_is_a_RemoveSubscriptionInfo(ow_DataStructure *object); + +typedef struct ow_SessionId { + + ow_byte structType; + ow_string *connectionId; + ow_long value; + +} ow_SessionId; +ow_SessionId *ow_SessionId_create(apr_pool_t *pool); +ow_boolean ow_is_a_SessionId(ow_DataStructure *object); + +typedef struct ow_DataArrayResponse { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + ow_short correlationId; + ow_DataStructure_array *data; + +} ow_DataArrayResponse; +ow_DataArrayResponse *ow_DataArrayResponse_create(apr_pool_t *pool); +ow_boolean ow_is_a_DataArrayResponse(ow_DataStructure *object); + +typedef struct ow_JournalQueueAck { + + ow_byte structType; + struct ow_ActiveMQDestination *destination; + struct ow_MessageAck *messageAck; + +} ow_JournalQueueAck; +ow_JournalQueueAck *ow_JournalQueueAck_create(apr_pool_t *pool); +ow_boolean ow_is_a_JournalQueueAck(ow_DataStructure *object); + +typedef struct ow_Response { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + ow_short correlationId; + +} ow_Response; +ow_Response *ow_Response_create(apr_pool_t *pool); +ow_boolean ow_is_a_Response(ow_DataStructure *object); + +typedef struct ow_ConnectionError { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + ow_throwable *exception; + struct ow_ConnectionId *connectionId; + +} ow_ConnectionError; +ow_ConnectionError *ow_ConnectionError_create(apr_pool_t *pool); +ow_boolean ow_is_a_ConnectionError(ow_DataStructure *object); + typedef struct ow_ConsumerInfo { ow_byte structType; @@ -321,12 +357,169 @@ typedef struct ow_ConsumerInfo { ow_boolean retroactive; ow_byte priority; ow_DataStructure_array *brokerPath; + struct ow_BooleanExpression *additionalPredicate; ow_boolean networkSubscription; } ow_ConsumerInfo; ow_ConsumerInfo *ow_ConsumerInfo_create(apr_pool_t *pool); ow_boolean ow_is_a_ConsumerInfo(ow_DataStructure *object); +typedef struct ow_XATransactionId { + + ow_byte structType; + ow_int formatId; + ow_byte_array *globalTransactionId; + ow_byte_array *branchQualifier; + +} ow_XATransactionId; +ow_XATransactionId *ow_XATransactionId_create(apr_pool_t *pool); +ow_boolean ow_is_a_XATransactionId(ow_DataStructure *object); + +typedef struct ow_JournalTrace { + + ow_byte structType; + ow_string *message; + +} ow_JournalTrace; +ow_JournalTrace *ow_JournalTrace_create(apr_pool_t *pool); +ow_boolean ow_is_a_JournalTrace(ow_DataStructure *object); + +typedef struct ow_ConsumerId { + + ow_byte structType; + ow_string *connectionId; + ow_long sessionId; + ow_long value; + +} ow_ConsumerId; +ow_ConsumerId *ow_ConsumerId_create(apr_pool_t *pool); +ow_boolean ow_is_a_ConsumerId(ow_DataStructure *object); + +typedef struct ow_ActiveMQTextMessage { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_ProducerId *producerId; + struct ow_ActiveMQDestination *destination; + struct ow_TransactionId *transactionId; + struct ow_ActiveMQDestination *originalDestination; + struct ow_MessageId *messageId; + struct ow_TransactionId *originalTransactionId; + ow_string *groupID; + ow_int groupSequence; + ow_string *correlationId; + ow_boolean persistent; + ow_long expiration; + ow_byte priority; + struct ow_ActiveMQDestination *replyTo; + ow_long timestamp; + ow_string *type; + ow_byte_array *content; + ow_byte_array *marshalledProperties; + struct ow_DataStructure *dataStructure; + struct ow_ConsumerId *targetConsumerId; + ow_boolean compressed; + ow_int redeliveryCounter; + ow_DataStructure_array *brokerPath; + ow_long arrival; + ow_string *userID; + ow_boolean recievedByDFBridge; + +} ow_ActiveMQTextMessage; +ow_ActiveMQTextMessage *ow_ActiveMQTextMessage_create(apr_pool_t *pool); +ow_boolean ow_is_a_ActiveMQTextMessage(ow_DataStructure *object); + +typedef struct ow_SubscriptionInfo { + + ow_byte structType; + ow_string *clientId; + struct ow_ActiveMQDestination *destination; + ow_string *selector; + ow_string *subcriptionName; + +} ow_SubscriptionInfo; +ow_SubscriptionInfo *ow_SubscriptionInfo_create(apr_pool_t *pool); +ow_boolean ow_is_a_SubscriptionInfo(ow_DataStructure *object); + +typedef struct ow_JournalTransaction { + + ow_byte structType; + struct ow_TransactionId *transactionId; + ow_byte type; + ow_boolean wasPrepared; + +} ow_JournalTransaction; +ow_JournalTransaction *ow_JournalTransaction_create(apr_pool_t *pool); +ow_boolean ow_is_a_JournalTransaction(ow_DataStructure *object); + +typedef struct ow_ControlCommand { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + ow_string *command; + +} ow_ControlCommand; +ow_ControlCommand *ow_ControlCommand_create(apr_pool_t *pool); +ow_boolean ow_is_a_ControlCommand(ow_DataStructure *object); + +typedef struct ow_NetworkBridgeFilter { + + ow_byte structType; + ow_int networkTTL; + struct ow_BrokerId *networkBrokerId; + +} ow_NetworkBridgeFilter; +ow_NetworkBridgeFilter *ow_NetworkBridgeFilter_create(apr_pool_t *pool); +ow_boolean ow_is_a_NetworkBridgeFilter(ow_DataStructure *object); + +typedef struct ow_ActiveMQBytesMessage { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_ProducerId *producerId; + struct ow_ActiveMQDestination *destination; + struct ow_TransactionId *transactionId; + struct ow_ActiveMQDestination *originalDestination; + struct ow_MessageId *messageId; + struct ow_TransactionId *originalTransactionId; + ow_string *groupID; + ow_int groupSequence; + ow_string *correlationId; + ow_boolean persistent; + ow_long expiration; + ow_byte priority; + struct ow_ActiveMQDestination *replyTo; + ow_long timestamp; + ow_string *type; + ow_byte_array *content; + ow_byte_array *marshalledProperties; + struct ow_DataStructure *dataStructure; + struct ow_ConsumerId *targetConsumerId; + ow_boolean compressed; + ow_int redeliveryCounter; + ow_DataStructure_array *brokerPath; + ow_long arrival; + ow_string *userID; + ow_boolean recievedByDFBridge; + +} ow_ActiveMQBytesMessage; +ow_ActiveMQBytesMessage *ow_ActiveMQBytesMessage_create(apr_pool_t *pool); +ow_boolean ow_is_a_ActiveMQBytesMessage(ow_DataStructure *object); + +typedef struct ow_WireFormatInfo { + + ow_byte structType; + ow_byte_array *magic; + ow_int version; + ow_byte_array *marshalledProperties; + +} ow_WireFormatInfo; +ow_WireFormatInfo *ow_WireFormatInfo_create(apr_pool_t *pool); +ow_boolean ow_is_a_WireFormatInfo(ow_DataStructure *object); + typedef struct ow_ActiveMQTempTopic { ow_byte structType; @@ -336,15 +529,6 @@ typedef struct ow_ActiveMQTempTopic { ow_ActiveMQTempTopic *ow_ActiveMQTempTopic_create(apr_pool_t *pool); ow_boolean ow_is_a_ActiveMQTempTopic(ow_DataStructure *object); -typedef struct ow_ConnectionId { - - ow_byte structType; - ow_string *value; - -} ow_ConnectionId; -ow_ConnectionId *ow_ConnectionId_create(apr_pool_t *pool); -ow_boolean ow_is_a_ConnectionId(ow_DataStructure *object); - typedef struct ow_DiscoveryEvent { ow_byte structType; @@ -355,20 +539,84 @@ typedef struct ow_DiscoveryEvent { ow_DiscoveryEvent *ow_DiscoveryEvent_create(apr_pool_t *pool); ow_boolean ow_is_a_DiscoveryEvent(ow_DataStructure *object); -typedef struct ow_ConnectionInfo { +typedef struct ow_ActiveMQTempDestination { + + ow_byte structType; + ow_string *physicalName; + +} ow_ActiveMQTempDestination; +ow_ActiveMQTempDestination *ow_ActiveMQTempDestination_create(apr_pool_t *pool); +ow_boolean ow_is_a_ActiveMQTempDestination(ow_DataStructure *object); + +typedef struct ow_ActiveMQDestination { + + ow_byte structType; + ow_string *physicalName; + +} ow_ActiveMQDestination; +ow_ActiveMQDestination *ow_ActiveMQDestination_create(apr_pool_t *pool); +ow_boolean ow_is_a_ActiveMQDestination(ow_DataStructure *object); + +typedef struct ow_ActiveMQTopic { + + ow_byte structType; + ow_string *physicalName; + +} ow_ActiveMQTopic; +ow_ActiveMQTopic *ow_ActiveMQTopic_create(apr_pool_t *pool); +ow_boolean ow_is_a_ActiveMQTopic(ow_DataStructure *object); + +typedef struct ow_BrokerInfo { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + struct ow_BrokerId *brokerId; + ow_string *brokerURL; + ow_DataStructure_array *peerBrokerInfos; + ow_string *brokerName; + ow_boolean slaveBroker; + +} ow_BrokerInfo; +ow_BrokerInfo *ow_BrokerInfo_create(apr_pool_t *pool); +ow_boolean ow_is_a_BrokerInfo(ow_DataStructure *object); + +typedef struct ow_DestinationInfo { ow_byte structType; ow_short commandId; ow_boolean responseRequired; struct ow_ConnectionId *connectionId; - ow_string *clientId; - ow_string *password; - ow_string *userName; + struct ow_ActiveMQDestination *destination; + ow_byte operationType; + ow_long timeout; ow_DataStructure_array *brokerPath; -} ow_ConnectionInfo; -ow_ConnectionInfo *ow_ConnectionInfo_create(apr_pool_t *pool); -ow_boolean ow_is_a_ConnectionInfo(ow_DataStructure *object); +} ow_DestinationInfo; +ow_DestinationInfo *ow_DestinationInfo_create(apr_pool_t *pool); +ow_boolean ow_is_a_DestinationInfo(ow_DataStructure *object); + +typedef struct ow_ShutdownInfo { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + +} ow_ShutdownInfo; +ow_ShutdownInfo *ow_ShutdownInfo_create(apr_pool_t *pool); +ow_boolean ow_is_a_ShutdownInfo(ow_DataStructure *object); + +typedef struct ow_DataResponse { + + ow_byte structType; + ow_short commandId; + ow_boolean responseRequired; + ow_short correlationId; + struct ow_DataStructure *data; + +} ow_DataResponse; +ow_DataResponse *ow_DataResponse_create(apr_pool_t *pool); +ow_boolean ow_is_a_DataResponse(ow_DataStructure *object); typedef struct ow_KeepAliveInfo { @@ -423,26 +671,6 @@ typedef struct ow_BaseCommand { ow_BaseCommand *ow_BaseCommand_create(apr_pool_t *pool); ow_boolean ow_is_a_BaseCommand(ow_DataStructure *object); -typedef struct ow_XATransactionId { - - ow_byte structType; - ow_int formatId; - ow_byte_array *globalTransactionId; - ow_byte_array *branchQualifier; - -} ow_XATransactionId; -ow_XATransactionId *ow_XATransactionId_create(apr_pool_t *pool); -ow_boolean ow_is_a_XATransactionId(ow_DataStructure *object); - -typedef struct ow_JournalTrace { - - ow_byte structType; - ow_string *message; - -} ow_JournalTrace; -ow_JournalTrace *ow_JournalTrace_create(apr_pool_t *pool); -ow_boolean ow_is_a_JournalTrace(ow_DataStructure *object); - typedef struct ow_FlushCommand { ow_byte structType; @@ -453,26 +681,6 @@ typedef struct ow_FlushCommand { ow_FlushCommand *ow_FlushCommand_create(apr_pool_t *pool); ow_boolean ow_is_a_FlushCommand(ow_DataStructure *object); -typedef struct ow_ActiveMQTempDestination { - - ow_byte structType; - ow_string *physicalName; - -} ow_ActiveMQTempDestination; -ow_ActiveMQTempDestination *ow_ActiveMQTempDestination_create(apr_pool_t *pool); -ow_boolean ow_is_a_ActiveMQTempDestination(ow_DataStructure *object); - -typedef struct ow_ConsumerId { - - ow_byte structType; - ow_string *connectionId; - ow_long sessionId; - ow_long value; - -} ow_ConsumerId; -ow_ConsumerId *ow_ConsumerId_create(apr_pool_t *pool); -ow_boolean ow_is_a_ConsumerId(ow_DataStructure *object); - typedef struct ow_JournalTopicAck { ow_byte structType; @@ -487,41 +695,6 @@ typedef struct ow_JournalTopicAck { ow_JournalTopicAck *ow_JournalTopicAck_create(apr_pool_t *pool); ow_boolean ow_is_a_JournalTopicAck(ow_DataStructure *object); -typedef struct ow_ActiveMQTextMessage { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_ProducerId *producerId; - struct ow_ActiveMQDestination *destination; - struct ow_TransactionId *transactionId; - struct ow_ActiveMQDestination *originalDestination; - struct ow_MessageId *messageId; - struct ow_TransactionId *originalTransactionId; - ow_string *groupID; - ow_int groupSequence; - ow_string *correlationId; - ow_boolean persistent; - ow_long expiration; - ow_byte priority; - struct ow_ActiveMQDestination *replyTo; - ow_long timestamp; - ow_string *type; - ow_byte_array *content; - ow_byte_array *marshalledProperties; - struct ow_DataStructure *dataStructure; - struct ow_ConsumerId *targetConsumerId; - ow_boolean compressed; - ow_int redeliveryCounter; - ow_DataStructure_array *brokerPath; - ow_long arrival; - ow_string *userID; - ow_boolean recievedByDFBridge; - -} ow_ActiveMQTextMessage; -ow_ActiveMQTextMessage *ow_ActiveMQTextMessage_create(apr_pool_t *pool); -ow_boolean ow_is_a_ActiveMQTextMessage(ow_DataStructure *object); - typedef struct ow_BrokerId { ow_byte structType; @@ -545,31 +718,6 @@ typedef struct ow_MessageDispatch { ow_MessageDispatch *ow_MessageDispatch_create(apr_pool_t *pool); ow_boolean ow_is_a_MessageDispatch(ow_DataStructure *object); -typedef struct ow_ProducerInfo { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_ProducerId *producerId; - struct ow_ActiveMQDestination *destination; - ow_DataStructure_array *brokerPath; - -} ow_ProducerInfo; -ow_ProducerInfo *ow_ProducerInfo_create(apr_pool_t *pool); -ow_boolean ow_is_a_ProducerInfo(ow_DataStructure *object); - -typedef struct ow_SubscriptionInfo { - - ow_byte structType; - ow_string *clientId; - struct ow_ActiveMQDestination *destination; - ow_string *selector; - ow_string *subcriptionName; - -} ow_SubscriptionInfo; -ow_SubscriptionInfo *ow_SubscriptionInfo_create(apr_pool_t *pool); -ow_boolean ow_is_a_SubscriptionInfo(ow_DataStructure *object); - typedef struct ow_ActiveMQMapMessage { ow_byte structType; @@ -605,31 +753,6 @@ typedef struct ow_ActiveMQMapMessage { ow_ActiveMQMapMessage *ow_ActiveMQMapMessage_create(apr_pool_t *pool); ow_boolean ow_is_a_ActiveMQMapMessage(ow_DataStructure *object); -typedef struct ow_MessageDispatchNotification { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_ConsumerId *consumerId; - struct ow_ActiveMQDestination *destination; - ow_long deliverySequenceId; - struct ow_MessageId *messageId; - -} ow_MessageDispatchNotification; -ow_MessageDispatchNotification *ow_MessageDispatchNotification_create(apr_pool_t *pool); -ow_boolean ow_is_a_MessageDispatchNotification(ow_DataStructure *object); - -typedef struct ow_SessionInfo { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_SessionId *sessionId; - -} ow_SessionInfo; -ow_SessionInfo *ow_SessionInfo_create(apr_pool_t *pool); -ow_boolean ow_is_a_SessionInfo(ow_DataStructure *object); - typedef struct ow_ActiveMQMessage { ow_byte structType; @@ -665,111 +788,6 @@ typedef struct ow_ActiveMQMessage { ow_ActiveMQMessage *ow_ActiveMQMessage_create(apr_pool_t *pool); ow_boolean ow_is_a_ActiveMQMessage(ow_DataStructure *object); -typedef struct ow_TransactionInfo { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_ConnectionId *connectionId; - struct ow_TransactionId *transactionId; - ow_byte type; - -} ow_TransactionInfo; -ow_TransactionInfo *ow_TransactionInfo_create(apr_pool_t *pool); -ow_boolean ow_is_a_TransactionInfo(ow_DataStructure *object); - -typedef struct ow_ActiveMQStreamMessage { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_ProducerId *producerId; - struct ow_ActiveMQDestination *destination; - struct ow_TransactionId *transactionId; - struct ow_ActiveMQDestination *originalDestination; - struct ow_MessageId *messageId; - struct ow_TransactionId *originalTransactionId; - ow_string *groupID; - ow_int groupSequence; - ow_string *correlationId; - ow_boolean persistent; - ow_long expiration; - ow_byte priority; - struct ow_ActiveMQDestination *replyTo; - ow_long timestamp; - ow_string *type; - ow_byte_array *content; - ow_byte_array *marshalledProperties; - struct ow_DataStructure *dataStructure; - struct ow_ConsumerId *targetConsumerId; - ow_boolean compressed; - ow_int redeliveryCounter; - ow_DataStructure_array *brokerPath; - ow_long arrival; - ow_string *userID; - ow_boolean recievedByDFBridge; - -} ow_ActiveMQStreamMessage; -ow_ActiveMQStreamMessage *ow_ActiveMQStreamMessage_create(apr_pool_t *pool); -ow_boolean ow_is_a_ActiveMQStreamMessage(ow_DataStructure *object); - -typedef struct ow_ActiveMQDestination { - - ow_byte structType; - ow_string *physicalName; - -} ow_ActiveMQDestination; -ow_ActiveMQDestination *ow_ActiveMQDestination_create(apr_pool_t *pool); -ow_boolean ow_is_a_ActiveMQDestination(ow_DataStructure *object); - -typedef struct ow_MessageAck { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - struct ow_ActiveMQDestination *destination; - struct ow_TransactionId *transactionId; - struct ow_ConsumerId *consumerId; - ow_byte ackType; - struct ow_MessageId *firstMessageId; - struct ow_MessageId *lastMessageId; - ow_int messageCount; - -} ow_MessageAck; -ow_MessageAck *ow_MessageAck_create(apr_pool_t *pool); -ow_boolean ow_is_a_MessageAck(ow_DataStructure *object); - -typedef struct ow_ProducerId { - - ow_byte structType; - ow_string *connectionId; - ow_long value; - ow_long sessionId; - -} ow_ProducerId; -ow_ProducerId *ow_ProducerId_create(apr_pool_t *pool); -ow_boolean ow_is_a_ProducerId(ow_DataStructure *object); - -typedef struct ow_ActiveMQTopic { - - ow_byte structType; - ow_string *physicalName; - -} ow_ActiveMQTopic; -ow_ActiveMQTopic *ow_ActiveMQTopic_create(apr_pool_t *pool); -ow_boolean ow_is_a_ActiveMQTopic(ow_DataStructure *object); - -typedef struct ow_JournalTransaction { - - ow_byte structType; - struct ow_TransactionId *transactionId; - ow_byte type; - ow_boolean wasPrepared; - -} ow_JournalTransaction; -ow_JournalTransaction *ow_JournalTransaction_create(apr_pool_t *pool); -ow_boolean ow_is_a_JournalTransaction(ow_DataStructure *object); - typedef struct ow_RemoveInfo { ow_byte structType; @@ -781,17 +799,6 @@ typedef struct ow_RemoveInfo { ow_RemoveInfo *ow_RemoveInfo_create(apr_pool_t *pool); ow_boolean ow_is_a_RemoveInfo(ow_DataStructure *object); -typedef struct ow_ControlCommand { - - ow_byte structType; - ow_short commandId; - ow_boolean responseRequired; - ow_string *command; - -} ow_ControlCommand; -ow_ControlCommand *ow_ControlCommand_create(apr_pool_t *pool); -ow_boolean ow_is_a_ControlCommand(ow_DataStructure *object); - typedef struct ow_ExceptionResponse { ow_byte structType; diff --git a/openwire-cpp/src/command/ActiveMQObjectMessage.hpp b/openwire-cpp/src/command/ActiveMQObjectMessage.hpp index 14943f5091..09959f3c39 100644 --- a/openwire-cpp/src/command/ActiveMQObjectMessage.hpp +++ b/openwire-cpp/src/command/ActiveMQObjectMessage.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQObjectMessage_hpp_ -#define ActiveMQObjectMessage_hpp_ - -#include -#include "command/ActiveMQMessage.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for ActiveMQObjectMessage - * - * - * 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 - * - */ -class ActiveMQObjectMessage : public ActiveMQMessage -{ -private: - -public: - const static int TYPE = 26; - -public: - ActiveMQObjectMessage() ; - virtual ~ActiveMQObjectMessage() ; - - virtual int getCommandType() ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*ActiveMQObjectMessage_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQObjectMessage_hpp_ #define ActiveMQObjectMessage_hpp_ #include #include "command/ActiveMQMessage.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for ActiveMQObjectMessage * * * 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 * */ class ActiveMQObjectMessage : public ActiveMQMessage { private: public: const static int TYPE = 26; public: ActiveMQObjectMessage() ; virtual ~ActiveMQObjectMessage() ; virtual int getCommandType() ; } ; /* namespace */ } } } } #endif /*ActiveMQObjectMessage_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/ConnectionError.hpp b/openwire-cpp/src/command/ConnectionError.hpp index dcdf06b2eb..f59b4ba87a 100644 --- a/openwire-cpp/src/command/ConnectionError.hpp +++ b/openwire-cpp/src/command/ConnectionError.hpp @@ -1,81 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ConnectionError_hpp_ -#define ConnectionError_hpp_ - -#include -#include "command/BaseCommand.hpp" - -#include "BrokerError.hpp" -#include "command/ConnectionId.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for ConnectionError - * - * - * 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 - * - */ -class ConnectionError : public BaseCommand -{ -private: - p exception ; - p connectionId ; - -public: - const static int TYPE = 16; - -public: - ConnectionError() ; - virtual ~ConnectionError() ; - - virtual int getCommandType() ; - - virtual p getException() ; - virtual void setException(p exception) ; - - virtual p getConnectionId() ; - virtual void setConnectionId(p connectionId) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*ConnectionError_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ConnectionError_hpp_ #define ConnectionError_hpp_ #include #include "command/BaseCommand.hpp" #include "BrokerError.hpp" #include "command/ConnectionId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for ConnectionError * * * 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 * */ class ConnectionError : public BaseCommand { private: p exception ; p connectionId ; public: const static int TYPE = 16; public: ConnectionError() ; virtual ~ConnectionError() ; virtual int getCommandType() ; virtual p getException() ; virtual void setException(p exception) ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; } ; /* namespace */ } } } } #endif /*ConnectionError_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/ConsumerInfo.cpp b/openwire-cpp/src/command/ConsumerInfo.cpp index af3a4c3833..5472240ce6 100755 --- a/openwire-cpp/src/command/ConsumerInfo.cpp +++ b/openwire-cpp/src/command/ConsumerInfo.cpp @@ -43,6 +43,7 @@ ConsumerInfo::ConsumerInfo() this->retroactive = 0 ; this->priority = 0 ; this->brokerPath = 0 ; + this->additionalPredicate = 0 ; this->networkSubscription = 0 ; } @@ -194,6 +195,17 @@ void ConsumerInfo::setBrokerPath(ap brokerPath) } +p ConsumerInfo::getAdditionalPredicate() +{ + return additionalPredicate ; +} + +void ConsumerInfo::setAdditionalPredicate(p additionalPredicate) +{ + this->additionalPredicate = additionalPredicate ; +} + + bool ConsumerInfo::getNetworkSubscription() { return networkSubscription ; diff --git a/openwire-cpp/src/command/ConsumerInfo.hpp b/openwire-cpp/src/command/ConsumerInfo.hpp index a009c81eee..7bc88ad1db 100755 --- a/openwire-cpp/src/command/ConsumerInfo.hpp +++ b/openwire-cpp/src/command/ConsumerInfo.hpp @@ -23,6 +23,7 @@ #include "command/ConsumerId.hpp" #include "command/ActiveMQDestination.hpp" #include "command/BrokerId.hpp" +#include "command/BooleanExpression.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" @@ -65,6 +66,7 @@ private: bool retroactive ; char priority ; ap brokerPath ; + p additionalPredicate ; bool networkSubscription ; public: @@ -115,6 +117,9 @@ public: virtual ap getBrokerPath() ; virtual void setBrokerPath(ap brokerPath) ; + virtual p getAdditionalPredicate() ; + virtual void setAdditionalPredicate(p additionalPredicate) ; + virtual bool getNetworkSubscription() ; virtual void setNetworkSubscription(bool networkSubscription) ; diff --git a/openwire-cpp/src/command/ControlCommand.hpp b/openwire-cpp/src/command/ControlCommand.hpp index 4eabfdc453..7fc2e1158a 100644 --- a/openwire-cpp/src/command/ControlCommand.hpp +++ b/openwire-cpp/src/command/ControlCommand.hpp @@ -1,75 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ControlCommand_hpp_ -#define ControlCommand_hpp_ - -#include -#include "command/BaseCommand.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for ControlCommand - * - * - * 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 - * - */ -class ControlCommand : public BaseCommand -{ -private: - p command ; - -public: - const static int TYPE = 14; - -public: - ControlCommand() ; - virtual ~ControlCommand() ; - - virtual int getCommandType() ; - - virtual p getCommand() ; - virtual void setCommand(p command) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*ControlCommand_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ControlCommand_hpp_ #define ControlCommand_hpp_ #include #include "command/BaseCommand.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for ControlCommand * * * 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 * */ class ControlCommand : public BaseCommand { private: p command ; public: const static int TYPE = 14; public: ControlCommand() ; virtual ~ControlCommand() ; virtual int getCommandType() ; virtual p getCommand() ; virtual void setCommand(p command) ; } ; /* namespace */ } } } } #endif /*ControlCommand_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/DataArrayResponse.hpp b/openwire-cpp/src/command/DataArrayResponse.hpp index 252ac4f7b1..f4f57ed4a7 100644 --- a/openwire-cpp/src/command/DataArrayResponse.hpp +++ b/openwire-cpp/src/command/DataArrayResponse.hpp @@ -1,76 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef DataArrayResponse_hpp_ -#define DataArrayResponse_hpp_ - -#include -#include "command/Response.hpp" - -#include "command/IDataStructure.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for DataArrayResponse - * - * - * 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 - * - */ -class DataArrayResponse : public Response -{ -private: - ap data ; - -public: - const static int TYPE = 33; - -public: - DataArrayResponse() ; - virtual ~DataArrayResponse() ; - - virtual int getCommandType() ; - - virtual ap getData() ; - virtual void setData(ap data) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*DataArrayResponse_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef DataArrayResponse_hpp_ #define DataArrayResponse_hpp_ #include #include "command/Response.hpp" #include "command/IDataStructure.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for DataArrayResponse * * * 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 * */ class DataArrayResponse : public Response { private: ap data ; public: const static int TYPE = 33; public: DataArrayResponse() ; virtual ~DataArrayResponse() ; virtual int getCommandType() ; virtual ap getData() ; virtual void setData(ap data) ; } ; /* namespace */ } } } } #endif /*DataArrayResponse_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/DataResponse.hpp b/openwire-cpp/src/command/DataResponse.hpp index 1e40f60fb8..ff85d8b0d3 100644 --- a/openwire-cpp/src/command/DataResponse.hpp +++ b/openwire-cpp/src/command/DataResponse.hpp @@ -1,76 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef DataResponse_hpp_ -#define DataResponse_hpp_ - -#include -#include "command/Response.hpp" - -#include "command/IDataStructure.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for DataResponse - * - * - * 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 - * - */ -class DataResponse : public Response -{ -private: - p data ; - -public: - const static int TYPE = 32; - -public: - DataResponse() ; - virtual ~DataResponse() ; - - virtual int getCommandType() ; - - virtual p getData() ; - virtual void setData(p data) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*DataResponse_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef DataResponse_hpp_ #define DataResponse_hpp_ #include #include "command/Response.hpp" #include "command/IDataStructure.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for DataResponse * * * 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 * */ class DataResponse : public Response { private: p data ; public: const static int TYPE = 32; public: DataResponse() ; virtual ~DataResponse() ; virtual int getCommandType() ; virtual p getData() ; virtual void setData(p data) ; } ; /* namespace */ } } } } #endif /*DataResponse_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/DestinationInfo.hpp b/openwire-cpp/src/command/DestinationInfo.hpp index 79e46f2955..6122915ce3 100644 --- a/openwire-cpp/src/command/DestinationInfo.hpp +++ b/openwire-cpp/src/command/DestinationInfo.hpp @@ -1,94 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef DestinationInfo_hpp_ -#define DestinationInfo_hpp_ - -#include -#include "command/BaseCommand.hpp" - -#include "command/ConnectionId.hpp" -#include "command/ActiveMQDestination.hpp" -#include "command/BrokerId.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for DestinationInfo - * - * - * 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 - * - */ -class DestinationInfo : public BaseCommand -{ -private: - p connectionId ; - p destination ; - char operationType ; - long long timeout ; - ap brokerPath ; - -public: - const static int TYPE = 8; - -public: - DestinationInfo() ; - virtual ~DestinationInfo() ; - - virtual int getCommandType() ; - - virtual p getConnectionId() ; - virtual void setConnectionId(p connectionId) ; - - virtual p getDestination() ; - virtual void setDestination(p destination) ; - - virtual char getOperationType() ; - virtual void setOperationType(char operationType) ; - - virtual long long getTimeout() ; - virtual void setTimeout(long long timeout) ; - - virtual ap getBrokerPath() ; - virtual void setBrokerPath(ap brokerPath) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*DestinationInfo_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef DestinationInfo_hpp_ #define DestinationInfo_hpp_ #include #include "command/BaseCommand.hpp" #include "command/ConnectionId.hpp" #include "command/ActiveMQDestination.hpp" #include "command/BrokerId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for DestinationInfo * * * 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 * */ class DestinationInfo : public BaseCommand { private: p connectionId ; p destination ; char operationType ; long long timeout ; ap brokerPath ; public: const static int TYPE = 8; public: DestinationInfo() ; virtual ~DestinationInfo() ; virtual int getCommandType() ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; virtual p getDestination() ; virtual void setDestination(p destination) ; virtual char getOperationType() ; virtual void setOperationType(char operationType) ; virtual long long getTimeout() ; virtual void setTimeout(long long timeout) ; virtual ap getBrokerPath() ; virtual void setBrokerPath(ap brokerPath) ; } ; /* namespace */ } } } } #endif /*DestinationInfo_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/DiscoveryEvent.hpp b/openwire-cpp/src/command/DiscoveryEvent.hpp index 9606a1a5be..db6e574b01 100644 --- a/openwire-cpp/src/command/DiscoveryEvent.hpp +++ b/openwire-cpp/src/command/DiscoveryEvent.hpp @@ -1,79 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef DiscoveryEvent_hpp_ -#define DiscoveryEvent_hpp_ - -#include -#include "command/AbstractCommand.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for DiscoveryEvent - * - * - * 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 - * - */ -class DiscoveryEvent : public AbstractCommand -{ -private: - p serviceName ; - p brokerName ; - -public: - const static int TYPE = 40; - -public: - DiscoveryEvent() ; - virtual ~DiscoveryEvent() ; - - virtual int getCommandType() ; - - virtual p getServiceName() ; - virtual void setServiceName(p serviceName) ; - - virtual p getBrokerName() ; - virtual void setBrokerName(p brokerName) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*DiscoveryEvent_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef DiscoveryEvent_hpp_ #define DiscoveryEvent_hpp_ #include #include "command/AbstractCommand.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for DiscoveryEvent * * * 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 * */ class DiscoveryEvent : public AbstractCommand { private: p serviceName ; p brokerName ; public: const static int TYPE = 40; public: DiscoveryEvent() ; virtual ~DiscoveryEvent() ; virtual int getCommandType() ; virtual p getServiceName() ; virtual void setServiceName(p serviceName) ; virtual p getBrokerName() ; virtual void setBrokerName(p brokerName) ; } ; /* namespace */ } } } } #endif /*DiscoveryEvent_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/FlushCommand.hpp b/openwire-cpp/src/command/FlushCommand.hpp index be21bdb9b5..d7ef6d1ad8 100644 --- a/openwire-cpp/src/command/FlushCommand.hpp +++ b/openwire-cpp/src/command/FlushCommand.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef FlushCommand_hpp_ -#define FlushCommand_hpp_ - -#include -#include "command/BaseCommand.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for FlushCommand - * - * - * 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 - * - */ -class FlushCommand : public BaseCommand -{ -private: - -public: - const static int TYPE = 15; - -public: - FlushCommand() ; - virtual ~FlushCommand() ; - - virtual int getCommandType() ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*FlushCommand_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef FlushCommand_hpp_ #define FlushCommand_hpp_ #include #include "command/BaseCommand.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for FlushCommand * * * 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 * */ class FlushCommand : public BaseCommand { private: public: const static int TYPE = 15; public: FlushCommand() ; virtual ~FlushCommand() ; virtual int getCommandType() ; } ; /* namespace */ } } } } #endif /*FlushCommand_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/IntegerResponse.hpp b/openwire-cpp/src/command/IntegerResponse.hpp index ec7bed9638..8a57753e3c 100644 --- a/openwire-cpp/src/command/IntegerResponse.hpp +++ b/openwire-cpp/src/command/IntegerResponse.hpp @@ -1,75 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef IntegerResponse_hpp_ -#define IntegerResponse_hpp_ - -#include -#include "command/Response.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for IntegerResponse - * - * - * 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 - * - */ -class IntegerResponse : public Response -{ -private: - int result ; - -public: - const static int TYPE = 34; - -public: - IntegerResponse() ; - virtual ~IntegerResponse() ; - - virtual int getCommandType() ; - - virtual int getResult() ; - virtual void setResult(int result) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*IntegerResponse_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef IntegerResponse_hpp_ #define IntegerResponse_hpp_ #include #include "command/Response.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for IntegerResponse * * * 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 * */ class IntegerResponse : public Response { private: int result ; public: const static int TYPE = 34; public: IntegerResponse() ; virtual ~IntegerResponse() ; virtual int getCommandType() ; virtual int getResult() ; virtual void setResult(int result) ; } ; /* namespace */ } } } } #endif /*IntegerResponse_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/JournalQueueAck.hpp b/openwire-cpp/src/command/JournalQueueAck.hpp index 77adbf6077..4df1fbe342 100644 --- a/openwire-cpp/src/command/JournalQueueAck.hpp +++ b/openwire-cpp/src/command/JournalQueueAck.hpp @@ -1,81 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef JournalQueueAck_hpp_ -#define JournalQueueAck_hpp_ - -#include -#include "command/AbstractCommand.hpp" - -#include "command/ActiveMQDestination.hpp" -#include "command/MessageAck.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for JournalQueueAck - * - * - * 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 - * - */ -class JournalQueueAck : public AbstractCommand -{ -private: - p destination ; - p messageAck ; - -public: - const static int TYPE = 52; - -public: - JournalQueueAck() ; - virtual ~JournalQueueAck() ; - - virtual int getCommandType() ; - - virtual p getDestination() ; - virtual void setDestination(p destination) ; - - virtual p getMessageAck() ; - virtual void setMessageAck(p messageAck) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*JournalQueueAck_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef JournalQueueAck_hpp_ #define JournalQueueAck_hpp_ #include #include "command/AbstractCommand.hpp" #include "command/ActiveMQDestination.hpp" #include "command/MessageAck.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for JournalQueueAck * * * 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 * */ class JournalQueueAck : public AbstractCommand { private: p destination ; p messageAck ; public: const static int TYPE = 52; public: JournalQueueAck() ; virtual ~JournalQueueAck() ; virtual int getCommandType() ; virtual p getDestination() ; virtual void setDestination(p destination) ; virtual p getMessageAck() ; virtual void setMessageAck(p messageAck) ; } ; /* namespace */ } } } } #endif /*JournalQueueAck_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/JournalTopicAck.hpp b/openwire-cpp/src/command/JournalTopicAck.hpp index 98d4f7dbd1..06a7b27aa3 100644 --- a/openwire-cpp/src/command/JournalTopicAck.hpp +++ b/openwire-cpp/src/command/JournalTopicAck.hpp @@ -1,98 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef JournalTopicAck_hpp_ -#define JournalTopicAck_hpp_ - -#include -#include "command/AbstractCommand.hpp" - -#include "command/ActiveMQDestination.hpp" -#include "command/MessageId.hpp" -#include "command/TransactionId.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for JournalTopicAck - * - * - * 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 - * - */ -class JournalTopicAck : public AbstractCommand -{ -private: - p destination ; - p messageId ; - long long messageSequenceId ; - p subscritionName ; - p clientId ; - p transactionId ; - -public: - const static int TYPE = 50; - -public: - JournalTopicAck() ; - virtual ~JournalTopicAck() ; - - virtual int getCommandType() ; - - virtual p getDestination() ; - virtual void setDestination(p destination) ; - - virtual p getMessageId() ; - virtual void setMessageId(p messageId) ; - - virtual long long getMessageSequenceId() ; - virtual void setMessageSequenceId(long long messageSequenceId) ; - - virtual p getSubscritionName() ; - virtual void setSubscritionName(p subscritionName) ; - - virtual p getClientId() ; - virtual void setClientId(p clientId) ; - - virtual p getTransactionId() ; - virtual void setTransactionId(p transactionId) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*JournalTopicAck_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef JournalTopicAck_hpp_ #define JournalTopicAck_hpp_ #include #include "command/AbstractCommand.hpp" #include "command/ActiveMQDestination.hpp" #include "command/MessageId.hpp" #include "command/TransactionId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for JournalTopicAck * * * 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 * */ class JournalTopicAck : public AbstractCommand { private: p destination ; p messageId ; long long messageSequenceId ; p subscritionName ; p clientId ; p transactionId ; public: const static int TYPE = 50; public: JournalTopicAck() ; virtual ~JournalTopicAck() ; virtual int getCommandType() ; virtual p getDestination() ; virtual void setDestination(p destination) ; virtual p getMessageId() ; virtual void setMessageId(p messageId) ; virtual long long getMessageSequenceId() ; virtual void setMessageSequenceId(long long messageSequenceId) ; virtual p getSubscritionName() ; virtual void setSubscritionName(p subscritionName) ; virtual p getClientId() ; virtual void setClientId(p clientId) ; virtual p getTransactionId() ; virtual void setTransactionId(p transactionId) ; } ; /* namespace */ } } } } #endif /*JournalTopicAck_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/JournalTrace.hpp b/openwire-cpp/src/command/JournalTrace.hpp index 044543d438..f2c68d590d 100644 --- a/openwire-cpp/src/command/JournalTrace.hpp +++ b/openwire-cpp/src/command/JournalTrace.hpp @@ -1,75 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef JournalTrace_hpp_ -#define JournalTrace_hpp_ - -#include -#include "command/AbstractCommand.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for JournalTrace - * - * - * 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 - * - */ -class JournalTrace : public AbstractCommand -{ -private: - p message ; - -public: - const static int TYPE = 53; - -public: - JournalTrace() ; - virtual ~JournalTrace() ; - - virtual int getCommandType() ; - - virtual p getMessage() ; - virtual void setMessage(p message) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*JournalTrace_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef JournalTrace_hpp_ #define JournalTrace_hpp_ #include #include "command/AbstractCommand.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for JournalTrace * * * 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 * */ class JournalTrace : public AbstractCommand { private: p message ; public: const static int TYPE = 53; public: JournalTrace() ; virtual ~JournalTrace() ; virtual int getCommandType() ; virtual p getMessage() ; virtual void setMessage(p message) ; } ; /* namespace */ } } } } #endif /*JournalTrace_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/JournalTransaction.hpp b/openwire-cpp/src/command/JournalTransaction.hpp index 732f40770c..492aaf7d3b 100644 --- a/openwire-cpp/src/command/JournalTransaction.hpp +++ b/openwire-cpp/src/command/JournalTransaction.hpp @@ -1,84 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef JournalTransaction_hpp_ -#define JournalTransaction_hpp_ - -#include -#include "command/AbstractCommand.hpp" - -#include "command/TransactionId.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for JournalTransaction - * - * - * 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 - * - */ -class JournalTransaction : public AbstractCommand -{ -private: - p transactionId ; - char type ; - bool wasPrepared ; - -public: - const static int TYPE = 54; - -public: - JournalTransaction() ; - virtual ~JournalTransaction() ; - - virtual int getCommandType() ; - - virtual p getTransactionId() ; - virtual void setTransactionId(p transactionId) ; - - virtual char getType() ; - virtual void setType(char type) ; - - virtual bool getWasPrepared() ; - virtual void setWasPrepared(bool wasPrepared) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*JournalTransaction_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef JournalTransaction_hpp_ #define JournalTransaction_hpp_ #include #include "command/AbstractCommand.hpp" #include "command/TransactionId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for JournalTransaction * * * 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 * */ class JournalTransaction : public AbstractCommand { private: p transactionId ; char type ; bool wasPrepared ; public: const static int TYPE = 54; public: JournalTransaction() ; virtual ~JournalTransaction() ; virtual int getCommandType() ; virtual p getTransactionId() ; virtual void setTransactionId(p transactionId) ; virtual char getType() ; virtual void setType(char type) ; virtual bool getWasPrepared() ; virtual void setWasPrepared(bool wasPrepared) ; } ; /* namespace */ } } } } #endif /*JournalTransaction_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/KeepAliveInfo.hpp b/openwire-cpp/src/command/KeepAliveInfo.hpp index 6935962fe2..9f2446f39f 100644 --- a/openwire-cpp/src/command/KeepAliveInfo.hpp +++ b/openwire-cpp/src/command/KeepAliveInfo.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef KeepAliveInfo_hpp_ -#define KeepAliveInfo_hpp_ - -#include -#include "command/AbstractCommand.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for KeepAliveInfo - * - * - * 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 - * - */ -class KeepAliveInfo : public AbstractCommand -{ -private: - -public: - const static int TYPE = 10; - -public: - KeepAliveInfo() ; - virtual ~KeepAliveInfo() ; - - virtual int getCommandType() ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*KeepAliveInfo_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef KeepAliveInfo_hpp_ #define KeepAliveInfo_hpp_ #include #include "command/AbstractCommand.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for KeepAliveInfo * * * 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 * */ class KeepAliveInfo : public AbstractCommand { private: public: const static int TYPE = 10; public: KeepAliveInfo() ; virtual ~KeepAliveInfo() ; virtual int getCommandType() ; } ; /* namespace */ } } } } #endif /*KeepAliveInfo_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/LocalTransactionId.hpp b/openwire-cpp/src/command/LocalTransactionId.hpp index 77e0f17577..8d1ffafeb3 100644 --- a/openwire-cpp/src/command/LocalTransactionId.hpp +++ b/openwire-cpp/src/command/LocalTransactionId.hpp @@ -1,80 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef LocalTransactionId_hpp_ -#define LocalTransactionId_hpp_ - -#include -#include "command/TransactionId.hpp" - -#include "command/ConnectionId.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for LocalTransactionId - * - * - * 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 - * - */ -class LocalTransactionId : public TransactionId -{ -private: - long long value ; - p connectionId ; - -public: - const static int TYPE = 111; - -public: - LocalTransactionId() ; - virtual ~LocalTransactionId() ; - - virtual int getCommandType() ; - - virtual long long getValue() ; - virtual void setValue(long long value) ; - - virtual p getConnectionId() ; - virtual void setConnectionId(p connectionId) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*LocalTransactionId_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef LocalTransactionId_hpp_ #define LocalTransactionId_hpp_ #include #include "command/TransactionId.hpp" #include "command/ConnectionId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for LocalTransactionId * * * 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 * */ class LocalTransactionId : public TransactionId { private: long long value ; p connectionId ; public: const static int TYPE = 111; public: LocalTransactionId() ; virtual ~LocalTransactionId() ; virtual int getCommandType() ; virtual long long getValue() ; virtual void setValue(long long value) ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; } ; /* namespace */ } } } } #endif /*LocalTransactionId_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/MessageDispatch.hpp b/openwire-cpp/src/command/MessageDispatch.hpp index fe7918db50..6761368acc 100644 --- a/openwire-cpp/src/command/MessageDispatch.hpp +++ b/openwire-cpp/src/command/MessageDispatch.hpp @@ -1,90 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef MessageDispatch_hpp_ -#define MessageDispatch_hpp_ - -#include -#include "command/BaseCommand.hpp" - -#include "command/ConsumerId.hpp" -#include "command/ActiveMQDestination.hpp" -#include "command/Message.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for MessageDispatch - * - * - * 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 - * - */ -class MessageDispatch : public BaseCommand -{ -private: - p consumerId ; - p destination ; - p message ; - int redeliveryCounter ; - -public: - const static int TYPE = 21; - -public: - MessageDispatch() ; - virtual ~MessageDispatch() ; - - virtual int getCommandType() ; - - virtual p getConsumerId() ; - virtual void setConsumerId(p consumerId) ; - - virtual p getDestination() ; - virtual void setDestination(p destination) ; - - virtual p getMessage() ; - virtual void setMessage(p message) ; - - virtual int getRedeliveryCounter() ; - virtual void setRedeliveryCounter(int redeliveryCounter) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*MessageDispatch_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef MessageDispatch_hpp_ #define MessageDispatch_hpp_ #include #include "command/BaseCommand.hpp" #include "command/ConsumerId.hpp" #include "command/ActiveMQDestination.hpp" #include "command/Message.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for MessageDispatch * * * 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 * */ class MessageDispatch : public BaseCommand { private: p consumerId ; p destination ; p message ; int redeliveryCounter ; public: const static int TYPE = 21; public: MessageDispatch() ; virtual ~MessageDispatch() ; virtual int getCommandType() ; virtual p getConsumerId() ; virtual void setConsumerId(p consumerId) ; virtual p getDestination() ; virtual void setDestination(p destination) ; virtual p getMessage() ; virtual void setMessage(p message) ; virtual int getRedeliveryCounter() ; virtual void setRedeliveryCounter(int redeliveryCounter) ; } ; /* namespace */ } } } } #endif /*MessageDispatch_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/MessageDispatchNotification.hpp b/openwire-cpp/src/command/MessageDispatchNotification.hpp index 9088d6c07a..ca3e5e547f 100644 --- a/openwire-cpp/src/command/MessageDispatchNotification.hpp +++ b/openwire-cpp/src/command/MessageDispatchNotification.hpp @@ -1,90 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef MessageDispatchNotification_hpp_ -#define MessageDispatchNotification_hpp_ - -#include -#include "command/BaseCommand.hpp" - -#include "command/ConsumerId.hpp" -#include "command/ActiveMQDestination.hpp" -#include "command/MessageId.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * 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 - * - */ -class MessageDispatchNotification : public BaseCommand -{ -private: - p consumerId ; - p destination ; - long long deliverySequenceId ; - p messageId ; - -public: - const static int TYPE = 90; - -public: - MessageDispatchNotification() ; - virtual ~MessageDispatchNotification() ; - - virtual int getCommandType() ; - - virtual p getConsumerId() ; - virtual void setConsumerId(p consumerId) ; - - virtual p getDestination() ; - virtual void setDestination(p destination) ; - - virtual long long getDeliverySequenceId() ; - virtual void setDeliverySequenceId(long long deliverySequenceId) ; - - virtual p getMessageId() ; - virtual void setMessageId(p messageId) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*MessageDispatchNotification_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef MessageDispatchNotification_hpp_ #define MessageDispatchNotification_hpp_ #include #include "command/BaseCommand.hpp" #include "command/ConsumerId.hpp" #include "command/ActiveMQDestination.hpp" #include "command/MessageId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * 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 * */ class MessageDispatchNotification : public BaseCommand { private: p consumerId ; p destination ; long long deliverySequenceId ; p messageId ; public: const static int TYPE = 90; public: MessageDispatchNotification() ; virtual ~MessageDispatchNotification() ; virtual int getCommandType() ; virtual p getConsumerId() ; virtual void setConsumerId(p consumerId) ; virtual p getDestination() ; virtual void setDestination(p destination) ; virtual long long getDeliverySequenceId() ; virtual void setDeliverySequenceId(long long deliverySequenceId) ; virtual p getMessageId() ; virtual void setMessageId(p messageId) ; } ; /* namespace */ } } } } #endif /*MessageDispatchNotification_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/MessageId.hpp b/openwire-cpp/src/command/MessageId.hpp index 1cd50ca909..f5d703532e 100644 --- a/openwire-cpp/src/command/MessageId.hpp +++ b/openwire-cpp/src/command/MessageId.hpp @@ -1,84 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef MessageId_hpp_ -#define MessageId_hpp_ - -#include -#include "command/AbstractCommand.hpp" - -#include "command/ProducerId.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for MessageId - * - * - * 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 - * - */ -class MessageId : public AbstractCommand -{ -private: - p producerId ; - long long producerSequenceId ; - long long brokerSequenceId ; - -public: - const static int TYPE = 110; - -public: - MessageId() ; - virtual ~MessageId() ; - - virtual int getCommandType() ; - - virtual p getProducerId() ; - virtual void setProducerId(p producerId) ; - - virtual long long getProducerSequenceId() ; - virtual void setProducerSequenceId(long long producerSequenceId) ; - - virtual long long getBrokerSequenceId() ; - virtual void setBrokerSequenceId(long long brokerSequenceId) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*MessageId_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef MessageId_hpp_ #define MessageId_hpp_ #include #include "command/AbstractCommand.hpp" #include "command/ProducerId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for MessageId * * * 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 * */ class MessageId : public AbstractCommand { private: p producerId ; long long producerSequenceId ; long long brokerSequenceId ; public: const static int TYPE = 110; public: MessageId() ; virtual ~MessageId() ; virtual int getCommandType() ; virtual p getProducerId() ; virtual void setProducerId(p producerId) ; virtual long long getProducerSequenceId() ; virtual void setProducerSequenceId(long long producerSequenceId) ; virtual long long getBrokerSequenceId() ; virtual void setBrokerSequenceId(long long brokerSequenceId) ; } ; /* namespace */ } } } } #endif /*MessageId_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/NetworkBridgeFilter.cpp b/openwire-cpp/src/command/NetworkBridgeFilter.cpp new file mode 100644 index 0000000000..4625f39121 --- /dev/null +++ b/openwire-cpp/src/command/NetworkBridgeFilter.cpp @@ -0,0 +1 @@ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #include "command/NetworkBridgeFilter.hpp" using namespace apache::activemq::client::command; /* * * Marshalling code for Open Wire Format for NetworkBridgeFilter * * * 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 * */ NetworkBridgeFilter::NetworkBridgeFilter() { this->networkTTL = 0 ; this->networkBrokerId = 0 ; } NetworkBridgeFilter::~NetworkBridgeFilter() { } int NetworkBridgeFilter::getNetworkTTL() { return networkTTL ; } void NetworkBridgeFilter::setNetworkTTL(int networkTTL) { this->networkTTL = networkTTL ; } p NetworkBridgeFilter::getNetworkBrokerId() { return networkBrokerId ; } void NetworkBridgeFilter::setNetworkBrokerId(p networkBrokerId) { this->networkBrokerId = networkBrokerId ; } \ No newline at end of file diff --git a/openwire-cpp/src/command/NetworkBridgeFilter.hpp b/openwire-cpp/src/command/NetworkBridgeFilter.hpp new file mode 100644 index 0000000000..642211d6f7 --- /dev/null +++ b/openwire-cpp/src/command/NetworkBridgeFilter.hpp @@ -0,0 +1 @@ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef NetworkBridgeFilter_hpp_ #define NetworkBridgeFilter_hpp_ #include #include "command/AbstractCommand.hpp" #include "command/BrokerId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for NetworkBridgeFilter * * * 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 * */ class NetworkBridgeFilter : public AbstractCommand { private: int networkTTL ; p networkBrokerId ; public: const static int TYPE = 91; public: NetworkBridgeFilter() ; virtual ~NetworkBridgeFilter() ; virtual int getCommandType() ; virtual int getNetworkTTL() ; virtual void setNetworkTTL(int networkTTL) ; virtual p getNetworkBrokerId() ; virtual void setNetworkBrokerId(p networkBrokerId) ; } ; /* namespace */ } } } } #endif /*NetworkBridgeFilter_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp b/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp index 4384ac2d3b..e2617e561f 100644 --- a/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp +++ b/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp @@ -1,84 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef RemoveSubscriptionInfo_hpp_ -#define RemoveSubscriptionInfo_hpp_ - -#include -#include "command/BaseCommand.hpp" - -#include "command/ConnectionId.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for RemoveSubscriptionInfo - * - * - * 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 - * - */ -class RemoveSubscriptionInfo : public BaseCommand -{ -private: - p connectionId ; - p subcriptionName ; - p clientId ; - -public: - const static int TYPE = 0; - -public: - RemoveSubscriptionInfo() ; - virtual ~RemoveSubscriptionInfo() ; - - virtual int getCommandType() ; - - virtual p getConnectionId() ; - virtual void setConnectionId(p connectionId) ; - - virtual p getSubcriptionName() ; - virtual void setSubcriptionName(p subcriptionName) ; - - virtual p getClientId() ; - virtual void setClientId(p clientId) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*RemoveSubscriptionInfo_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef RemoveSubscriptionInfo_hpp_ #define RemoveSubscriptionInfo_hpp_ #include #include "command/BaseCommand.hpp" #include "command/ConnectionId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for RemoveSubscriptionInfo * * * 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 * */ class RemoveSubscriptionInfo : public BaseCommand { private: p connectionId ; p subcriptionName ; p clientId ; public: const static int TYPE = 0; public: RemoveSubscriptionInfo() ; virtual ~RemoveSubscriptionInfo() ; virtual int getCommandType() ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; virtual p getSubcriptionName() ; virtual void setSubcriptionName(p subcriptionName) ; virtual p getClientId() ; virtual void setClientId(p clientId) ; } ; /* namespace */ } } } } #endif /*RemoveSubscriptionInfo_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/ShutdownInfo.hpp b/openwire-cpp/src/command/ShutdownInfo.hpp index 55feeb5489..87b060a450 100644 --- a/openwire-cpp/src/command/ShutdownInfo.hpp +++ b/openwire-cpp/src/command/ShutdownInfo.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ShutdownInfo_hpp_ -#define ShutdownInfo_hpp_ - -#include -#include "command/BaseCommand.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for ShutdownInfo - * - * - * 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 - * - */ -class ShutdownInfo : public BaseCommand -{ -private: - -public: - const static int TYPE = 11; - -public: - ShutdownInfo() ; - virtual ~ShutdownInfo() ; - - virtual int getCommandType() ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*ShutdownInfo_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ShutdownInfo_hpp_ #define ShutdownInfo_hpp_ #include #include "command/BaseCommand.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for ShutdownInfo * * * 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 * */ class ShutdownInfo : public BaseCommand { private: public: const static int TYPE = 11; public: ShutdownInfo() ; virtual ~ShutdownInfo() ; virtual int getCommandType() ; } ; /* namespace */ } } } } #endif /*ShutdownInfo_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/SubscriptionInfo.hpp b/openwire-cpp/src/command/SubscriptionInfo.hpp index ba095cd52d..5d09d94670 100644 --- a/openwire-cpp/src/command/SubscriptionInfo.hpp +++ b/openwire-cpp/src/command/SubscriptionInfo.hpp @@ -1,88 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef SubscriptionInfo_hpp_ -#define SubscriptionInfo_hpp_ - -#include -#include "command/AbstractCommand.hpp" - -#include "command/ActiveMQDestination.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for SubscriptionInfo - * - * - * 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 - * - */ -class SubscriptionInfo : public AbstractCommand -{ -private: - p clientId ; - p destination ; - p selector ; - p subcriptionName ; - -public: - const static int TYPE = 55; - -public: - SubscriptionInfo() ; - virtual ~SubscriptionInfo() ; - - virtual int getCommandType() ; - - virtual p getClientId() ; - virtual void setClientId(p clientId) ; - - virtual p getDestination() ; - virtual void setDestination(p destination) ; - - virtual p getSelector() ; - virtual void setSelector(p selector) ; - - virtual p getSubcriptionName() ; - virtual void setSubcriptionName(p subcriptionName) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*SubscriptionInfo_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef SubscriptionInfo_hpp_ #define SubscriptionInfo_hpp_ #include #include "command/AbstractCommand.hpp" #include "command/ActiveMQDestination.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for SubscriptionInfo * * * 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 * */ class SubscriptionInfo : public AbstractCommand { private: p clientId ; p destination ; p selector ; p subcriptionName ; public: const static int TYPE = 55; public: SubscriptionInfo() ; virtual ~SubscriptionInfo() ; virtual int getCommandType() ; virtual p getClientId() ; virtual void setClientId(p clientId) ; virtual p getDestination() ; virtual void setDestination(p destination) ; virtual p getSelector() ; virtual void setSelector(p selector) ; virtual p getSubcriptionName() ; virtual void setSubcriptionName(p subcriptionName) ; } ; /* namespace */ } } } } #endif /*SubscriptionInfo_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/TransactionId.hpp b/openwire-cpp/src/command/TransactionId.hpp index 92c9b5ca30..b0b626f0d8 100644 --- a/openwire-cpp/src/command/TransactionId.hpp +++ b/openwire-cpp/src/command/TransactionId.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef TransactionId_hpp_ -#define TransactionId_hpp_ - -#include -#include "command/AbstractCommand.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for TransactionId - * - * - * 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 - * - */ -class TransactionId : public AbstractCommand -{ -private: - -public: - const static int TYPE = 0; - -public: - TransactionId() ; - virtual ~TransactionId() ; - - virtual int getCommandType() ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*TransactionId_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef TransactionId_hpp_ #define TransactionId_hpp_ #include #include "command/AbstractCommand.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for TransactionId * * * 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 * */ class TransactionId : public AbstractCommand { private: public: const static int TYPE = 0; public: TransactionId() ; virtual ~TransactionId() ; virtual int getCommandType() ; } ; /* namespace */ } } } } #endif /*TransactionId_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/TransactionInfo.hpp b/openwire-cpp/src/command/TransactionInfo.hpp index 50a1151a95..c40235b71a 100644 --- a/openwire-cpp/src/command/TransactionInfo.hpp +++ b/openwire-cpp/src/command/TransactionInfo.hpp @@ -1,85 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef TransactionInfo_hpp_ -#define TransactionInfo_hpp_ - -#include -#include "command/BaseCommand.hpp" - -#include "command/ConnectionId.hpp" -#include "command/TransactionId.hpp" - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for TransactionInfo - * - * - * 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 - * - */ -class TransactionInfo : public BaseCommand -{ -private: - p connectionId ; - p transactionId ; - char type ; - -public: - const static int TYPE = 7; - -public: - TransactionInfo() ; - virtual ~TransactionInfo() ; - - virtual int getCommandType() ; - - virtual p getConnectionId() ; - virtual void setConnectionId(p connectionId) ; - - virtual p getTransactionId() ; - virtual void setTransactionId(p transactionId) ; - - virtual char getType() ; - virtual void setType(char type) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*TransactionInfo_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef TransactionInfo_hpp_ #define TransactionInfo_hpp_ #include #include "command/BaseCommand.hpp" #include "command/ConnectionId.hpp" #include "command/TransactionId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for TransactionInfo * * * 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 * */ class TransactionInfo : public BaseCommand { private: p connectionId ; p transactionId ; char type ; public: const static int TYPE = 7; public: TransactionInfo() ; virtual ~TransactionInfo() ; virtual int getCommandType() ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; virtual p getTransactionId() ; virtual void setTransactionId(p transactionId) ; virtual char getType() ; virtual void setType(char type) ; } ; /* namespace */ } } } } #endif /*TransactionInfo_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/WireFormatInfo.cpp b/openwire-cpp/src/command/WireFormatInfo.cpp index db240b2400..5da0f10ef5 100644 --- a/openwire-cpp/src/command/WireFormatInfo.cpp +++ b/openwire-cpp/src/command/WireFormatInfo.cpp @@ -32,11 +32,7 @@ WireFormatInfo::WireFormatInfo() { this->magic = 0 ; this->version = 0 ; - this->cacheEnabled = 0 ; - this->stackTraceEnabled = 0 ; - this->tcpNoDelayEnabled = 0 ; - this->prefixPacketSize = 0 ; - this->tightEncodingEnabled = 0 ; + this->marshalledProperties = 0 ; } WireFormatInfo::~WireFormatInfo() @@ -66,56 +62,12 @@ void WireFormatInfo::setVersion(int version) } -bool WireFormatInfo::getCacheEnabled() +char* WireFormatInfo::getMarshalledProperties() { - return cacheEnabled ; + return marshalledProperties ; } -void WireFormatInfo::setCacheEnabled(bool cacheEnabled) +void WireFormatInfo::setMarshalledProperties(char* marshalledProperties) { - this->cacheEnabled = cacheEnabled ; -} - - -bool WireFormatInfo::getStackTraceEnabled() -{ - return stackTraceEnabled ; -} - -void WireFormatInfo::setStackTraceEnabled(bool stackTraceEnabled) -{ - this->stackTraceEnabled = stackTraceEnabled ; -} - - -bool WireFormatInfo::getTcpNoDelayEnabled() -{ - return tcpNoDelayEnabled ; -} - -void WireFormatInfo::setTcpNoDelayEnabled(bool tcpNoDelayEnabled) -{ - this->tcpNoDelayEnabled = tcpNoDelayEnabled ; -} - - -bool WireFormatInfo::getPrefixPacketSize() -{ - return prefixPacketSize ; -} - -void WireFormatInfo::setPrefixPacketSize(bool prefixPacketSize) -{ - this->prefixPacketSize = prefixPacketSize ; -} - - -bool WireFormatInfo::getTightEncodingEnabled() -{ - return tightEncodingEnabled ; -} - -void WireFormatInfo::setTightEncodingEnabled(bool tightEncodingEnabled) -{ - this->tightEncodingEnabled = tightEncodingEnabled ; + this->marshalledProperties = marshalledProperties ; } diff --git a/openwire-cpp/src/command/WireFormatInfo.hpp b/openwire-cpp/src/command/WireFormatInfo.hpp index b934159419..f7f2454520 100644 --- a/openwire-cpp/src/command/WireFormatInfo.hpp +++ b/openwire-cpp/src/command/WireFormatInfo.hpp @@ -1,99 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef WireFormatInfo_hpp_ -#define WireFormatInfo_hpp_ - -#include -#include "command/AbstractCommand.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for WireFormatInfo - * - * - * 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 - * - */ -class WireFormatInfo : public AbstractCommand -{ -private: - ap magic ; - int version ; - bool cacheEnabled ; - bool stackTraceEnabled ; - bool tcpNoDelayEnabled ; - bool prefixPacketSize ; - bool tightEncodingEnabled ; - -public: - const static int TYPE = 1; - -public: - WireFormatInfo() ; - virtual ~WireFormatInfo() ; - - virtual int getCommandType() ; - - virtual ap getMagic() ; - virtual void setMagic(ap magic) ; - - virtual int getVersion() ; - virtual void setVersion(int version) ; - - virtual bool getCacheEnabled() ; - virtual void setCacheEnabled(bool cacheEnabled) ; - - virtual bool getStackTraceEnabled() ; - virtual void setStackTraceEnabled(bool stackTraceEnabled) ; - - virtual bool getTcpNoDelayEnabled() ; - virtual void setTcpNoDelayEnabled(bool tcpNoDelayEnabled) ; - - virtual bool getPrefixPacketSize() ; - virtual void setPrefixPacketSize(bool prefixPacketSize) ; - - virtual bool getTightEncodingEnabled() ; - virtual void setTightEncodingEnabled(bool tightEncodingEnabled) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*WireFormatInfo_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef WireFormatInfo_hpp_ #define WireFormatInfo_hpp_ #include #include "command/AbstractCommand.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for WireFormatInfo * * * 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 * */ class WireFormatInfo : public AbstractCommand { private: ap magic ; int version ; char* marshalledProperties ; public: const static int TYPE = 1; public: WireFormatInfo() ; virtual ~WireFormatInfo() ; virtual int getCommandType() ; virtual ap getMagic() ; virtual void setMagic(ap magic) ; virtual int getVersion() ; virtual void setVersion(int version) ; virtual char* getMarshalledProperties() ; virtual void setMarshalledProperties(char* marshalledProperties) ; } ; /* namespace */ } } } } #endif /*WireFormatInfo_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/command/XATransactionId.hpp b/openwire-cpp/src/command/XATransactionId.hpp index 7bb01e92be..c19d399c05 100644 --- a/openwire-cpp/src/command/XATransactionId.hpp +++ b/openwire-cpp/src/command/XATransactionId.hpp @@ -1,83 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef XATransactionId_hpp_ -#define XATransactionId_hpp_ - -#include -#include "command/TransactionId.hpp" - - -#include "util/ifr/ap.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace command - { - using namespace ifr; - using namespace std; - using namespace apache::activemq::client; - -/* - * - * Marshalling code for Open Wire Format for XATransactionId - * - * - * 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 - * - */ -class XATransactionId : public TransactionId -{ -private: - int formatId ; - ap globalTransactionId ; - ap branchQualifier ; - -public: - const static int TYPE = 112; - -public: - XATransactionId() ; - virtual ~XATransactionId() ; - - virtual int getCommandType() ; - - virtual int getFormatId() ; - virtual void setFormatId(int formatId) ; - - virtual ap getGlobalTransactionId() ; - virtual void setGlobalTransactionId(ap globalTransactionId) ; - - virtual ap getBranchQualifier() ; - virtual void setBranchQualifier(ap branchQualifier) ; - - -} ; - -/* namespace */ - } - } - } -} - -#endif /*XATransactionId_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef XATransactionId_hpp_ #define XATransactionId_hpp_ #include #include "command/TransactionId.hpp" #include "util/ifr/ap.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace command { using namespace ifr; using namespace std; using namespace apache::activemq::client; /* * * Marshalling code for Open Wire Format for XATransactionId * * * 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 * */ class XATransactionId : public TransactionId { private: int formatId ; ap globalTransactionId ; ap branchQualifier ; public: const static int TYPE = 112; public: XATransactionId() ; virtual ~XATransactionId() ; virtual int getCommandType() ; virtual int getFormatId() ; virtual void setFormatId(int formatId) ; virtual ap getGlobalTransactionId() ; virtual void setGlobalTransactionId(ap globalTransactionId) ; virtual ap getBranchQualifier() ; virtual void setBranchQualifier(ap branchQualifier) ; } ; /* namespace */ } } } } #endif /*XATransactionId_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.hpp index 232af974cc..64e02072f0 100644 --- a/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQBytesMessageMarshaller_hpp_ -#define ActiveMQBytesMessageMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ActiveMQMessageMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQBytesMessageMarshaller : public ActiveMQMessageMarshaller -{ -public: - ActiveMQBytesMessageMarshaller() ; - virtual ~ActiveMQBytesMessageMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQBytesMessageMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQBytesMessageMarshaller_hpp_ #define ActiveMQBytesMessageMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ActiveMQMessageMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQBytesMessageMarshaller : public ActiveMQMessageMarshaller { public: ActiveMQBytesMessageMarshaller() ; virtual ~ActiveMQBytesMessageMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQBytesMessageMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.hpp index 90ed64ab18..9c2d9bcd1a 100644 --- a/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQDestinationMarshaller_hpp_ -#define ActiveMQDestinationMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQDestinationMarshaller : public BaseDataStreamMarshaller -{ -public: - ActiveMQDestinationMarshaller() ; - virtual ~ActiveMQDestinationMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQDestinationMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQDestinationMarshaller_hpp_ #define ActiveMQDestinationMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQDestinationMarshaller : public BaseDataStreamMarshaller { public: ActiveMQDestinationMarshaller() ; virtual ~ActiveMQDestinationMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQDestinationMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.hpp index 67a9fec823..42eba7b372 100644 --- a/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQMapMessageMarshaller_hpp_ -#define ActiveMQMapMessageMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ActiveMQMessageMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQMapMessageMarshaller : public ActiveMQMessageMarshaller -{ -public: - ActiveMQMapMessageMarshaller() ; - virtual ~ActiveMQMapMessageMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQMapMessageMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQMapMessageMarshaller_hpp_ #define ActiveMQMapMessageMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ActiveMQMessageMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQMapMessageMarshaller : public ActiveMQMessageMarshaller { public: ActiveMQMapMessageMarshaller() ; virtual ~ActiveMQMapMessageMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQMapMessageMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.hpp index 225cc1eec0..14822331d5 100644 --- a/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQMessageMarshaller_hpp_ -#define ActiveMQMessageMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/MessageMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQMessageMarshaller : public MessageMarshaller -{ -public: - ActiveMQMessageMarshaller() ; - virtual ~ActiveMQMessageMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQMessageMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQMessageMarshaller_hpp_ #define ActiveMQMessageMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/MessageMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQMessageMarshaller : public MessageMarshaller { public: ActiveMQMessageMarshaller() ; virtual ~ActiveMQMessageMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQMessageMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.hpp index cef531dd72..620d7b303c 100644 --- a/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQObjectMessageMarshaller_hpp_ -#define ActiveMQObjectMessageMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ActiveMQMessageMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQObjectMessageMarshaller : public ActiveMQMessageMarshaller -{ -public: - ActiveMQObjectMessageMarshaller() ; - virtual ~ActiveMQObjectMessageMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQObjectMessageMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQObjectMessageMarshaller_hpp_ #define ActiveMQObjectMessageMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ActiveMQMessageMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQObjectMessageMarshaller : public ActiveMQMessageMarshaller { public: ActiveMQObjectMessageMarshaller() ; virtual ~ActiveMQObjectMessageMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQObjectMessageMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.hpp index 224493dc85..b5928ea780 100644 --- a/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQQueueMarshaller_hpp_ -#define ActiveMQQueueMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ActiveMQDestinationMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQQueueMarshaller : public ActiveMQDestinationMarshaller -{ -public: - ActiveMQQueueMarshaller() ; - virtual ~ActiveMQQueueMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQQueueMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQQueueMarshaller_hpp_ #define ActiveMQQueueMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ActiveMQDestinationMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQQueueMarshaller : public ActiveMQDestinationMarshaller { public: ActiveMQQueueMarshaller() ; virtual ~ActiveMQQueueMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQQueueMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.hpp index f9ccccbeba..1798611c48 100644 --- a/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQStreamMessageMarshaller_hpp_ -#define ActiveMQStreamMessageMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ActiveMQMessageMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQStreamMessageMarshaller : public ActiveMQMessageMarshaller -{ -public: - ActiveMQStreamMessageMarshaller() ; - virtual ~ActiveMQStreamMessageMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQStreamMessageMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQStreamMessageMarshaller_hpp_ #define ActiveMQStreamMessageMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ActiveMQMessageMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQStreamMessageMarshaller : public ActiveMQMessageMarshaller { public: ActiveMQStreamMessageMarshaller() ; virtual ~ActiveMQStreamMessageMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQStreamMessageMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.hpp index 13aa4eede7..37b6ff0f65 100644 --- a/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQTempDestinationMarshaller_hpp_ -#define ActiveMQTempDestinationMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ActiveMQDestinationMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQTempDestinationMarshaller : public ActiveMQDestinationMarshaller -{ -public: - ActiveMQTempDestinationMarshaller() ; - virtual ~ActiveMQTempDestinationMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQTempDestinationMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQTempDestinationMarshaller_hpp_ #define ActiveMQTempDestinationMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ActiveMQDestinationMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQTempDestinationMarshaller : public ActiveMQDestinationMarshaller { public: ActiveMQTempDestinationMarshaller() ; virtual ~ActiveMQTempDestinationMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQTempDestinationMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.hpp index d2cd915a1e..522b31b949 100644 --- a/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQTempQueueMarshaller_hpp_ -#define ActiveMQTempQueueMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ActiveMQTempDestinationMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQTempQueueMarshaller : public ActiveMQTempDestinationMarshaller -{ -public: - ActiveMQTempQueueMarshaller() ; - virtual ~ActiveMQTempQueueMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQTempQueueMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQTempQueueMarshaller_hpp_ #define ActiveMQTempQueueMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ActiveMQTempDestinationMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQTempQueueMarshaller : public ActiveMQTempDestinationMarshaller { public: ActiveMQTempQueueMarshaller() ; virtual ~ActiveMQTempQueueMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQTempQueueMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQTempTopicMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQTempTopicMarshaller.hpp index df7a581f55..303b3877b1 100644 --- a/openwire-cpp/src/marshal/ActiveMQTempTopicMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQTempTopicMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQTempTopicMarshaller_hpp_ -#define ActiveMQTempTopicMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ActiveMQTempDestinationMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQTempTopicMarshaller : public ActiveMQTempDestinationMarshaller -{ -public: - ActiveMQTempTopicMarshaller() ; - virtual ~ActiveMQTempTopicMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQTempTopicMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQTempTopicMarshaller_hpp_ #define ActiveMQTempTopicMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ActiveMQTempDestinationMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQTempTopicMarshaller : public ActiveMQTempDestinationMarshaller { public: ActiveMQTempTopicMarshaller() ; virtual ~ActiveMQTempTopicMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQTempTopicMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQTextMessageMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQTextMessageMarshaller.hpp index c4f2a310d5..18c5d09f73 100644 --- a/openwire-cpp/src/marshal/ActiveMQTextMessageMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQTextMessageMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQTextMessageMarshaller_hpp_ -#define ActiveMQTextMessageMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ActiveMQMessageMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQTextMessageMarshaller : public ActiveMQMessageMarshaller -{ -public: - ActiveMQTextMessageMarshaller() ; - virtual ~ActiveMQTextMessageMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQTextMessageMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQTextMessageMarshaller_hpp_ #define ActiveMQTextMessageMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ActiveMQMessageMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQTextMessageMarshaller : public ActiveMQMessageMarshaller { public: ActiveMQTextMessageMarshaller() ; virtual ~ActiveMQTextMessageMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQTextMessageMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ActiveMQTopicMarshaller.hpp b/openwire-cpp/src/marshal/ActiveMQTopicMarshaller.hpp index ed3f4fd9fb..5405257798 100644 --- a/openwire-cpp/src/marshal/ActiveMQTopicMarshaller.hpp +++ b/openwire-cpp/src/marshal/ActiveMQTopicMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ActiveMQTopicMarshaller_hpp_ -#define ActiveMQTopicMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ActiveMQDestinationMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ActiveMQTopicMarshaller : public ActiveMQDestinationMarshaller -{ -public: - ActiveMQTopicMarshaller() ; - virtual ~ActiveMQTopicMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ActiveMQTopicMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ActiveMQTopicMarshaller_hpp_ #define ActiveMQTopicMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ActiveMQDestinationMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ActiveMQTopicMarshaller : public ActiveMQDestinationMarshaller { public: ActiveMQTopicMarshaller() ; virtual ~ActiveMQTopicMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ActiveMQTopicMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/BaseCommandMarshaller.hpp b/openwire-cpp/src/marshal/BaseCommandMarshaller.hpp index d58ac09f25..d799c65224 100644 --- a/openwire-cpp/src/marshal/BaseCommandMarshaller.hpp +++ b/openwire-cpp/src/marshal/BaseCommandMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef BaseCommandMarshaller_hpp_ -#define BaseCommandMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class BaseCommandMarshaller : public BaseDataStreamMarshaller -{ -public: - BaseCommandMarshaller() ; - virtual ~BaseCommandMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*BaseCommandMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef BaseCommandMarshaller_hpp_ #define BaseCommandMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class BaseCommandMarshaller : public BaseDataStreamMarshaller { public: BaseCommandMarshaller() ; virtual ~BaseCommandMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*BaseCommandMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/BrokerInfoMarshaller.cpp b/openwire-cpp/src/marshal/BrokerInfoMarshaller.cpp index 06dbdfca0b..99a6beb1bd 100755 --- a/openwire-cpp/src/marshal/BrokerInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/BrokerInfoMarshaller.cpp @@ -56,14 +56,14 @@ void BrokerInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, Binar base.unmarshal(wireFormat, o, dataIn, bs); BrokerInfo& info = (BrokerInfo&) o; - info.setBrokerId((BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setBrokerURL(tightUnmarshalString(dataIn, bs)); if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerInfo value[] = new BrokerInfo[size]; + org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerInfo) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerInfo) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setPeerBrokerInfos(value); } diff --git a/openwire-cpp/src/marshal/ConnectionErrorMarshaller.cpp b/openwire-cpp/src/marshal/ConnectionErrorMarshaller.cpp index 5fe3716d0d..d0b95e1b29 100644 --- a/openwire-cpp/src/marshal/ConnectionErrorMarshaller.cpp +++ b/openwire-cpp/src/marshal/ConnectionErrorMarshaller.cpp @@ -56,8 +56,8 @@ void ConnectionErrorMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, base.unmarshal(wireFormat, o, dataIn, bs); ConnectionError& info = (ConnectionError&) o; - info.setException((Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs)); - info.setConnectionId((ConnectionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setException((java.lang.Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } diff --git a/openwire-cpp/src/marshal/ConnectionErrorMarshaller.hpp b/openwire-cpp/src/marshal/ConnectionErrorMarshaller.hpp index 40592ae442..8ad21efdcc 100644 --- a/openwire-cpp/src/marshal/ConnectionErrorMarshaller.hpp +++ b/openwire-cpp/src/marshal/ConnectionErrorMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ConnectionErrorMarshaller_hpp_ -#define ConnectionErrorMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ConnectionErrorMarshaller : public BaseCommandMarshaller -{ -public: - ConnectionErrorMarshaller() ; - virtual ~ConnectionErrorMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ConnectionErrorMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ConnectionErrorMarshaller_hpp_ #define ConnectionErrorMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ConnectionErrorMarshaller : public BaseCommandMarshaller { public: ConnectionErrorMarshaller() ; virtual ~ConnectionErrorMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ConnectionErrorMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ConnectionIdMarshaller.hpp b/openwire-cpp/src/marshal/ConnectionIdMarshaller.hpp index ced31fefe4..2df55e2082 100644 --- a/openwire-cpp/src/marshal/ConnectionIdMarshaller.hpp +++ b/openwire-cpp/src/marshal/ConnectionIdMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ConnectionIdMarshaller_hpp_ -#define ConnectionIdMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ConnectionIdMarshaller : public BaseDataStreamMarshaller -{ -public: - ConnectionIdMarshaller() ; - virtual ~ConnectionIdMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ConnectionIdMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ConnectionIdMarshaller_hpp_ #define ConnectionIdMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ConnectionIdMarshaller : public BaseDataStreamMarshaller { public: ConnectionIdMarshaller() ; virtual ~ConnectionIdMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ConnectionIdMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ConnectionInfoMarshaller.cpp b/openwire-cpp/src/marshal/ConnectionInfoMarshaller.cpp index 75b01e3947..7cd3050bb7 100644 --- a/openwire-cpp/src/marshal/ConnectionInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/ConnectionInfoMarshaller.cpp @@ -56,16 +56,16 @@ void ConnectionInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, B base.unmarshal(wireFormat, o, dataIn, bs); ConnectionInfo& info = (ConnectionInfo&) o; - info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setClientId(tightUnmarshalString(dataIn, bs)); info.setPassword(tightUnmarshalString(dataIn, bs)); info.setUserName(tightUnmarshalString(dataIn, bs)); if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } diff --git a/openwire-cpp/src/marshal/ConnectionInfoMarshaller.hpp b/openwire-cpp/src/marshal/ConnectionInfoMarshaller.hpp index a117e9869a..91386afd40 100644 --- a/openwire-cpp/src/marshal/ConnectionInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/ConnectionInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ConnectionInfoMarshaller_hpp_ -#define ConnectionInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ConnectionInfoMarshaller : public BaseCommandMarshaller -{ -public: - ConnectionInfoMarshaller() ; - virtual ~ConnectionInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ConnectionInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ConnectionInfoMarshaller_hpp_ #define ConnectionInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ConnectionInfoMarshaller : public BaseCommandMarshaller { public: ConnectionInfoMarshaller() ; virtual ~ConnectionInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ConnectionInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ConsumerIdMarshaller.hpp b/openwire-cpp/src/marshal/ConsumerIdMarshaller.hpp index 05d0dbabd3..974006de29 100644 --- a/openwire-cpp/src/marshal/ConsumerIdMarshaller.hpp +++ b/openwire-cpp/src/marshal/ConsumerIdMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ConsumerIdMarshaller_hpp_ -#define ConsumerIdMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ConsumerIdMarshaller : public BaseDataStreamMarshaller -{ -public: - ConsumerIdMarshaller() ; - virtual ~ConsumerIdMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ConsumerIdMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ConsumerIdMarshaller_hpp_ #define ConsumerIdMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ConsumerIdMarshaller : public BaseDataStreamMarshaller { public: ConsumerIdMarshaller() ; virtual ~ConsumerIdMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ConsumerIdMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ConsumerInfoMarshaller.cpp b/openwire-cpp/src/marshal/ConsumerInfoMarshaller.cpp index c695b8c448..98f5eb8d8d 100644 --- a/openwire-cpp/src/marshal/ConsumerInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/ConsumerInfoMarshaller.cpp @@ -56,9 +56,9 @@ void ConsumerInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, Bin base.unmarshal(wireFormat, o, dataIn, bs); ConsumerInfo& info = (ConsumerInfo&) o; - info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setBrowser(bs.readBoolean()); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setPrefetchSize(dataIn.readInt()); info.setMaximumPendingMessageLimit(dataIn.readInt()); info.setDispatchAsync(bs.readBoolean()); @@ -71,15 +71,16 @@ void ConsumerInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, Bin if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } else { info.setBrokerPath(null); } + info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setNetworkSubscription(bs.readBoolean()); } @@ -102,6 +103,7 @@ int ConsumerInfoMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, Bool bs.writeBoolean(info.isExclusive()); bs.writeBoolean(info.isRetroactive()); rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs); + rc += marshal1NestedObject(wireFormat, info.getAdditionalPredicate(), bs); bs.writeBoolean(info.isNetworkSubscription()); return rc + 3; @@ -127,6 +129,7 @@ void ConsumerInfoMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, Bin bs.readBoolean(); DataStreamMarshaller.writeByte(info.getPriority(), dataOut); marshalObjectArray(wireFormat, info.getBrokerPath(), dataOut, bs); + marshal2NestedObject(wireFormat, info.getAdditionalPredicate(), dataOut, bs); bs.readBoolean(); } diff --git a/openwire-cpp/src/marshal/ConsumerInfoMarshaller.hpp b/openwire-cpp/src/marshal/ConsumerInfoMarshaller.hpp index 20c65633be..d480b9fe2a 100644 --- a/openwire-cpp/src/marshal/ConsumerInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/ConsumerInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ConsumerInfoMarshaller_hpp_ -#define ConsumerInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ConsumerInfoMarshaller : public BaseCommandMarshaller -{ -public: - ConsumerInfoMarshaller() ; - virtual ~ConsumerInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ConsumerInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ConsumerInfoMarshaller_hpp_ #define ConsumerInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ConsumerInfoMarshaller : public BaseCommandMarshaller { public: ConsumerInfoMarshaller() ; virtual ~ConsumerInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ConsumerInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ControlCommandMarshaller.hpp b/openwire-cpp/src/marshal/ControlCommandMarshaller.hpp index fb1a1bb5da..5883b941aa 100644 --- a/openwire-cpp/src/marshal/ControlCommandMarshaller.hpp +++ b/openwire-cpp/src/marshal/ControlCommandMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ControlCommandMarshaller_hpp_ -#define ControlCommandMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ControlCommandMarshaller : public BaseCommandMarshaller -{ -public: - ControlCommandMarshaller() ; - virtual ~ControlCommandMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ControlCommandMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ControlCommandMarshaller_hpp_ #define ControlCommandMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ControlCommandMarshaller : public BaseCommandMarshaller { public: ControlCommandMarshaller() ; virtual ~ControlCommandMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ControlCommandMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/DataArrayResponseMarshaller.cpp b/openwire-cpp/src/marshal/DataArrayResponseMarshaller.cpp index 0183cadfb0..0cf4aab609 100644 --- a/openwire-cpp/src/marshal/DataArrayResponseMarshaller.cpp +++ b/openwire-cpp/src/marshal/DataArrayResponseMarshaller.cpp @@ -59,9 +59,9 @@ void DataArrayResponseMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o if (bs.readBoolean()) { short size = dataIn.readShort(); - DataStructure value[] = new DataStructure[size]; + org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size]; for( int i=0; i < size; i++ ) { - value[i] = (DataStructure) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setData(value); } diff --git a/openwire-cpp/src/marshal/DataArrayResponseMarshaller.hpp b/openwire-cpp/src/marshal/DataArrayResponseMarshaller.hpp index a3186b64a6..7f063ed5da 100644 --- a/openwire-cpp/src/marshal/DataArrayResponseMarshaller.hpp +++ b/openwire-cpp/src/marshal/DataArrayResponseMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef DataArrayResponseMarshaller_hpp_ -#define DataArrayResponseMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ResponseMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class DataArrayResponseMarshaller : public ResponseMarshaller -{ -public: - DataArrayResponseMarshaller() ; - virtual ~DataArrayResponseMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*DataArrayResponseMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef DataArrayResponseMarshaller_hpp_ #define DataArrayResponseMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ResponseMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class DataArrayResponseMarshaller : public ResponseMarshaller { public: DataArrayResponseMarshaller() ; virtual ~DataArrayResponseMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*DataArrayResponseMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/DataResponseMarshaller.cpp b/openwire-cpp/src/marshal/DataResponseMarshaller.cpp index c231c26732..1a27221de1 100644 --- a/openwire-cpp/src/marshal/DataResponseMarshaller.cpp +++ b/openwire-cpp/src/marshal/DataResponseMarshaller.cpp @@ -56,7 +56,7 @@ void DataResponseMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, Bin base.unmarshal(wireFormat, o, dataIn, bs); DataResponse& info = (DataResponse&) o; - info.setData((DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setData((org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } diff --git a/openwire-cpp/src/marshal/DataResponseMarshaller.hpp b/openwire-cpp/src/marshal/DataResponseMarshaller.hpp index 022fe7e247..eba5c3d53d 100644 --- a/openwire-cpp/src/marshal/DataResponseMarshaller.hpp +++ b/openwire-cpp/src/marshal/DataResponseMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef DataResponseMarshaller_hpp_ -#define DataResponseMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ResponseMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class DataResponseMarshaller : public ResponseMarshaller -{ -public: - DataResponseMarshaller() ; - virtual ~DataResponseMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*DataResponseMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef DataResponseMarshaller_hpp_ #define DataResponseMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ResponseMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class DataResponseMarshaller : public ResponseMarshaller { public: DataResponseMarshaller() ; virtual ~DataResponseMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*DataResponseMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/DestinationInfoMarshaller.cpp b/openwire-cpp/src/marshal/DestinationInfoMarshaller.cpp index 259cb72876..2fc3df6d99 100644 --- a/openwire-cpp/src/marshal/DestinationInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/DestinationInfoMarshaller.cpp @@ -56,16 +56,16 @@ void DestinationInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, base.unmarshal(wireFormat, o, dataIn, bs); DestinationInfo& info = (DestinationInfo&) o; - info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setOperationType(dataIn.readByte()); info.setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs)); if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } diff --git a/openwire-cpp/src/marshal/DestinationInfoMarshaller.hpp b/openwire-cpp/src/marshal/DestinationInfoMarshaller.hpp index 2c67ab93f5..f4ed1a0498 100644 --- a/openwire-cpp/src/marshal/DestinationInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/DestinationInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef DestinationInfoMarshaller_hpp_ -#define DestinationInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class DestinationInfoMarshaller : public BaseCommandMarshaller -{ -public: - DestinationInfoMarshaller() ; - virtual ~DestinationInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*DestinationInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef DestinationInfoMarshaller_hpp_ #define DestinationInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class DestinationInfoMarshaller : public BaseCommandMarshaller { public: DestinationInfoMarshaller() ; virtual ~DestinationInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*DestinationInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/DiscoveryEventMarshaller.hpp b/openwire-cpp/src/marshal/DiscoveryEventMarshaller.hpp index fbfb4afb46..6da546e86e 100644 --- a/openwire-cpp/src/marshal/DiscoveryEventMarshaller.hpp +++ b/openwire-cpp/src/marshal/DiscoveryEventMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef DiscoveryEventMarshaller_hpp_ -#define DiscoveryEventMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class DiscoveryEventMarshaller : public BaseDataStreamMarshaller -{ -public: - DiscoveryEventMarshaller() ; - virtual ~DiscoveryEventMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*DiscoveryEventMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef DiscoveryEventMarshaller_hpp_ #define DiscoveryEventMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class DiscoveryEventMarshaller : public BaseDataStreamMarshaller { public: DiscoveryEventMarshaller() ; virtual ~DiscoveryEventMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*DiscoveryEventMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ExceptionResponseMarshaller.cpp b/openwire-cpp/src/marshal/ExceptionResponseMarshaller.cpp index 7466ccdc65..01c9f8cca1 100644 --- a/openwire-cpp/src/marshal/ExceptionResponseMarshaller.cpp +++ b/openwire-cpp/src/marshal/ExceptionResponseMarshaller.cpp @@ -56,7 +56,7 @@ void ExceptionResponseMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o base.unmarshal(wireFormat, o, dataIn, bs); ExceptionResponse& info = (ExceptionResponse&) o; - info.setException((Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs)); + info.setException((java.lang.Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs)); } diff --git a/openwire-cpp/src/marshal/ExceptionResponseMarshaller.hpp b/openwire-cpp/src/marshal/ExceptionResponseMarshaller.hpp index 539d884259..2dd04948d7 100644 --- a/openwire-cpp/src/marshal/ExceptionResponseMarshaller.hpp +++ b/openwire-cpp/src/marshal/ExceptionResponseMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ExceptionResponseMarshaller_hpp_ -#define ExceptionResponseMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ResponseMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ExceptionResponseMarshaller : public ResponseMarshaller -{ -public: - ExceptionResponseMarshaller() ; - virtual ~ExceptionResponseMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ExceptionResponseMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ExceptionResponseMarshaller_hpp_ #define ExceptionResponseMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ResponseMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ExceptionResponseMarshaller : public ResponseMarshaller { public: ExceptionResponseMarshaller() ; virtual ~ExceptionResponseMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ExceptionResponseMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/FlushCommandMarshaller.hpp b/openwire-cpp/src/marshal/FlushCommandMarshaller.hpp index feabba7d0f..016b05112e 100644 --- a/openwire-cpp/src/marshal/FlushCommandMarshaller.hpp +++ b/openwire-cpp/src/marshal/FlushCommandMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef FlushCommandMarshaller_hpp_ -#define FlushCommandMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class FlushCommandMarshaller : public BaseCommandMarshaller -{ -public: - FlushCommandMarshaller() ; - virtual ~FlushCommandMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*FlushCommandMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef FlushCommandMarshaller_hpp_ #define FlushCommandMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class FlushCommandMarshaller : public BaseCommandMarshaller { public: FlushCommandMarshaller() ; virtual ~FlushCommandMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*FlushCommandMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/IntegerResponseMarshaller.hpp b/openwire-cpp/src/marshal/IntegerResponseMarshaller.hpp index b55111e383..6aeb8602fc 100644 --- a/openwire-cpp/src/marshal/IntegerResponseMarshaller.hpp +++ b/openwire-cpp/src/marshal/IntegerResponseMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef IntegerResponseMarshaller_hpp_ -#define IntegerResponseMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/ResponseMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class IntegerResponseMarshaller : public ResponseMarshaller -{ -public: - IntegerResponseMarshaller() ; - virtual ~IntegerResponseMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*IntegerResponseMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef IntegerResponseMarshaller_hpp_ #define IntegerResponseMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/ResponseMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class IntegerResponseMarshaller : public ResponseMarshaller { public: IntegerResponseMarshaller() ; virtual ~IntegerResponseMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*IntegerResponseMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/JournalQueueAckMarshaller.cpp b/openwire-cpp/src/marshal/JournalQueueAckMarshaller.cpp index bb6d6e9734..b575c3a50f 100644 --- a/openwire-cpp/src/marshal/JournalQueueAckMarshaller.cpp +++ b/openwire-cpp/src/marshal/JournalQueueAckMarshaller.cpp @@ -56,8 +56,8 @@ void JournalQueueAckMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, base.unmarshal(wireFormat, o, dataIn, bs); JournalQueueAck& info = (JournalQueueAck&) o; - info.setDestination((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setMessageAck((MessageAck) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageAck((org.apache.activemq.command.MessageAck) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } diff --git a/openwire-cpp/src/marshal/JournalQueueAckMarshaller.hpp b/openwire-cpp/src/marshal/JournalQueueAckMarshaller.hpp index 2292773783..05e0691ce5 100644 --- a/openwire-cpp/src/marshal/JournalQueueAckMarshaller.hpp +++ b/openwire-cpp/src/marshal/JournalQueueAckMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef JournalQueueAckMarshaller_hpp_ -#define JournalQueueAckMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class JournalQueueAckMarshaller : public BaseDataStreamMarshaller -{ -public: - JournalQueueAckMarshaller() ; - virtual ~JournalQueueAckMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*JournalQueueAckMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef JournalQueueAckMarshaller_hpp_ #define JournalQueueAckMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class JournalQueueAckMarshaller : public BaseDataStreamMarshaller { public: JournalQueueAckMarshaller() ; virtual ~JournalQueueAckMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*JournalQueueAckMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/JournalTopicAckMarshaller.cpp b/openwire-cpp/src/marshal/JournalTopicAckMarshaller.cpp index 64f0f83103..f7b8814e07 100644 --- a/openwire-cpp/src/marshal/JournalTopicAckMarshaller.cpp +++ b/openwire-cpp/src/marshal/JournalTopicAckMarshaller.cpp @@ -56,12 +56,12 @@ void JournalTopicAckMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, base.unmarshal(wireFormat, o, dataIn, bs); JournalTopicAck& info = (JournalTopicAck&) o; - info.setDestination((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setSubscritionName(tightUnmarshalString(dataIn, bs)); info.setClientId(tightUnmarshalString(dataIn, bs)); - info.setTransactionId((TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } diff --git a/openwire-cpp/src/marshal/JournalTopicAckMarshaller.hpp b/openwire-cpp/src/marshal/JournalTopicAckMarshaller.hpp index 077afb68fd..11c246a3d0 100644 --- a/openwire-cpp/src/marshal/JournalTopicAckMarshaller.hpp +++ b/openwire-cpp/src/marshal/JournalTopicAckMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef JournalTopicAckMarshaller_hpp_ -#define JournalTopicAckMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class JournalTopicAckMarshaller : public BaseDataStreamMarshaller -{ -public: - JournalTopicAckMarshaller() ; - virtual ~JournalTopicAckMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*JournalTopicAckMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef JournalTopicAckMarshaller_hpp_ #define JournalTopicAckMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class JournalTopicAckMarshaller : public BaseDataStreamMarshaller { public: JournalTopicAckMarshaller() ; virtual ~JournalTopicAckMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*JournalTopicAckMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/JournalTraceMarshaller.hpp b/openwire-cpp/src/marshal/JournalTraceMarshaller.hpp index 69c8daba86..8816602051 100644 --- a/openwire-cpp/src/marshal/JournalTraceMarshaller.hpp +++ b/openwire-cpp/src/marshal/JournalTraceMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef JournalTraceMarshaller_hpp_ -#define JournalTraceMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class JournalTraceMarshaller : public BaseDataStreamMarshaller -{ -public: - JournalTraceMarshaller() ; - virtual ~JournalTraceMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*JournalTraceMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef JournalTraceMarshaller_hpp_ #define JournalTraceMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class JournalTraceMarshaller : public BaseDataStreamMarshaller { public: JournalTraceMarshaller() ; virtual ~JournalTraceMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*JournalTraceMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/JournalTransactionMarshaller.cpp b/openwire-cpp/src/marshal/JournalTransactionMarshaller.cpp index 46058709ff..22c08c528a 100644 --- a/openwire-cpp/src/marshal/JournalTransactionMarshaller.cpp +++ b/openwire-cpp/src/marshal/JournalTransactionMarshaller.cpp @@ -56,7 +56,7 @@ void JournalTransactionMarshaller::unmarshal(OpenWireFormat& wireFormat, Object base.unmarshal(wireFormat, o, dataIn, bs); JournalTransaction& info = (JournalTransaction&) o; - info.setTransactionId((TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setType(dataIn.readByte()); info.setWasPrepared(bs.readBoolean()); diff --git a/openwire-cpp/src/marshal/JournalTransactionMarshaller.hpp b/openwire-cpp/src/marshal/JournalTransactionMarshaller.hpp index 76ab02806f..b06523c39e 100644 --- a/openwire-cpp/src/marshal/JournalTransactionMarshaller.hpp +++ b/openwire-cpp/src/marshal/JournalTransactionMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef JournalTransactionMarshaller_hpp_ -#define JournalTransactionMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class JournalTransactionMarshaller : public BaseDataStreamMarshaller -{ -public: - JournalTransactionMarshaller() ; - virtual ~JournalTransactionMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*JournalTransactionMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef JournalTransactionMarshaller_hpp_ #define JournalTransactionMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class JournalTransactionMarshaller : public BaseDataStreamMarshaller { public: JournalTransactionMarshaller() ; virtual ~JournalTransactionMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*JournalTransactionMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.hpp b/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.hpp index fd16c12b25..6af37b0236 100644 --- a/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/KeepAliveInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef KeepAliveInfoMarshaller_hpp_ -#define KeepAliveInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class KeepAliveInfoMarshaller : public BaseDataStreamMarshaller -{ -public: - KeepAliveInfoMarshaller() ; - virtual ~KeepAliveInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*KeepAliveInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef KeepAliveInfoMarshaller_hpp_ #define KeepAliveInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class KeepAliveInfoMarshaller : public BaseDataStreamMarshaller { public: KeepAliveInfoMarshaller() ; virtual ~KeepAliveInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*KeepAliveInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.cpp b/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.cpp index f2d2d1c00a..355a0d5c1b 100644 --- a/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.cpp +++ b/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.cpp @@ -57,7 +57,7 @@ void LocalTransactionIdMarshaller::unmarshal(OpenWireFormat& wireFormat, Object LocalTransactionId& info = (LocalTransactionId&) o; info.setValue(tightUnmarshalLong(wireFormat, dataIn, bs)); - info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } diff --git a/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.hpp b/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.hpp index 21d04d82ab..ba64514d0b 100644 --- a/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.hpp +++ b/openwire-cpp/src/marshal/LocalTransactionIdMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef LocalTransactionIdMarshaller_hpp_ -#define LocalTransactionIdMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/TransactionIdMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class LocalTransactionIdMarshaller : public TransactionIdMarshaller -{ -public: - LocalTransactionIdMarshaller() ; - virtual ~LocalTransactionIdMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*LocalTransactionIdMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef LocalTransactionIdMarshaller_hpp_ #define LocalTransactionIdMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/TransactionIdMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class LocalTransactionIdMarshaller : public TransactionIdMarshaller { public: LocalTransactionIdMarshaller() ; virtual ~LocalTransactionIdMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*LocalTransactionIdMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/MarshallerFactory.cpp b/openwire-cpp/src/marshal/MarshallerFactory.cpp index 0fe34e2250..11628539ec 100644 --- a/openwire-cpp/src/marshal/MarshallerFactory.cpp +++ b/openwire-cpp/src/marshal/MarshallerFactory.cpp @@ -25,52 +25,53 @@ #include "marshal/ExceptionResponseMarshaller.hpp" -#include "marshal/MessageIdMarshaller.hpp" -#include "marshal/BrokerInfoMarshaller.hpp" -#include "marshal/ActiveMQTempQueueMarshaller.hpp" #include "marshal/LocalTransactionIdMarshaller.hpp" -#include "marshal/RemoveSubscriptionInfoMarshaller.hpp" #include "marshal/IntegerResponseMarshaller.hpp" #include "marshal/ActiveMQQueueMarshaller.hpp" -#include "marshal/DestinationInfoMarshaller.hpp" -#include "marshal/ActiveMQBytesMessageMarshaller.hpp" -#include "marshal/ShutdownInfoMarshaller.hpp" -#include "marshal/DataResponseMarshaller.hpp" -#include "marshal/SessionIdMarshaller.hpp" -#include "marshal/DataArrayResponseMarshaller.hpp" -#include "marshal/JournalQueueAckMarshaller.hpp" -#include "marshal/WireFormatInfoMarshaller.hpp" -#include "marshal/ResponseMarshaller.hpp" -#include "marshal/ConnectionErrorMarshaller.hpp" #include "marshal/ActiveMQObjectMessageMarshaller.hpp" -#include "marshal/ConsumerInfoMarshaller.hpp" -#include "marshal/ActiveMQTempTopicMarshaller.hpp" #include "marshal/ConnectionIdMarshaller.hpp" -#include "marshal/DiscoveryEventMarshaller.hpp" #include "marshal/ConnectionInfoMarshaller.hpp" -#include "marshal/KeepAliveInfoMarshaller.hpp" -#include "marshal/XATransactionIdMarshaller.hpp" -#include "marshal/JournalTraceMarshaller.hpp" -#include "marshal/FlushCommandMarshaller.hpp" -#include "marshal/ConsumerIdMarshaller.hpp" -#include "marshal/JournalTopicAckMarshaller.hpp" -#include "marshal/ActiveMQTextMessageMarshaller.hpp" -#include "marshal/BrokerIdMarshaller.hpp" -#include "marshal/MessageDispatchMarshaller.hpp" #include "marshal/ProducerInfoMarshaller.hpp" -#include "marshal/SubscriptionInfoMarshaller.hpp" -#include "marshal/ActiveMQMapMessageMarshaller.hpp" #include "marshal/MessageDispatchNotificationMarshaller.hpp" #include "marshal/SessionInfoMarshaller.hpp" -#include "marshal/ActiveMQMessageMarshaller.hpp" #include "marshal/TransactionInfoMarshaller.hpp" #include "marshal/ActiveMQStreamMessageMarshaller.hpp" #include "marshal/MessageAckMarshaller.hpp" #include "marshal/ProducerIdMarshaller.hpp" -#include "marshal/ActiveMQTopicMarshaller.hpp" +#include "marshal/MessageIdMarshaller.hpp" +#include "marshal/ActiveMQTempQueueMarshaller.hpp" +#include "marshal/RemoveSubscriptionInfoMarshaller.hpp" +#include "marshal/SessionIdMarshaller.hpp" +#include "marshal/DataArrayResponseMarshaller.hpp" +#include "marshal/JournalQueueAckMarshaller.hpp" +#include "marshal/ResponseMarshaller.hpp" +#include "marshal/ConnectionErrorMarshaller.hpp" +#include "marshal/ConsumerInfoMarshaller.hpp" +#include "marshal/XATransactionIdMarshaller.hpp" +#include "marshal/JournalTraceMarshaller.hpp" +#include "marshal/ConsumerIdMarshaller.hpp" +#include "marshal/ActiveMQTextMessageMarshaller.hpp" +#include "marshal/SubscriptionInfoMarshaller.hpp" #include "marshal/JournalTransactionMarshaller.hpp" -#include "marshal/RemoveInfoMarshaller.hpp" #include "marshal/ControlCommandMarshaller.hpp" +#include "marshal/NetworkBridgeFilterMarshaller.hpp" +#include "marshal/ActiveMQBytesMessageMarshaller.hpp" +#include "marshal/WireFormatInfoMarshaller.hpp" +#include "marshal/ActiveMQTempTopicMarshaller.hpp" +#include "marshal/DiscoveryEventMarshaller.hpp" +#include "marshal/ActiveMQTopicMarshaller.hpp" +#include "marshal/BrokerInfoMarshaller.hpp" +#include "marshal/DestinationInfoMarshaller.hpp" +#include "marshal/ShutdownInfoMarshaller.hpp" +#include "marshal/DataResponseMarshaller.hpp" +#include "marshal/KeepAliveInfoMarshaller.hpp" +#include "marshal/FlushCommandMarshaller.hpp" +#include "marshal/JournalTopicAckMarshaller.hpp" +#include "marshal/BrokerIdMarshaller.hpp" +#include "marshal/MessageDispatchMarshaller.hpp" +#include "marshal/ActiveMQMapMessageMarshaller.hpp" +#include "marshal/ActiveMQMessageMarshaller.hpp" +#include "marshal/RemoveInfoMarshaller.hpp" #include "marshal/ExceptionResponseMarshaller.hpp" @@ -80,51 +81,52 @@ using namespace apache::activemq::client::marshal; void MarshallerFactory::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 MessageIdMarshaller()); + format.addMarshaller(new ActiveMQTempQueueMarshaller()); + format.addMarshaller(new RemoveSubscriptionInfoMarshaller()); + format.addMarshaller(new SessionIdMarshaller()); + format.addMarshaller(new DataArrayResponseMarshaller()); + format.addMarshaller(new JournalQueueAckMarshaller()); + format.addMarshaller(new ResponseMarshaller()); + format.addMarshaller(new ConnectionErrorMarshaller()); + format.addMarshaller(new ConsumerInfoMarshaller()); + format.addMarshaller(new XATransactionIdMarshaller()); + format.addMarshaller(new JournalTraceMarshaller()); + format.addMarshaller(new ConsumerIdMarshaller()); + format.addMarshaller(new ActiveMQTextMessageMarshaller()); + format.addMarshaller(new SubscriptionInfoMarshaller()); format.addMarshaller(new JournalTransactionMarshaller()); - format.addMarshaller(new RemoveInfoMarshaller()); format.addMarshaller(new ControlCommandMarshaller()); + format.addMarshaller(new NetworkBridgeFilterMarshaller()); + format.addMarshaller(new ActiveMQBytesMessageMarshaller()); + format.addMarshaller(new WireFormatInfoMarshaller()); + format.addMarshaller(new ActiveMQTempTopicMarshaller()); + format.addMarshaller(new DiscoveryEventMarshaller()); + format.addMarshaller(new ActiveMQTopicMarshaller()); + format.addMarshaller(new BrokerInfoMarshaller()); + format.addMarshaller(new DestinationInfoMarshaller()); + format.addMarshaller(new ShutdownInfoMarshaller()); + format.addMarshaller(new DataResponseMarshaller()); + format.addMarshaller(new KeepAliveInfoMarshaller()); + format.addMarshaller(new FlushCommandMarshaller()); + format.addMarshaller(new JournalTopicAckMarshaller()); + format.addMarshaller(new BrokerIdMarshaller()); + format.addMarshaller(new MessageDispatchMarshaller()); + format.addMarshaller(new ActiveMQMapMessageMarshaller()); + format.addMarshaller(new ActiveMQMessageMarshaller()); + format.addMarshaller(new RemoveInfoMarshaller()); format.addMarshaller(new ExceptionResponseMarshaller()); } diff --git a/openwire-cpp/src/marshal/MessageAckMarshaller.cpp b/openwire-cpp/src/marshal/MessageAckMarshaller.cpp index b15f7f724b..74de929d01 100644 --- a/openwire-cpp/src/marshal/MessageAckMarshaller.cpp +++ b/openwire-cpp/src/marshal/MessageAckMarshaller.cpp @@ -56,12 +56,12 @@ void MessageAckMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, Binar base.unmarshal(wireFormat, o, dataIn, bs); MessageAck& info = (MessageAck&) o; - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setAckType(dataIn.readByte()); - info.setFirstMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setLastMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setFirstMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setLastMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageCount(dataIn.readInt()); } diff --git a/openwire-cpp/src/marshal/MessageAckMarshaller.hpp b/openwire-cpp/src/marshal/MessageAckMarshaller.hpp index 92e5b62efe..62e99915ac 100644 --- a/openwire-cpp/src/marshal/MessageAckMarshaller.hpp +++ b/openwire-cpp/src/marshal/MessageAckMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef MessageAckMarshaller_hpp_ -#define MessageAckMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class MessageAckMarshaller : public BaseCommandMarshaller -{ -public: - MessageAckMarshaller() ; - virtual ~MessageAckMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*MessageAckMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef MessageAckMarshaller_hpp_ #define MessageAckMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class MessageAckMarshaller : public BaseCommandMarshaller { public: MessageAckMarshaller() ; virtual ~MessageAckMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*MessageAckMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/MessageDispatchMarshaller.cpp b/openwire-cpp/src/marshal/MessageDispatchMarshaller.cpp index 2cc4870948..63ea67fd92 100644 --- a/openwire-cpp/src/marshal/MessageDispatchMarshaller.cpp +++ b/openwire-cpp/src/marshal/MessageDispatchMarshaller.cpp @@ -56,9 +56,9 @@ void MessageDispatchMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, base.unmarshal(wireFormat, o, dataIn, bs); MessageDispatch& info = (MessageDispatch&) o; - info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setMessage((Message) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setMessage((org.apache.activemq.command.Message) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setRedeliveryCounter(dataIn.readInt()); } diff --git a/openwire-cpp/src/marshal/MessageDispatchMarshaller.hpp b/openwire-cpp/src/marshal/MessageDispatchMarshaller.hpp index 2c615068c7..91732d5b14 100644 --- a/openwire-cpp/src/marshal/MessageDispatchMarshaller.hpp +++ b/openwire-cpp/src/marshal/MessageDispatchMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef MessageDispatchMarshaller_hpp_ -#define MessageDispatchMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class MessageDispatchMarshaller : public BaseCommandMarshaller -{ -public: - MessageDispatchMarshaller() ; - virtual ~MessageDispatchMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*MessageDispatchMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef MessageDispatchMarshaller_hpp_ #define MessageDispatchMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class MessageDispatchMarshaller : public BaseCommandMarshaller { public: MessageDispatchMarshaller() ; virtual ~MessageDispatchMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*MessageDispatchMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.cpp b/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.cpp index 1c7e030f45..cab4995168 100644 --- a/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.cpp +++ b/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.cpp @@ -56,10 +56,10 @@ void MessageDispatchNotificationMarshaller::unmarshal(OpenWireFormat& wireFormat base.unmarshal(wireFormat, o, dataIn, bs); MessageDispatchNotification& info = (MessageDispatchNotification&) o; - info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setDeliverySequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); - info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } diff --git a/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.hpp b/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.hpp index ed529b8424..53a29b7605 100644 --- a/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.hpp +++ b/openwire-cpp/src/marshal/MessageDispatchNotificationMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef MessageDispatchNotificationMarshaller_hpp_ -#define MessageDispatchNotificationMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class MessageDispatchNotificationMarshaller : public BaseCommandMarshaller -{ -public: - MessageDispatchNotificationMarshaller() ; - virtual ~MessageDispatchNotificationMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*MessageDispatchNotificationMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef MessageDispatchNotificationMarshaller_hpp_ #define MessageDispatchNotificationMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class MessageDispatchNotificationMarshaller : public BaseCommandMarshaller { public: MessageDispatchNotificationMarshaller() ; virtual ~MessageDispatchNotificationMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*MessageDispatchNotificationMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/MessageIdMarshaller.cpp b/openwire-cpp/src/marshal/MessageIdMarshaller.cpp index 3a2059331e..47e2e904b2 100644 --- a/openwire-cpp/src/marshal/MessageIdMarshaller.cpp +++ b/openwire-cpp/src/marshal/MessageIdMarshaller.cpp @@ -56,7 +56,7 @@ void MessageIdMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, Binary base.unmarshal(wireFormat, o, dataIn, bs); MessageId& info = (MessageId&) o; - info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setBrokerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); diff --git a/openwire-cpp/src/marshal/MessageIdMarshaller.hpp b/openwire-cpp/src/marshal/MessageIdMarshaller.hpp index 7efeaa651c..1de20a2704 100644 --- a/openwire-cpp/src/marshal/MessageIdMarshaller.hpp +++ b/openwire-cpp/src/marshal/MessageIdMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef MessageIdMarshaller_hpp_ -#define MessageIdMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class MessageIdMarshaller : public BaseDataStreamMarshaller -{ -public: - MessageIdMarshaller() ; - virtual ~MessageIdMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*MessageIdMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef MessageIdMarshaller_hpp_ #define MessageIdMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class MessageIdMarshaller : public BaseDataStreamMarshaller { public: MessageIdMarshaller() ; virtual ~MessageIdMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*MessageIdMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/MessageMarshaller.cpp b/openwire-cpp/src/marshal/MessageMarshaller.cpp index f34759378d..30a99d3d6e 100644 --- a/openwire-cpp/src/marshal/MessageMarshaller.cpp +++ b/openwire-cpp/src/marshal/MessageMarshaller.cpp @@ -45,33 +45,33 @@ void MessageMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryRe base.unmarshal(wireFormat, o, dataIn, bs); Message& info = (Message&) o; - info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setOriginalDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setOriginalTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setGroupID(tightUnmarshalString(dataIn, bs)); info.setGroupSequence(dataIn.readInt()); info.setCorrelationId(tightUnmarshalString(dataIn, bs)); info.setPersistent(bs.readBoolean()); info.setExpiration(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setPriority(dataIn.readByte()); - info.setReplyTo((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setTimestamp(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setType(tightUnmarshalString(dataIn, bs)); info.setContent(tightUnmarshalByteSequence(dataIn, bs)); info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs)); - info.setDataStructure((DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setTargetConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDataStructure((org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setCompressed(bs.readBoolean()); info.setRedeliveryCounter(dataIn.readInt()); if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } diff --git a/openwire-cpp/src/marshal/MessageMarshaller.hpp b/openwire-cpp/src/marshal/MessageMarshaller.hpp index 9a1af2d960..0959d8e1ce 100644 --- a/openwire-cpp/src/marshal/MessageMarshaller.hpp +++ b/openwire-cpp/src/marshal/MessageMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef MessageMarshaller_hpp_ -#define MessageMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class MessageMarshaller : public BaseCommandMarshaller -{ -public: - MessageMarshaller() ; - virtual ~MessageMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*MessageMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef MessageMarshaller_hpp_ #define MessageMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class MessageMarshaller : public BaseCommandMarshaller { public: MessageMarshaller() ; virtual ~MessageMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*MessageMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.cpp b/openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.cpp new file mode 100644 index 0000000000..360572ac6a --- /dev/null +++ b/openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.cpp @@ -0,0 +1 @@ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #include "marshal/NetworkBridgeFilterMarshaller.hpp" using namespace apache::activemq::client::marshal; /* * Marshalling code for Open Wire Format for NetworkBridgeFilter * * 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 */ NetworkBridgeFilterMarshaller::NetworkBridgeFilterMarshaller() { // no-op } NetworkBridgeFilterMarshaller::~NetworkBridgeFilterMarshaller() { // no-op } DataStructure* NetworkBridgeFilterMarshaller::createObject() { return new NetworkBridgeFilter(); } byte NetworkBridgeFilterMarshaller::getDataStructureType() { return NetworkBridgeFilter.ID_NetworkBridgeFilter; } /* * Un-marshal an object instance from the data input stream */ void NetworkBridgeFilterMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) { base.unmarshal(wireFormat, o, dataIn, bs); NetworkBridgeFilter& info = (NetworkBridgeFilter&) o; info.setNetworkTTL(dataIn.readInt()); info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } /* * Write the booleans that this object uses to a BooleanStream */ int NetworkBridgeFilterMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) { NetworkBridgeFilter& info = (NetworkBridgeFilter&) o; int rc = base.marshal1(wireFormat, info, bs); rc += marshal1CachedObject(wireFormat, info.getNetworkBrokerId(), bs); return rc + 1; } /* * Write a object instance to data output stream */ void NetworkBridgeFilterMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) { base.marshal2(wireFormat, o, dataOut, bs); NetworkBridgeFilter& info = (NetworkBridgeFilter&) o; DataStreamMarshaller.writeInt(info.getNetworkTTL(), dataOut); marshal2CachedObject(wireFormat, info.getNetworkBrokerId(), dataOut, bs); } \ No newline at end of file diff --git a/openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.hpp b/openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.hpp new file mode 100644 index 0000000000..30aafb3404 --- /dev/null +++ b/openwire-cpp/src/marshal/NetworkBridgeFilterMarshaller.hpp @@ -0,0 +1 @@ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef NetworkBridgeFilterMarshaller_hpp_ #define NetworkBridgeFilterMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class NetworkBridgeFilterMarshaller : public BaseDataStreamMarshaller { public: NetworkBridgeFilterMarshaller() ; virtual ~NetworkBridgeFilterMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*NetworkBridgeFilterMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ProducerIdMarshaller.hpp b/openwire-cpp/src/marshal/ProducerIdMarshaller.hpp index 9cfa395339..12579c212b 100644 --- a/openwire-cpp/src/marshal/ProducerIdMarshaller.hpp +++ b/openwire-cpp/src/marshal/ProducerIdMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ProducerIdMarshaller_hpp_ -#define ProducerIdMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ProducerIdMarshaller : public BaseDataStreamMarshaller -{ -public: - ProducerIdMarshaller() ; - virtual ~ProducerIdMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ProducerIdMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ProducerIdMarshaller_hpp_ #define ProducerIdMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ProducerIdMarshaller : public BaseDataStreamMarshaller { public: ProducerIdMarshaller() ; virtual ~ProducerIdMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ProducerIdMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ProducerInfoMarshaller.cpp b/openwire-cpp/src/marshal/ProducerInfoMarshaller.cpp index c68d72fd59..ffb3040fb7 100644 --- a/openwire-cpp/src/marshal/ProducerInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/ProducerInfoMarshaller.cpp @@ -56,14 +56,14 @@ void ProducerInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, Bin base.unmarshal(wireFormat, o, dataIn, bs); ProducerInfo& info = (ProducerInfo&) o; - info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); if (bs.readBoolean()) { short size = dataIn.readShort(); - BrokerId value[] = new BrokerId[size]; + org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; for( int i=0; i < size; i++ ) { - value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); } diff --git a/openwire-cpp/src/marshal/ProducerInfoMarshaller.hpp b/openwire-cpp/src/marshal/ProducerInfoMarshaller.hpp index 7f47a9a904..fcc0b1d9c6 100644 --- a/openwire-cpp/src/marshal/ProducerInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/ProducerInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ProducerInfoMarshaller_hpp_ -#define ProducerInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ProducerInfoMarshaller : public BaseCommandMarshaller -{ -public: - ProducerInfoMarshaller() ; - virtual ~ProducerInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ProducerInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ProducerInfoMarshaller_hpp_ #define ProducerInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ProducerInfoMarshaller : public BaseCommandMarshaller { public: ProducerInfoMarshaller() ; virtual ~ProducerInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ProducerInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/RemoveInfoMarshaller.cpp b/openwire-cpp/src/marshal/RemoveInfoMarshaller.cpp index 9f9f26cd7e..a4240611c9 100644 --- a/openwire-cpp/src/marshal/RemoveInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/RemoveInfoMarshaller.cpp @@ -56,7 +56,7 @@ void RemoveInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, Binar base.unmarshal(wireFormat, o, dataIn, bs); RemoveInfo& info = (RemoveInfo&) o; - info.setObjectId((DataStructure) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setObjectId((org.apache.activemq.command.DataStructure) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } diff --git a/openwire-cpp/src/marshal/RemoveInfoMarshaller.hpp b/openwire-cpp/src/marshal/RemoveInfoMarshaller.hpp index 86102b68fb..6ca06bc4cb 100644 --- a/openwire-cpp/src/marshal/RemoveInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/RemoveInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef RemoveInfoMarshaller_hpp_ -#define RemoveInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class RemoveInfoMarshaller : public BaseCommandMarshaller -{ -public: - RemoveInfoMarshaller() ; - virtual ~RemoveInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*RemoveInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef RemoveInfoMarshaller_hpp_ #define RemoveInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class RemoveInfoMarshaller : public BaseCommandMarshaller { public: RemoveInfoMarshaller() ; virtual ~RemoveInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*RemoveInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/RemoveSubscriptionInfoMarshaller.cpp b/openwire-cpp/src/marshal/RemoveSubscriptionInfoMarshaller.cpp index 3205bcca13..dc848b88d8 100644 --- a/openwire-cpp/src/marshal/RemoveSubscriptionInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/RemoveSubscriptionInfoMarshaller.cpp @@ -56,7 +56,7 @@ void RemoveSubscriptionInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Obj base.unmarshal(wireFormat, o, dataIn, bs); RemoveSubscriptionInfo& info = (RemoveSubscriptionInfo&) o; - info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setSubcriptionName(tightUnmarshalString(dataIn, bs)); info.setClientId(tightUnmarshalString(dataIn, bs)); diff --git a/openwire-cpp/src/marshal/RemoveSubscriptionInfoMarshaller.hpp b/openwire-cpp/src/marshal/RemoveSubscriptionInfoMarshaller.hpp index cbb38a6db3..031ef7d799 100644 --- a/openwire-cpp/src/marshal/RemoveSubscriptionInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/RemoveSubscriptionInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef RemoveSubscriptionInfoMarshaller_hpp_ -#define RemoveSubscriptionInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class RemoveSubscriptionInfoMarshaller : public BaseCommandMarshaller -{ -public: - RemoveSubscriptionInfoMarshaller() ; - virtual ~RemoveSubscriptionInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*RemoveSubscriptionInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef RemoveSubscriptionInfoMarshaller_hpp_ #define RemoveSubscriptionInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class RemoveSubscriptionInfoMarshaller : public BaseCommandMarshaller { public: RemoveSubscriptionInfoMarshaller() ; virtual ~RemoveSubscriptionInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*RemoveSubscriptionInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ResponseMarshaller.hpp b/openwire-cpp/src/marshal/ResponseMarshaller.hpp index 0e01a62a13..f54862b306 100644 --- a/openwire-cpp/src/marshal/ResponseMarshaller.hpp +++ b/openwire-cpp/src/marshal/ResponseMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ResponseMarshaller_hpp_ -#define ResponseMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ResponseMarshaller : public BaseCommandMarshaller -{ -public: - ResponseMarshaller() ; - virtual ~ResponseMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ResponseMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ResponseMarshaller_hpp_ #define ResponseMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ResponseMarshaller : public BaseCommandMarshaller { public: ResponseMarshaller() ; virtual ~ResponseMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ResponseMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/SessionIdMarshaller.hpp b/openwire-cpp/src/marshal/SessionIdMarshaller.hpp index 1a1adfe80e..11820c7d1b 100644 --- a/openwire-cpp/src/marshal/SessionIdMarshaller.hpp +++ b/openwire-cpp/src/marshal/SessionIdMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef SessionIdMarshaller_hpp_ -#define SessionIdMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class SessionIdMarshaller : public BaseDataStreamMarshaller -{ -public: - SessionIdMarshaller() ; - virtual ~SessionIdMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*SessionIdMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef SessionIdMarshaller_hpp_ #define SessionIdMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class SessionIdMarshaller : public BaseDataStreamMarshaller { public: SessionIdMarshaller() ; virtual ~SessionIdMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*SessionIdMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/SessionInfoMarshaller.cpp b/openwire-cpp/src/marshal/SessionInfoMarshaller.cpp index 8b83c435e3..fe3d0db29f 100644 --- a/openwire-cpp/src/marshal/SessionInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/SessionInfoMarshaller.cpp @@ -56,7 +56,7 @@ void SessionInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, Bina base.unmarshal(wireFormat, o, dataIn, bs); SessionInfo& info = (SessionInfo&) o; - info.setSessionId((SessionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setSessionId((org.apache.activemq.command.SessionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } diff --git a/openwire-cpp/src/marshal/SessionInfoMarshaller.hpp b/openwire-cpp/src/marshal/SessionInfoMarshaller.hpp index a8a041d5cd..0d2cd879be 100644 --- a/openwire-cpp/src/marshal/SessionInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/SessionInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef SessionInfoMarshaller_hpp_ -#define SessionInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class SessionInfoMarshaller : public BaseCommandMarshaller -{ -public: - SessionInfoMarshaller() ; - virtual ~SessionInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*SessionInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef SessionInfoMarshaller_hpp_ #define SessionInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class SessionInfoMarshaller : public BaseCommandMarshaller { public: SessionInfoMarshaller() ; virtual ~SessionInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*SessionInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/ShutdownInfoMarshaller.hpp b/openwire-cpp/src/marshal/ShutdownInfoMarshaller.hpp index 893edfef1e..a6444758f1 100644 --- a/openwire-cpp/src/marshal/ShutdownInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/ShutdownInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef ShutdownInfoMarshaller_hpp_ -#define ShutdownInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class ShutdownInfoMarshaller : public BaseCommandMarshaller -{ -public: - ShutdownInfoMarshaller() ; - virtual ~ShutdownInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*ShutdownInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef ShutdownInfoMarshaller_hpp_ #define ShutdownInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class ShutdownInfoMarshaller : public BaseCommandMarshaller { public: ShutdownInfoMarshaller() ; virtual ~ShutdownInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*ShutdownInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.cpp b/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.cpp index 640747520d..952364ee8f 100644 --- a/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.cpp @@ -57,7 +57,7 @@ void SubscriptionInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, SubscriptionInfo& info = (SubscriptionInfo&) o; info.setClientId(tightUnmarshalString(dataIn, bs)); - info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setSelector(tightUnmarshalString(dataIn, bs)); info.setSubcriptionName(tightUnmarshalString(dataIn, bs)); diff --git a/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.hpp b/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.hpp index aa07a9289b..92b20bbc6b 100644 --- a/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/SubscriptionInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef SubscriptionInfoMarshaller_hpp_ -#define SubscriptionInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class SubscriptionInfoMarshaller : public BaseDataStreamMarshaller -{ -public: - SubscriptionInfoMarshaller() ; - virtual ~SubscriptionInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*SubscriptionInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef SubscriptionInfoMarshaller_hpp_ #define SubscriptionInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class SubscriptionInfoMarshaller : public BaseDataStreamMarshaller { public: SubscriptionInfoMarshaller() ; virtual ~SubscriptionInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*SubscriptionInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/TransactionIdMarshaller.hpp b/openwire-cpp/src/marshal/TransactionIdMarshaller.hpp index b1eedb6dc2..5d7063bce8 100644 --- a/openwire-cpp/src/marshal/TransactionIdMarshaller.hpp +++ b/openwire-cpp/src/marshal/TransactionIdMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef TransactionIdMarshaller_hpp_ -#define TransactionIdMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class TransactionIdMarshaller : public BaseDataStreamMarshaller -{ -public: - TransactionIdMarshaller() ; - virtual ~TransactionIdMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*TransactionIdMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef TransactionIdMarshaller_hpp_ #define TransactionIdMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class TransactionIdMarshaller : public BaseDataStreamMarshaller { public: TransactionIdMarshaller() ; virtual ~TransactionIdMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*TransactionIdMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/TransactionInfoMarshaller.cpp b/openwire-cpp/src/marshal/TransactionInfoMarshaller.cpp index a2c3cbea02..da083f9d76 100644 --- a/openwire-cpp/src/marshal/TransactionInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/TransactionInfoMarshaller.cpp @@ -56,8 +56,8 @@ void TransactionInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, base.unmarshal(wireFormat, o, dataIn, bs); TransactionInfo& info = (TransactionInfo&) o; - info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setType(dataIn.readByte()); } diff --git a/openwire-cpp/src/marshal/TransactionInfoMarshaller.hpp b/openwire-cpp/src/marshal/TransactionInfoMarshaller.hpp index 590495dbc4..7085ed44eb 100644 --- a/openwire-cpp/src/marshal/TransactionInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/TransactionInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef TransactionInfoMarshaller_hpp_ -#define TransactionInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseCommandMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class TransactionInfoMarshaller : public BaseCommandMarshaller -{ -public: - TransactionInfoMarshaller() ; - virtual ~TransactionInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*TransactionInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef TransactionInfoMarshaller_hpp_ #define TransactionInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseCommandMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class TransactionInfoMarshaller : public BaseCommandMarshaller { public: TransactionInfoMarshaller() ; virtual ~TransactionInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*TransactionInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/WireFormatInfoMarshaller.cpp b/openwire-cpp/src/marshal/WireFormatInfoMarshaller.cpp index c5b8793790..d21c11b113 100644 --- a/openwire-cpp/src/marshal/WireFormatInfoMarshaller.cpp +++ b/openwire-cpp/src/marshal/WireFormatInfoMarshaller.cpp @@ -58,11 +58,7 @@ void WireFormatInfoMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, B WireFormatInfo& info = (WireFormatInfo&) o; info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8)); info.setVersion(dataIn.readInt()); - info.setCacheEnabled(bs.readBoolean()); - info.setStackTraceEnabled(bs.readBoolean()); - info.setTcpNoDelayEnabled(bs.readBoolean()); - info.setPrefixPacketSize(bs.readBoolean()); - info.setTightEncodingEnabled(bs.readBoolean()); + info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs)); } @@ -74,11 +70,8 @@ int WireFormatInfoMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, Bo WireFormatInfo& info = (WireFormatInfo&) o; int rc = base.marshal1(wireFormat, info, bs); - bs.writeBoolean(info.isCacheEnabled()); - bs.writeBoolean(info.isStackTraceEnabled()); - bs.writeBoolean(info.isTcpNoDelayEnabled()); - bs.writeBoolean(info.isPrefixPacketSize()); - bs.writeBoolean(info.isTightEncodingEnabled()); + bs.writeBoolean(info.getMarshalledProperties()!=null); + rc += info.getMarshalledProperties()==null ? 0 : info.getMarshalledProperties().Length+4; return rc + 9; } @@ -92,10 +85,9 @@ void WireFormatInfoMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, B WireFormatInfo& info = (WireFormatInfo&) o; dataOut.write(info.getMagic(), 0, 8); DataStreamMarshaller.writeInt(info.getVersion(), dataOut); - bs.readBoolean(); - bs.readBoolean(); - bs.readBoolean(); - bs.readBoolean(); - bs.readBoolean(); + if(bs.readBoolean()) { + DataStreamMarshaller.writeInt(info.getMarshalledProperties().Length, dataOut); + dataOut.write(info.getMarshalledProperties()); + } } diff --git a/openwire-cpp/src/marshal/WireFormatInfoMarshaller.hpp b/openwire-cpp/src/marshal/WireFormatInfoMarshaller.hpp index 15065adf37..d48817906e 100644 --- a/openwire-cpp/src/marshal/WireFormatInfoMarshaller.hpp +++ b/openwire-cpp/src/marshal/WireFormatInfoMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef WireFormatInfoMarshaller_hpp_ -#define WireFormatInfoMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/BaseDataStreamMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class WireFormatInfoMarshaller : public BaseDataStreamMarshaller -{ -public: - WireFormatInfoMarshaller() ; - virtual ~WireFormatInfoMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*WireFormatInfoMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef WireFormatInfoMarshaller_hpp_ #define WireFormatInfoMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/BaseDataStreamMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class WireFormatInfoMarshaller : public BaseDataStreamMarshaller { public: WireFormatInfoMarshaller() ; virtual ~WireFormatInfoMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*WireFormatInfoMarshaller_hpp_*/ \ No newline at end of file diff --git a/openwire-cpp/src/marshal/XATransactionIdMarshaller.hpp b/openwire-cpp/src/marshal/XATransactionIdMarshaller.hpp index c922a5cf81..e3e87309ec 100644 --- a/openwire-cpp/src/marshal/XATransactionIdMarshaller.hpp +++ b/openwire-cpp/src/marshal/XATransactionIdMarshaller.hpp @@ -1,71 +1 @@ -/* -* Copyright 2006 The Apache Software Foundation or its licensors, as -* applicable. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#ifndef XATransactionIdMarshaller_hpp_ -#define XATransactionIdMarshaller_hpp_ - -#include - -#include "command/DataStructure.hpp" - -/* we could cut this down - for now include all possible headers */ -#include "command/BrokerId.hpp" -#include "command/ConnectionId.hpp" -#include "command/ConsumerId.hpp" -#include "command/ProducerId.hpp" -#include "command/SessionId.hpp" - -#include "io/BinaryReader.hpp" -#include "io/BinaryWriter.hpp" - -#include "command/TransactionIdMarshaller.hpp" -#include "util/ifr/p.hpp" - -namespace apache -{ - namespace activemq - { - namespace client - { - namespace marshal - { - using namespace ifr ; - using namespace apache::activemq::client::command; - using namespace apache::activemq::client::io; - -/* - * - */ -class XATransactionIdMarshaller : public TransactionIdMarshaller -{ -public: - XATransactionIdMarshaller() ; - virtual ~XATransactionIdMarshaller() ; - - virtual DataStructure* createCommand() ; - virtual byte getDataStructureType() ; - - virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; - virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; - virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; -} ; - -/* namespace */ - } - } - } -} -#endif /*XATransactionIdMarshaller_hpp_*/ +/* * Copyright 2006 The Apache Software Foundation or its licensors, as * applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ #ifndef XATransactionIdMarshaller_hpp_ #define XATransactionIdMarshaller_hpp_ #include #include "command/DataStructure.hpp" /* we could cut this down - for now include all possible headers */ #include "command/BrokerId.hpp" #include "command/ConnectionId.hpp" #include "command/ConsumerId.hpp" #include "command/ProducerId.hpp" #include "command/SessionId.hpp" #include "io/BinaryReader.hpp" #include "io/BinaryWriter.hpp" #include "command/TransactionIdMarshaller.hpp" #include "util/ifr/p.hpp" namespace apache { namespace activemq { namespace client { namespace marshal { using namespace ifr ; using namespace apache::activemq::client::command; using namespace apache::activemq::client::io; /* * */ class XATransactionIdMarshaller : public TransactionIdMarshaller { public: XATransactionIdMarshaller() ; virtual ~XATransactionIdMarshaller() ; virtual DataStructure* createCommand() ; virtual byte getDataStructureType() ; virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ; virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ; virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ; } ; /* namespace */ } } } } #endif /*XATransactionIdMarshaller_hpp_*/ \ No newline at end of file