activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r593561 [9/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/v2/BrokerInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h?rev=593561&r1=593560&r2=593561&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 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/ConnectionControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ConnectionControl.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;
@@ -83,9 +85,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -132,7 +134,7 @@
 
         ConnectionControl* info =
             dynamic_cast<ConnectionControl*>( dataStructure );
-         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         dataOut->writeBoolean( info->isClose() );
         dataOut->writeBoolean( info->isExit() );

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=593561&r1=593560&r2=593561&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 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/ConnectionErrorMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ConnectionError.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;
@@ -79,9 +81,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -126,7 +128,7 @@
 
         ConnectionError* info =
             dynamic_cast<ConnectionError*>( dataStructure );
-         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalBrokerError( wireFormat, info->getException(), dataOut );
         looseMarshalNestedObject( wireFormat, info->getConnectionId(), dataOut );

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=593561&r1=593560&r2=593561&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 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/ConnectionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ConnectionId.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 @@
 
         ConnectionId* info =
             dynamic_cast<ConnectionId*>( 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/ConnectionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h?rev=593561&r1=593560&r2=593561&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 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/ConnectionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ConnectionInfo.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;
@@ -101,9 +103,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -170,7 +172,7 @@
 
         ConnectionInfo* info =
             dynamic_cast<ConnectionInfo*>( dataStructure );
-         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut );
         looseMarshalString( info->getClientId(), dataOut );

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=593561&r1=593560&r2=593561&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 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/ConsumerControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ConsumerControl.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;
@@ -85,9 +87,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -139,7 +141,7 @@
 
         ConsumerControl* info =
             dynamic_cast<ConsumerControl*>( dataStructure );
-         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         dataOut->writeBoolean( info->isClose() );
         looseMarshalNestedObject( wireFormat, info->getConsumerId(), dataOut );

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=593561&r1=593560&r2=593561&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 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/ConsumerIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ConsumerId.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;
@@ -79,9 +81,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -126,7 +128,7 @@
 
         ConsumerId* info =
             dynamic_cast<ConsumerId*>( dataStructure );
-         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalString( info->getConnectionId(), dataOut );
         looseMarshalLong( wireFormat, info->getSessionId(), dataOut );

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=593561&r1=593560&r2=593561&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 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/ConsumerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ConsumerInfo.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;
@@ -118,9 +120,9 @@
 
         return rc + 9;
     }
-    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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -207,7 +209,7 @@
 
         ConsumerInfo* info =
             dynamic_cast<ConsumerInfo*>( dataStructure );
-         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
         dataOut->writeBoolean( info->isBrowser() );

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=593561&r1=593560&r2=593561&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 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/ControlCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ControlCommand.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 @@
 
         ControlCommand* info =
             dynamic_cast<ControlCommand*>( dataStructure );
-         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalString( info->getCommand(), dataOut );
     }

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=593561&r1=593560&r2=593561&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 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/DataArrayResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.h>
 
 #include <activemq/connector/openwire/commands/DataArrayResponse.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;
@@ -86,9 +88,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -140,7 +142,7 @@
 
         DataArrayResponse* info =
             dynamic_cast<DataArrayResponse*>( dataStructure );
-         ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalObjectArray( wireFormat, info->getData(), dataOut );
     }

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=593561&r1=593560&r2=593561&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 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/DataResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/DataResponseMarshaller.h>
 
 #include <activemq/connector/openwire/commands/DataResponse.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;
@@ -76,9 +78,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -120,7 +122,7 @@
 
         DataResponse* info =
             dynamic_cast<DataResponse*>( dataStructure );
-         ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalNestedObject( wireFormat, info->getData(), dataOut );
     }

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=593561&r1=593560&r2=593561&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 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/DestinationInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.h>
 
 #include <activemq/connector/openwire/commands/DestinationInfo.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;
@@ -95,9 +97,9 @@
 
         return rc + 1;
     }
-    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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -159,7 +161,7 @@
 
         DestinationInfo* info =
             dynamic_cast<DestinationInfo*>( dataStructure );
-         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut );
         looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );

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=593561&r1=593560&r2=593561&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 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/DiscoveryEventMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.h>
 
 #include <activemq/connector/openwire/commands/DiscoveryEvent.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;
@@ -77,9 +79,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -122,7 +124,7 @@
 
         DiscoveryEvent* info =
             dynamic_cast<DiscoveryEvent*>( dataStructure );
-         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalString( info->getServiceName(), dataOut );
         looseMarshalString( info->getBrokerName(), dataOut );

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=593561&r1=593560&r2=593561&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 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/ExceptionResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.h>
 
 #include <activemq/connector/openwire/commands/ExceptionResponse.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;
@@ -76,9 +78,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -120,7 +122,7 @@
 
         ExceptionResponse* info =
             dynamic_cast<ExceptionResponse*>( dataStructure );
-         ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalBrokerError( wireFormat, info->getException(), dataOut );
     }

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=593561&r1=593560&r2=593561&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 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/FlushCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.h>
 
 #include <activemq/connector/openwire/commands/FlushCommand.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 {
 
-         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

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=593561&r1=593560&r2=593561&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 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/IntegerResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.h>
 
 #include <activemq/connector/openwire/commands/IntegerResponse.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;
@@ -71,9 +73,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -114,7 +116,7 @@
 
         IntegerResponse* info =
             dynamic_cast<IntegerResponse*>( dataStructure );
-         ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         dataOut->writeInt( info->getResult() );
     }

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=593561&r1=593560&r2=593561&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 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/JournalQueueAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.h>
 
 #include <activemq/connector/openwire/commands/JournalQueueAck.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;
@@ -79,9 +81,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -126,7 +128,7 @@
 
         JournalQueueAck* info =
             dynamic_cast<JournalQueueAck*>( dataStructure );
-         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalNestedObject( wireFormat, info->getDestination(), dataOut );
         looseMarshalNestedObject( wireFormat, info->getMessageAck(), dataOut );

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=593561&r1=593560&r2=593561&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 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/JournalTopicAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.cpp Fri Nov  9 07:25:45 2007
@@ -18,6 +18,7 @@
 #include <activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.h>
 
 #include <activemq/connector/openwire/commands/JournalTopicAck.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;
@@ -88,9 +90,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 )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -144,7 +146,7 @@
 
         JournalTopicAck* info =
             dynamic_cast<JournalTopicAck*>( dataStructure );
-         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalNestedObject( wireFormat, info->getDestination(), dataOut );
         looseMarshalNestedObject( wireFormat, info->getMessageId(), dataOut );

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=593561&r1=593560&r2=593561&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 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 );
 
     };
 



Mime
View raw message