activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r720375 [2/3] - in /activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal: v1/ v2/
Date Tue, 25 Nov 2008 01:31:11 GMT
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/RemoveSubscriptionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/RemoveSubscriptionInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/RemoveSubscriptionInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/RemoveSubscriptionInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class RemoveSubscriptionInfoMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API RemoveSubscriptionInfoMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ReplayCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ReplayCommandMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ReplayCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ReplayCommandMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ReplayCommandMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API ReplayCommandMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ResponseMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ResponseMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ResponseMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API ResponseMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SessionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SessionIdMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SessionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SessionIdMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class SessionIdMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API SessionIdMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SessionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SessionInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SessionInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SessionInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class SessionInfoMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API SessionInfoMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ShutdownInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ShutdownInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ShutdownInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ShutdownInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ShutdownInfoMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API ShutdownInfoMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp Mon Nov 24 17:31:08 2008
@@ -62,6 +62,8 @@
             tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
         info->setSelector( tightUnmarshalString( dataIn, bs ) );
         info->setSubcriptionName( tightUnmarshalString( dataIn, bs ) );
+        info->setSubscribedDestination( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -81,6 +83,7 @@
         rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
         rc += tightMarshalString1( info->getSelector(), bs );
         rc += tightMarshalString1( info->getSubcriptionName(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getSubscribedDestination(), bs );
 
         return rc + 0;
     }
@@ -102,6 +105,7 @@
         tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
         tightMarshalString2( info->getSelector(), dataOut, bs );
         tightMarshalString2( info->getSubcriptionName(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getSubscribedDestination(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -121,6 +125,8 @@
             looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
         info->setSelector( looseUnmarshalString( dataIn ) );
         info->setSubcriptionName( looseUnmarshalString( dataIn ) );
+        info->setSubscribedDestination( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -140,6 +146,7 @@
         looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
         looseMarshalString( info->getSelector(), dataOut );
         looseMarshalString( info->getSubcriptionName(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getSubscribedDestination(), dataOut );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SubscriptionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SubscriptionInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SubscriptionInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/SubscriptionInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class SubscriptionInfoMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API SubscriptionInfoMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/TransactionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/TransactionIdMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/TransactionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/TransactionIdMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class TransactionIdMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API TransactionIdMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/TransactionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/TransactionInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/TransactionInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/TransactionInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class TransactionInfoMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API TransactionInfoMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/WireFormatInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/WireFormatInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/WireFormatInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/WireFormatInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class WireFormatInfoMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API WireFormatInfoMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/XATransactionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/XATransactionIdMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/XATransactionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/XATransactionIdMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class XATransactionIdMarshaller : public TransactionIdMarshaller
+    class AMQCPP_API XATransactionIdMarshaller : public TransactionIdMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQBytesMessageMarshaller : public MessageMarshaller
+    class AMQCPP_API ActiveMQBytesMessageMarshaller : public MessageMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQDestinationMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API ActiveMQDestinationMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQMapMessageMarshaller : public MessageMarshaller
+    class AMQCPP_API ActiveMQMapMessageMarshaller : public MessageMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQMessageMarshaller : public MessageMarshaller
+    class AMQCPP_API ActiveMQMessageMarshaller : public MessageMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQObjectMessageMarshaller : public MessageMarshaller
+    class AMQCPP_API ActiveMQObjectMessageMarshaller : public MessageMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQQueueMarshaller : public ActiveMQDestinationMarshaller
+    class AMQCPP_API ActiveMQQueueMarshaller : public ActiveMQDestinationMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQStreamMessageMarshaller : public MessageMarshaller
+    class AMQCPP_API ActiveMQStreamMessageMarshaller : public MessageMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQTempDestinationMarshaller : public ActiveMQDestinationMarshaller
+    class AMQCPP_API ActiveMQTempDestinationMarshaller : public ActiveMQDestinationMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQTempQueueMarshaller : public ActiveMQTempDestinationMarshaller
+    class AMQCPP_API ActiveMQTempQueueMarshaller : public ActiveMQTempDestinationMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQTempTopicMarshaller : public ActiveMQTempDestinationMarshaller
+    class AMQCPP_API ActiveMQTempTopicMarshaller : public ActiveMQTempDestinationMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQTextMessageMarshaller : public MessageMarshaller
+    class AMQCPP_API ActiveMQTextMessageMarshaller : public MessageMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQTopicMarshaller : public ActiveMQDestinationMarshaller
+    class AMQCPP_API ActiveMQTopicMarshaller : public ActiveMQDestinationMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class BaseCommandMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API BaseCommandMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class BrokerIdMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API BrokerIdMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp Mon Nov 24 17:31:08 2008
@@ -79,6 +79,8 @@
         info->setDuplexConnection( bs->readBoolean() );
         info->setNetworkConnection( bs->readBoolean() );
         info->setConnectionId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
+        info->setBrokerUploadUrl( tightUnmarshalString( dataIn, bs ) );
+        info->setNetworkProperties( tightUnmarshalString( dataIn, bs ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -104,6 +106,8 @@
         bs->writeBoolean( info->isDuplexConnection() );
         bs->writeBoolean( info->isNetworkConnection() );
         rc += tightMarshalLong1( wireFormat, info->getConnectionId(), bs );
+        rc += tightMarshalString1( info->getBrokerUploadUrl(), bs );
+        rc += tightMarshalString1( info->getNetworkProperties(), bs );
 
         return rc + 0;
     }
@@ -131,6 +135,8 @@
         bs->readBoolean();
         bs->readBoolean();
         tightMarshalLong2( wireFormat, info->getConnectionId(), dataOut, bs );
+        tightMarshalString2( info->getBrokerUploadUrl(), dataOut, bs );
+        tightMarshalString2( info->getNetworkProperties(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -167,6 +173,8 @@
         info->setDuplexConnection( dataIn->readBoolean() );
         info->setNetworkConnection( dataIn->readBoolean() );
         info->setConnectionId( looseUnmarshalLong( wireFormat, dataIn ) );
+        info->setBrokerUploadUrl( looseUnmarshalString( dataIn ) );
+        info->setNetworkProperties( looseUnmarshalString( dataIn ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -192,6 +200,8 @@
         dataOut->writeBoolean( info->isDuplexConnection() );
         dataOut->writeBoolean( info->isNetworkConnection() );
         looseMarshalLong( wireFormat, info->getConnectionId(), dataOut );
+        looseMarshalString( info->getBrokerUploadUrl(), dataOut );
+        looseMarshalString( info->getNetworkProperties(), dataOut );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class BrokerInfoMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API BrokerInfoMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ConnectionControlMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API ConnectionControlMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ConnectionErrorMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API ConnectionErrorMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ConnectionIdMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API ConnectionIdMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ConnectionInfoMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API ConnectionInfoMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ConsumerControlMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API ConsumerControlMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ConsumerIdMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API ConsumerIdMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ConsumerInfoMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API ConsumerInfoMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ControlCommandMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API ControlCommandMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class DataArrayResponseMarshaller : public ResponseMarshaller
+    class AMQCPP_API DataArrayResponseMarshaller : public ResponseMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class DataResponseMarshaller : public ResponseMarshaller
+    class AMQCPP_API DataResponseMarshaller : public ResponseMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class DestinationInfoMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API DestinationInfoMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class DiscoveryEventMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API DiscoveryEventMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ExceptionResponseMarshaller : public ResponseMarshaller
+    class AMQCPP_API ExceptionResponseMarshaller : public ResponseMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class FlushCommandMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API FlushCommandMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class IntegerResponseMarshaller : public ResponseMarshaller
+    class AMQCPP_API IntegerResponseMarshaller : public ResponseMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class JournalQueueAckMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API JournalQueueAckMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class JournalTopicAckMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API JournalTopicAckMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class JournalTraceMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API JournalTraceMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class JournalTransactionMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API JournalTransactionMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class KeepAliveInfoMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API KeepAliveInfoMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class LastPartialCommandMarshaller : public PartialCommandMarshaller
+    class AMQCPP_API LastPartialCommandMarshaller : public PartialCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class LocalTransactionIdMarshaller : public TransactionIdMarshaller
+    class AMQCPP_API LocalTransactionIdMarshaller : public TransactionIdMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class MessageAckMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API MessageAckMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class MessageDispatchMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API MessageDispatchMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class MessageDispatchNotificationMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API MessageDispatchNotificationMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class MessageIdMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API MessageIdMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp Mon Nov 24 17:31:08 2008
@@ -93,6 +93,20 @@
         info->setUserID( tightUnmarshalString( dataIn, bs ) );
         info->setRecievedByDFBridge( bs->readBoolean() );
         info->setDroppable( bs->readBoolean() );
+
+        if( bs->readBoolean() ) {
+            short size = dataIn->readShort();
+            info->getCluster().reserve( size );
+            for( int i = 0; i < size; i++ ) {
+                info->getCluster().push_back( dynamic_cast< BrokerId* >(
+                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+            }
+        }
+        else {
+            info->getCluster().clear();
+        }
+        info->setBrokerInTime( tightUnmarshalLong( wireFormat, dataIn, bs ) );
+        info->setBrokerOutTime( tightUnmarshalLong( wireFormat, dataIn, bs ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -133,6 +147,9 @@
         rc += tightMarshalString1( info->getUserID(), bs );
         bs->writeBoolean( info->isRecievedByDFBridge() );
         bs->writeBoolean( info->isDroppable() );
+        rc += tightMarshalObjectArray1( wireFormat, info->getCluster(), bs );
+        rc += tightMarshalLong1( wireFormat, info->getBrokerInTime(), bs );
+        rc += tightMarshalLong1( wireFormat, info->getBrokerOutTime(), bs );
 
         return rc + 9;
     }
@@ -182,6 +199,9 @@
         tightMarshalString2( info->getUserID(), dataOut, bs );
         bs->readBoolean();
         bs->readBoolean();
+        tightMarshalObjectArray2( wireFormat, info->getCluster(), dataOut, bs );
+        tightMarshalLong2( wireFormat, info->getBrokerInTime(), dataOut, bs );
+        tightMarshalLong2( wireFormat, info->getBrokerOutTime(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -242,6 +262,20 @@
         info->setUserID( looseUnmarshalString( dataIn ) );
         info->setRecievedByDFBridge( dataIn->readBoolean() );
         info->setDroppable( dataIn->readBoolean() );
+
+        if( dataIn->readBoolean() ) {
+            short size = dataIn->readShort();
+            info->getCluster().reserve( size );
+            for( int i = 0; i < size; i++ ) {
+                info->getCluster().push_back( dynamic_cast<BrokerId* >(
+                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+            }
+        }
+        else {
+            info->getCluster().clear();
+        }
+        info->setBrokerInTime( looseUnmarshalLong( wireFormat, dataIn ) );
+        info->setBrokerOutTime( looseUnmarshalLong( wireFormat, dataIn ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -291,6 +325,9 @@
         looseMarshalString( info->getUserID(), dataOut );
         dataOut->writeBoolean( info->isRecievedByDFBridge() );
         dataOut->writeBoolean( info->isDroppable() );
+        looseMarshalObjectArray( wireFormat, info->getCluster(), dataOut );
+        looseMarshalLong( wireFormat, info->getBrokerInTime(), dataOut );
+        looseMarshalLong( wireFormat, info->getBrokerOutTime(), dataOut );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class MessageMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API MessageMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.cpp?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.cpp Mon Nov 24 17:31:08 2008
@@ -62,6 +62,9 @@
         info->setDestination( dynamic_cast< ActiveMQDestination* >(
             tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
         info->setTimeout( tightUnmarshalLong( wireFormat, dataIn, bs ) );
+        info->setCorrelationId( tightUnmarshalString( dataIn, bs ) );
+        info->setMessageId( dynamic_cast< MessageId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -80,6 +83,8 @@
         rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId(), bs );
         rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
         rc += tightMarshalLong1( wireFormat, info->getTimeout(), bs );
+        rc += tightMarshalString1( info->getCorrelationId(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getMessageId(), bs );
 
         return rc + 0;
     }
@@ -100,6 +105,8 @@
         tightMarshalCachedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
         tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
         tightMarshalLong2( wireFormat, info->getTimeout(), dataOut, bs );
+        tightMarshalString2( info->getCorrelationId(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getMessageId(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -119,6 +126,9 @@
         info->setDestination( dynamic_cast< ActiveMQDestination* >( 
             looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
         info->setTimeout( looseUnmarshalLong( wireFormat, dataIn ) );
+        info->setCorrelationId( looseUnmarshalString( dataIn ) );
+        info->setMessageId( dynamic_cast< MessageId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -137,6 +147,8 @@
         looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
         looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
         looseMarshalLong( wireFormat, info->getTimeout(), dataOut );
+        looseMarshalString( info->getCorrelationId(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getMessageId(), dataOut );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class MessagePullMarshaller : public BaseCommandMarshaller
+    class AMQCPP_API MessagePullMarshaller : public BaseCommandMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class NetworkBridgeFilterMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API NetworkBridgeFilterMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class PartialCommandMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API PartialCommandMarshaller : public BaseDataStreamMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.h?rev=720375&r1=720374&r2=720375&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.h Mon Nov 24 17:31:08 2008
@@ -28,6 +28,7 @@
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -45,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ProducerIdMarshaller : public BaseDataStreamMarshaller
+    class AMQCPP_API ProducerIdMarshaller : public BaseDataStreamMarshaller
     {
     public:
 



Mime
View raw message