activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r593561 [8/11] - in /activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal: v1/ v2/
Date Fri, 09 Nov 2007 15:25:57 GMT
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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -25,9 +25,9 @@
 
 #include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
 
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -73,8 +73,8 @@
          */
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn,
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,8 +96,8 @@
          */
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
-                                    io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    decaf::io::DataOutputStream* dataOut,
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/XATransactionIdMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/XATransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/XATransactionIdMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v1/XATransactionIdMarshaller.h>
 
 #include <activemq/connector/openwire/commands/XATransactionId.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,13 +28,15 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v1;
+using namespace decaf;
+using namespace decaf::io;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* XATransactionIdMarshaller::createObject() const {
@@ -46,7 +49,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void XATransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void XATransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
 
     try {
 
@@ -58,13 +61,13 @@
         info->setGlobalTransactionId( tightUnmarshalByteArray( dataIn, bs ) );
         info->setBranchQualifier( tightUnmarshalByteArray( dataIn, bs ) );
     }
-    AMQ_CATCH_RETHROW( io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-    AMQ_CATCHALL_THROW( io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int XATransactionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int XATransactionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
 
     try {
 
@@ -79,13 +82,13 @@
 
         return rc + 4;
     }
-    AMQ_CATCH_RETHROW( io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-    AMQ_CATCHALL_THROW( io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void XATransactionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void XATransactionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
 
     try {
 
@@ -96,20 +99,20 @@
         dataOut->writeInt( info->getFormatId() );
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size() );
+            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), 0, (int)info->getGlobalTransactionId().size() );
         }
         if( bs->readBoolean() ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size() );
+            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), 0, (int)info->getBranchQualifier().size() );
         }
     }
-    AMQ_CATCH_RETHROW( io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-    AMQ_CATCHALL_THROW( io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void XATransactionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void XATransactionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
 
     try {
 
@@ -120,34 +123,34 @@
         info->setGlobalTransactionId( looseUnmarshalByteArray( dataIn ) );
         info->setBranchQualifier( looseUnmarshalByteArray( dataIn ) );
     }
-    AMQ_CATCH_RETHROW( io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-    AMQ_CATCHALL_THROW( io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void XATransactionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void XATransactionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
 
     try {
 
         XATransactionId* info =
             dynamic_cast<XATransactionId*>( dataStructure );
-         TransactionIdMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        TransactionIdMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         dataOut->writeInt( info->getFormatId() );
         dataOut->write( info->getGlobalTransactionId().size() != 0 );
         if( info->getGlobalTransactionId().size() != 0 ) {
             dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
-            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), (int)info->getGlobalTransactionId().size() );
+            dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]), 0, (int)info->getGlobalTransactionId().size() );
         }
         dataOut->write( info->getBranchQualifier().size() != 0 );
         if( info->getBranchQualifier().size() != 0 ) {
             dataOut->writeInt( (int)info->getBranchQualifier().size() );
-            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), (int)info->getBranchQualifier().size() );
+            dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]), 0, (int)info->getBranchQualifier().size() );
         }
     }
-    AMQ_CATCH_RETHROW( io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-    AMQ_CATCHALL_THROW( io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -25,9 +25,9 @@
 
 #include <activemq/connector/openwire/marshal/v1/TransactionIdMarshaller.h>
 
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -73,8 +73,8 @@
          */
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn,
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,8 +96,8 @@
          */
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
-                                    io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    decaf::io::DataOutputStream* dataOut,
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQBytesMessage.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -78,9 +80,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -123,7 +125,7 @@
         ActiveMQBytesMessage* info =
             dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
         info->beforeMarshal( wireFormat );
-         MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         info->afterMarshal( wireFormat );
     }

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQDestination.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -65,9 +67,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -108,7 +110,7 @@
 
         ActiveMQDestination* info =
             dynamic_cast<ActiveMQDestination*>( dataStructure );
-         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalString( info->getPhysicalName(), dataOut );
     }

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -62,7 +62,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -73,7 +73,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -85,7 +85,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -95,7 +95,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -105,7 +105,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQMapMessage.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -78,9 +80,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -123,7 +125,7 @@
         ActiveMQMapMessage* info =
             dynamic_cast<ActiveMQMapMessage*>( dataStructure );
         info->beforeMarshal( wireFormat );
-         MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         info->afterMarshal( wireFormat );
     }

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQMessage.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -78,9 +80,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -123,7 +125,7 @@
         ActiveMQMessage* info =
             dynamic_cast<ActiveMQMessage*>( dataStructure );
         info->beforeMarshal( wireFormat );
-         MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         info->afterMarshal( wireFormat );
     }

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQObjectMessage.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -78,9 +80,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -123,7 +125,7 @@
         ActiveMQObjectMessage* info =
             dynamic_cast<ActiveMQObjectMessage*>( dataStructure );
         info->beforeMarshal( wireFormat );
-         MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         info->afterMarshal( wireFormat );
     }

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQQueue.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -68,9 +70,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -103,7 +105,7 @@
 
     try {
 
-         ActiveMQDestinationMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        ActiveMQDestinationMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQStreamMessage.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -78,9 +80,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -123,7 +125,7 @@
         ActiveMQStreamMessage* info =
             dynamic_cast<ActiveMQStreamMessage*>( dataStructure );
         info->beforeMarshal( wireFormat );
-         MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         info->afterMarshal( wireFormat );
     }

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQTempDestination.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -58,9 +60,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -93,7 +95,7 @@
 
     try {
 
-         ActiveMQDestinationMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        ActiveMQDestinationMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -62,7 +62,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -73,7 +73,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -85,7 +85,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -95,7 +95,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -105,7 +105,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQTempQueue.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -68,9 +70,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -103,7 +105,7 @@
 
     try {
 
-         ActiveMQTempDestinationMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        ActiveMQTempDestinationMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQTempTopic.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -68,9 +70,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -103,7 +105,7 @@
 
     try {
 
-         ActiveMQTempDestinationMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        ActiveMQTempDestinationMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQTextMessage.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -78,9 +80,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -123,7 +125,7 @@
         ActiveMQTextMessage* info =
             dynamic_cast<ActiveMQTextMessage*>( dataStructure );
         info->beforeMarshal( wireFormat );
-         MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         info->afterMarshal( wireFormat );
     }

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ActiveMQTopic.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -68,9 +70,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -103,7 +105,7 @@
 
     try {
 
-         ActiveMQDestinationMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        ActiveMQDestinationMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h>
 
 #include <activemq/connector/openwire/commands/BaseCommand.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -66,9 +68,9 @@
 
         return rc + 4;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -111,7 +113,7 @@
 
         transport::Command* info =
             dynamic_cast<transport::Command*>( dataStructure );
-         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         dataOut->writeInt( info->getCommandId() );
         dataOut->writeBoolean( info->isResponseRequired() );

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -62,7 +62,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -73,7 +73,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -85,7 +85,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -95,7 +95,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -105,7 +105,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.h>
 
 #include <activemq/connector/openwire/commands/BrokerId.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -75,9 +77,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -118,7 +120,7 @@
 
         BrokerId* info =
             dynamic_cast<BrokerId*>( dataStructure );
-         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalString( info->getValue(), dataOut );
     }

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -74,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException );
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs ) throw( io::IOException );
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -97,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs ) throw( io::IOException );
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn ) throw( io::IOException );
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -117,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
 
     };
 

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=593561&r1=593560&r2=593561&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 Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h>
 
 #include <activemq/connector/openwire/commands/BrokerInfo.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
@@ -105,9 +107,9 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -178,7 +180,7 @@
 
         BrokerInfo* info =
             dynamic_cast<BrokerInfo*>( dataStructure );
-         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalCachedObject( wireFormat, info->getBrokerId(), dataOut );
         looseMarshalString( info->getBrokerURL(), dataOut );



Mime
View raw message