activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r474108 [5/10] - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main: ./ activemq/connector/openwire/commands/ activemq/connector/openwire/marshal/ activemq/connector/openwire/marshal/v2/
Date Mon, 13 Nov 2006 00:46:30 GMT
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/V2/BaseDataStreamMarshaller.h>
+#include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
 #include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
 
 namespace activemq{
 namespace connector{
@@ -55,7 +56,7 @@
          * Creates a new instance of this marshalable type.
          * @return new DataStructure object pointer caller owns it.
          */
-        virtual DataStructure* createObject() const;
+        virtual commands::DataStructure* createObject() const;
 
         /**
          * Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      io::DataInputStream* dataIn,
-                                     util::BooleanStream* bs ) throws( io::IOException );
+                                     utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   BooleanStream* bs ) throws( io::IOException );
+                                   utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     io::DataOutputStream* dataOut,
-                                    BooleanStream* bs ) throws( io::IOException );
+                                    utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throws( io::IOException );
+                                     io::DataInputStream* dataIn ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -116,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throws( io::IOException );
+                                   io::DataOutputStream* dataOut ) throw( io::IOException );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,16 +46,16 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BrokerIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void BrokerIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
    BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
     BrokerId* info =
         dynamic_cast<BrokerId*>( dataStructure );
-    info->setValue( TightUnmarshalString( dataIn, bs ) );
+    info->setValue( tightUnmarshalString( dataIn, bs ) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int BrokerIdMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int BrokerIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
 
     BrokerId* info =
         dynamic_cast<BrokerId*>( dataStructure );
@@ -67,7 +67,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BrokerIdMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void BrokerIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
 
     BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
@@ -77,7 +77,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BrokerIdMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void BrokerIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
     BrokerId* info = 
         dynamic_cast<BrokerId*>( dataStructure );
@@ -85,7 +85,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BrokerIdMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void BrokerIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
     BrokerId* info =
         dynamic_cast<BrokerId*>( dataStructure );
     BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/V2/BaseDataStreamMarshaller.h>
+#include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
 #include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
 
 namespace activemq{
 namespace connector{
@@ -55,7 +56,7 @@
          * Creates a new instance of this marshalable type.
          * @return new DataStructure object pointer caller owns it.
          */
-        virtual DataStructure* createObject() const;
+        virtual commands::DataStructure* createObject() const;
 
         /**
          * Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      io::DataInputStream* dataIn,
-                                     util::BooleanStream* bs ) throws( io::IOException );
+                                     utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   BooleanStream* bs ) throws( io::IOException );
+                                   utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     io::DataOutputStream* dataOut,
-                                    BooleanStream* bs ) throws( io::IOException );
+                                    utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throws( io::IOException );
+                                     io::DataInputStream* dataIn ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -116,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throws( io::IOException );
+                                   io::DataOutputStream* dataOut ) throw( io::IOException );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,47 +46,43 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BrokerInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void BrokerInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
    BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
     BrokerInfo* info =
         dynamic_cast<BrokerInfo*>( dataStructure );
     info->setBrokerId( dynamic_cast< BrokerId* >(
-        tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
-    info->setBrokerURL( TightUnmarshalString( dataIn, bs ) );
+        tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+    info->setBrokerURL( tightUnmarshalString( dataIn, bs ) );
 
     if( bs->readBoolean() ) {
         short size = dataIn->readShort();
-        BrokerInfo* value = new BrokerInfo[size];
+        info->getPeerBrokerInfos().reserve( size );
         for( int i = 0; i < size; i++ ) {
-            value[i] = dynamic_cast< BrokerInfo* >(
-                tightUnmarsalNestedObject( wireFormat, dataIn, bs ) );
+            info->getPeerBrokerInfos().push_back( dynamic_cast< BrokerInfo* >(
+                tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
         }
-        info->setPeerBrokerInfos( value );
     }
     else {
-        info->setPeerBrokerInfos( NULL );
+        info->getPeerBrokerInfos().clear();
     }
-    info->setBrokerName( TightUnmarshalString( dataIn, bs ) );
+    info->setBrokerName( tightUnmarshalString( dataIn, bs ) );
     info->setSlaveBroker( bs->readBoolean() );
     info->setMasterBroker( bs->readBoolean() );
     info->setFaultTolerantConfiguration( bs->readBoolean() );
     info->setDuplexConnection( bs->readBoolean() );
     info->setNetworkConnection( bs->readBoolean() );
-    info->setConnectionId( TightUnmarshalLong( wireFormat, dataIn, bs ) );
+    info->setConnectionId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int BrokerInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int BrokerInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
 
     BrokerInfo* info =
         dynamic_cast<BrokerInfo*>( dataStructure );
 
     int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getBrokerId() );
-
-    rc += tightMarshalCachedObject1( wireFormat, data, bs );
+    rc += tightMarshalCachedObject1( wireFormat, info->getBrokerId(), bs );
     rc += tightMarshalString1( info->getBrokerURL(), bs );
     rc += tightMarshalObjectArray1( wireFormat, info->getPeerBrokerInfos(), bs );
     rc += tightMarshalString1( info->getBrokerName(), bs );
@@ -101,16 +97,13 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BrokerInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void BrokerInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
 
     BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
     BrokerInfo* info =
         dynamic_cast<BrokerInfo*>( dataStructure );
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getBrokerId() );
-
-    tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
+    tightMarshalCachedObject2( wireFormat, info->getBrokerId(), dataOut, bs );
     tightMarshalString2( info->getBrokerURL(), dataOut, bs );
     tightMarshalObjectArray2( wireFormat, info->getPeerBrokerInfos(), dataOut, bs );
     tightMarshalString2( info->getBrokerName(), dataOut, bs );
@@ -123,25 +116,24 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BrokerInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void BrokerInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
     BrokerInfo* info = 
         dynamic_cast<BrokerInfo*>( dataStructure );
-   info->setBrokerId( dynamic_cast<BrokerId* >( 
-       looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+    info->setBrokerId( dynamic_cast< BrokerId* >( 
+        looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
     info->setBrokerURL( looseUnmarshalString( dataIn ) );
 
     if( dataIn->readBoolean() ) {
         short size = dataIn->readShort();
-        BrokerInfo* value = new BrokerInfo[size];
+        info->getPeerBrokerInfos().reserve( size );
         for( int i = 0; i < size; i++ ) {
-            value[i] = dynamic_cast<BrokerInfo* >(
-                looseUnmarshalNestedObject( wireFormat,dataIn ) );
+            info->getPeerBrokerInfos().push_back( dynamic_cast<BrokerInfo* >(
+                looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
         }
-        info->setPeerBrokerInfos( value );
     }
     else {
-        info->setPeerBrokerInfos( NULL );
+        info->getPeerBrokerInfos().clear();
     }
     info->setBrokerName( looseUnmarshalString( dataIn ) );
     info->setSlaveBroker( dataIn->readBoolean() );
@@ -153,15 +145,12 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BrokerInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void BrokerInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
     BrokerInfo* info =
         dynamic_cast<BrokerInfo*>( dataStructure );
     BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getBrokerId() );
-
-    looseMarshalCachedObject( wireFormat, data, dataOut );
+    looseMarshalCachedObject( wireFormat, info->getBrokerId(), dataOut );
     looseMarshalString( info->getBrokerURL(), dataOut );
     looseMarshalObjectArray( wireFormat, info->getPeerBrokerInfos(), dataOut );
     looseMarshalString( info->getBrokerName(), dataOut );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/V2/BaseCommandMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
 #include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
 
 namespace activemq{
 namespace connector{
@@ -55,7 +56,7 @@
          * Creates a new instance of this marshalable type.
          * @return new DataStructure object pointer caller owns it.
          */
-        virtual DataStructure* createObject() const;
+        virtual commands::DataStructure* createObject() const;
 
         /**
          * Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      io::DataInputStream* dataIn,
-                                     util::BooleanStream* bs ) throws( io::IOException );
+                                     utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   BooleanStream* bs ) throws( io::IOException );
+                                   utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     io::DataOutputStream* dataOut,
-                                    BooleanStream* bs ) throws( io::IOException );
+                                    utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throws( io::IOException );
+                                     io::DataInputStream* dataIn ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -116,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throws( io::IOException );
+                                   io::DataOutputStream* dataOut ) throw( io::IOException );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionControlMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ConnectionControlMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
    BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
     ConnectionControl* info =
@@ -59,7 +59,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ConnectionControlMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ConnectionControlMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
 
     ConnectionControl* info =
         dynamic_cast<ConnectionControl*>( dataStructure );
@@ -75,7 +75,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionControlMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ConnectionControlMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
 
     BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
@@ -89,7 +89,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionControlMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ConnectionControlMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
     ConnectionControl* info = 
         dynamic_cast<ConnectionControl*>( dataStructure );
@@ -101,7 +101,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionControlMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ConnectionControlMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
     ConnectionControl* info =
         dynamic_cast<ConnectionControl*>( dataStructure );
     BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/V2/BaseCommandMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
 #include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
 
 namespace activemq{
 namespace connector{
@@ -55,7 +56,7 @@
          * Creates a new instance of this marshalable type.
          * @return new DataStructure object pointer caller owns it.
          */
-        virtual DataStructure* createObject() const;
+        virtual commands::DataStructure* createObject() const;
 
         /**
          * Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      io::DataInputStream* dataIn,
-                                     util::BooleanStream* bs ) throws( io::IOException );
+                                     utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   BooleanStream* bs ) throws( io::IOException );
+                                   utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     io::DataOutputStream* dataOut,
-                                    BooleanStream* bs ) throws( io::IOException );
+                                    utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throws( io::IOException );
+                                     io::DataInputStream* dataIn ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -116,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throws( io::IOException );
+                                   io::DataOutputStream* dataOut ) throw( io::IOException );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,67 +46,59 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionErrorMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ConnectionErrorMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
    BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
     ConnectionError* info =
         dynamic_cast<ConnectionError*>( dataStructure );
-    info->setException( dynamic_cast< Throwable* >(
-        tightUnmarsalThrowable( wireFormat, dataIn, bs ) );
+    info->setException( dynamic_cast< BrokerError* >(
+        tightUnmarshalBrokerError( wireFormat, dataIn, bs ) ) );
     info->setConnectionId( dynamic_cast< ConnectionId* >(
-        tightUnmarsalNestedObject( wireFormat, dataIn, bs ) );
+        tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ConnectionErrorMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ConnectionErrorMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
 
     ConnectionError* info =
         dynamic_cast<ConnectionError*>( dataStructure );
 
     int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
     rc += tightMarshalBrokerError1( wireFormat, info->getException(), bs );
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getConnectionId() );
-
-    rc += tightMarshalNestedObject1( wireFormat, data, bs );
+    rc += tightMarshalNestedObject1( wireFormat, info->getConnectionId(), bs );
 
     return rc + 0;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionErrorMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ConnectionErrorMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
 
     BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
     ConnectionError* info =
         dynamic_cast<ConnectionError*>( dataStructure );
     tightMarshalBrokerError2( wireFormat, info->getException(), dataOut, bs );
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getConnectionId() );
-
-    tightMarshalNestedObject2( wireFormat, data, dataOut, bs );
+    tightMarshalNestedObject2( wireFormat, info->getConnectionId(), dataOut, bs );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionErrorMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ConnectionErrorMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
     ConnectionError* info = 
         dynamic_cast<ConnectionError*>( dataStructure );
-    info->setException( looseUnmarshalBrokerError( wireFormat, dataIn ) );
-   info->setConnectionId( dynamic_cast<ConnectionId* >( 
-       looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+    info->setException( dynamic_cast< BrokerError* >(
+        looseUnmarshalBrokerError( wireFormat, dataIn ) ) );
+    info->setConnectionId( dynamic_cast< ConnectionId* >( 
+        looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionErrorMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ConnectionErrorMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
     ConnectionError* info =
         dynamic_cast<ConnectionError*>( dataStructure );
     BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     looseMarshalBrokerError( wireFormat, info->getException(), dataOut );
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getConnectionId() );
-
-    looseMarshalNestedObject( wireFormat, data, dataOut );
+    looseMarshalNestedObject( wireFormat, info->getConnectionId(), dataOut );
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/V2/BaseCommandMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
 #include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
 
 namespace activemq{
 namespace connector{
@@ -55,7 +56,7 @@
          * Creates a new instance of this marshalable type.
          * @return new DataStructure object pointer caller owns it.
          */
-        virtual DataStructure* createObject() const;
+        virtual commands::DataStructure* createObject() const;
 
         /**
          * Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      io::DataInputStream* dataIn,
-                                     util::BooleanStream* bs ) throws( io::IOException );
+                                     utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   BooleanStream* bs ) throws( io::IOException );
+                                   utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     io::DataOutputStream* dataOut,
-                                    BooleanStream* bs ) throws( io::IOException );
+                                    utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throws( io::IOException );
+                                     io::DataInputStream* dataIn ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -116,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throws( io::IOException );
+                                   io::DataOutputStream* dataOut ) throw( io::IOException );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,16 +46,16 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ConnectionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
    BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
     ConnectionId* info =
         dynamic_cast<ConnectionId*>( dataStructure );
-    info->setValue( TightUnmarshalString( dataIn, bs ) );
+    info->setValue( tightUnmarshalString( dataIn, bs ) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ConnectionIdMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ConnectionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
 
     ConnectionId* info =
         dynamic_cast<ConnectionId*>( dataStructure );
@@ -67,7 +67,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionIdMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ConnectionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
 
     BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
@@ -77,7 +77,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionIdMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ConnectionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
     ConnectionId* info = 
         dynamic_cast<ConnectionId*>( dataStructure );
@@ -85,7 +85,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionIdMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ConnectionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
     ConnectionId* info =
         dynamic_cast<ConnectionId*>( dataStructure );
     BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/V2/BaseDataStreamMarshaller.h>
+#include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
 #include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
 
 namespace activemq{
 namespace connector{
@@ -55,7 +56,7 @@
          * Creates a new instance of this marshalable type.
          * @return new DataStructure object pointer caller owns it.
          */
-        virtual DataStructure* createObject() const;
+        virtual commands::DataStructure* createObject() const;
 
         /**
          * Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      io::DataInputStream* dataIn,
-                                     util::BooleanStream* bs ) throws( io::IOException );
+                                     utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   BooleanStream* bs ) throws( io::IOException );
+                                   utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     io::DataOutputStream* dataOut,
-                                    BooleanStream* bs ) throws( io::IOException );
+                                    utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throws( io::IOException );
+                                     io::DataInputStream* dataIn ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -116,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throws( io::IOException );
+                                   io::DataOutputStream* dataOut ) throw( io::IOException );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,28 +46,27 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ConnectionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
    BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
     ConnectionInfo* info =
         dynamic_cast<ConnectionInfo*>( dataStructure );
     info->setConnectionId( dynamic_cast< ConnectionId* >(
-        tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
-    info->setClientId( TightUnmarshalString( dataIn, bs ) );
-    info->setPassword( TightUnmarshalString( dataIn, bs ) );
-    info->setUserName( TightUnmarshalString( dataIn, bs ) );
+        tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+    info->setClientId( tightUnmarshalString( dataIn, bs ) );
+    info->setPassword( tightUnmarshalString( dataIn, bs ) );
+    info->setUserName( tightUnmarshalString( dataIn, bs ) );
 
     if( bs->readBoolean() ) {
         short size = dataIn->readShort();
-        BrokerId* value = new BrokerId[size];
+        info->getBrokerPath().reserve( size );
         for( int i = 0; i < size; i++ ) {
-            value[i] = dynamic_cast< BrokerId* >(
-                tightUnmarsalNestedObject( wireFormat, dataIn, bs ) );
+            info->getBrokerPath().push_back( dynamic_cast< BrokerId* >(
+                tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
         }
-        info->setBrokerPath( value );
     }
     else {
-        info->setBrokerPath( NULL );
+        info->getBrokerPath().clear();
     }
     info->setBrokerMasterConnector( bs->readBoolean() );
     info->setManageable( bs->readBoolean() );
@@ -75,16 +74,13 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ConnectionInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ConnectionInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
 
     ConnectionInfo* info =
         dynamic_cast<ConnectionInfo*>( dataStructure );
 
     int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getConnectionId() );
-
-    rc += tightMarshalCachedObject1( wireFormat, data, bs );
+    rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId(), bs );
     rc += tightMarshalString1( info->getClientId(), bs );
     rc += tightMarshalString1( info->getPassword(), bs );
     rc += tightMarshalString1( info->getUserName(), bs );
@@ -97,16 +93,13 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ConnectionInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
 
     BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
     ConnectionInfo* info =
         dynamic_cast<ConnectionInfo*>( dataStructure );
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getConnectionId() );
-
-    tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
+    tightMarshalCachedObject2( wireFormat, info->getConnectionId(), dataOut, bs );
     tightMarshalString2( info->getClientId(), dataOut, bs );
     tightMarshalString2( info->getPassword(), dataOut, bs );
     tightMarshalString2( info->getUserName(), dataOut, bs );
@@ -117,27 +110,26 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ConnectionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
     ConnectionInfo* info = 
         dynamic_cast<ConnectionInfo*>( dataStructure );
-   info->setConnectionId( dynamic_cast<ConnectionId* >( 
-       looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+    info->setConnectionId( dynamic_cast< ConnectionId* >( 
+        looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
     info->setClientId( looseUnmarshalString( dataIn ) );
     info->setPassword( looseUnmarshalString( dataIn ) );
     info->setUserName( looseUnmarshalString( dataIn ) );
 
     if( dataIn->readBoolean() ) {
         short size = dataIn->readShort();
-        BrokerId* value = new BrokerId[size];
+        info->getBrokerPath().reserve( size );
         for( int i = 0; i < size; i++ ) {
-            value[i] = dynamic_cast<BrokerId* >(
-                looseUnmarshalNestedObject( wireFormat,dataIn ) );
+            info->getBrokerPath().push_back( dynamic_cast<BrokerId* >(
+                looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
         }
-        info->setBrokerPath( value );
     }
     else {
-        info->setBrokerPath( NULL );
+        info->getBrokerPath().clear();
     }
     info->setBrokerMasterConnector( dataIn->readBoolean() );
     info->setManageable( dataIn->readBoolean() );
@@ -145,15 +137,12 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConnectionInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ConnectionInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
     ConnectionInfo* info =
         dynamic_cast<ConnectionInfo*>( dataStructure );
     BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getConnectionId() );
-
-    looseMarshalCachedObject( wireFormat, data, dataOut );
+    looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut );
     looseMarshalString( info->getClientId(), dataOut );
     looseMarshalString( info->getPassword(), dataOut );
     looseMarshalString( info->getUserName(), dataOut );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/V2/BaseCommandMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
 #include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
 
 namespace activemq{
 namespace connector{
@@ -55,7 +56,7 @@
          * Creates a new instance of this marshalable type.
          * @return new DataStructure object pointer caller owns it.
          */
-        virtual DataStructure* createObject() const;
+        virtual commands::DataStructure* createObject() const;
 
         /**
          * Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      io::DataInputStream* dataIn,
-                                     util::BooleanStream* bs ) throws( io::IOException );
+                                     utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   BooleanStream* bs ) throws( io::IOException );
+                                   utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     io::DataOutputStream* dataOut,
-                                    BooleanStream* bs ) throws( io::IOException );
+                                    utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throws( io::IOException );
+                                     io::DataInputStream* dataIn ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -116,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throws( io::IOException );
+                                   io::DataOutputStream* dataOut ) throw( io::IOException );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,14 +46,14 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerControlMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ConsumerControlMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
    BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
     ConsumerControl* info =
         dynamic_cast<ConsumerControl*>( dataStructure );
     info->setClose( bs->readBoolean() );
     info->setConsumerId( dynamic_cast< ConsumerId* >(
-        tightUnmarsalNestedObject( wireFormat, dataIn, bs ) );
+        tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
     info->setPrefetch( dataIn->readInt() );
     info->setFlush( bs->readBoolean() );
     info->setStart( bs->readBoolean() );
@@ -61,17 +61,14 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ConsumerControlMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ConsumerControlMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
 
     ConsumerControl* info =
         dynamic_cast<ConsumerControl*>( dataStructure );
 
     int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
     bs->writeBoolean( info->isClose() );
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getConsumerId() );
-
-    rc += tightMarshalNestedObject1( wireFormat, data, bs );
+    rc += tightMarshalNestedObject1( wireFormat, info->getConsumerId(), bs );
     bs->writeBoolean( info->isFlush() );
     bs->writeBoolean( info->isStart() );
     bs->writeBoolean( info->isStop() );
@@ -80,17 +77,14 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerControlMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ConsumerControlMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
 
     BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
     ConsumerControl* info =
         dynamic_cast<ConsumerControl*>( dataStructure );
     bs->readBoolean();
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getConsumerId() );
-
-    tightMarshalNestedObject2( wireFormat, data, dataOut, bs );
+    tightMarshalNestedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
     dataOut->write( info->getPrefetch() );
     bs->readBoolean();
     bs->readBoolean();
@@ -98,13 +92,13 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerControlMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ConsumerControlMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
     BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
     ConsumerControl* info = 
         dynamic_cast<ConsumerControl*>( dataStructure );
     info->setClose( dataIn->readBoolean() );
-   info->setConsumerId( dynamic_cast<ConsumerId* >( 
-       looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+    info->setConsumerId( dynamic_cast< ConsumerId* >( 
+        looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
     info->setPrefetch( dataIn->readInt() );
     info->setFlush( dataIn->readBoolean() );
     info->setStart( dataIn->readBoolean() );
@@ -112,16 +106,13 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerControlMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ConsumerControlMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
     ConsumerControl* info =
         dynamic_cast<ConsumerControl*>( dataStructure );
     BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     dataOut->write( info->isClose() );
-    DataStructure* data = 
-        dynamic_cast< DataStructure* >( info->getConsumerId() );
-
-    looseMarshalNestedObject( wireFormat, data, dataOut );
+    looseMarshalNestedObject( wireFormat, info->getConsumerId(), dataOut );
     dataOut->write( info->getPrefetch() );
     dataOut->write( info->isFlush() );
     dataOut->write( info->isStart() );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/V2/BaseCommandMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
 #include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
 
 namespace activemq{
 namespace connector{
@@ -55,7 +56,7 @@
          * Creates a new instance of this marshalable type.
          * @return new DataStructure object pointer caller owns it.
          */
-        virtual DataStructure* createObject() const;
+        virtual commands::DataStructure* createObject() const;
 
         /**
          * Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      io::DataInputStream* dataIn,
-                                     util::BooleanStream* bs ) throws( io::IOException );
+                                     utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   BooleanStream* bs ) throws( io::IOException );
+                                   utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     io::DataOutputStream* dataOut,
-                                    BooleanStream* bs ) throws( io::IOException );
+                                    utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throws( io::IOException );
+                                     io::DataInputStream* dataIn ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -116,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throws( io::IOException );
+                                   io::DataOutputStream* dataOut ) throw( io::IOException );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,18 +46,18 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ConsumerIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
    BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
     ConsumerId* info =
         dynamic_cast<ConsumerId*>( dataStructure );
-    info->setConnectionId( TightUnmarshalString( dataIn, bs ) );
-    info->setSessionId( TightUnmarshalLong( wireFormat, dataIn, bs ) );
-    info->setValue( TightUnmarshalLong( wireFormat, dataIn, bs ) );
+    info->setConnectionId( tightUnmarshalString( dataIn, bs ) );
+    info->setSessionId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
+    info->setValue( tightUnmarshalLong( wireFormat, dataIn, bs ) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ConsumerIdMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ConsumerIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
 
     ConsumerId* info =
         dynamic_cast<ConsumerId*>( dataStructure );
@@ -71,7 +71,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerIdMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ConsumerIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
 
     BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
@@ -83,7 +83,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerIdMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ConsumerIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
     BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
     ConsumerId* info = 
         dynamic_cast<ConsumerId*>( dataStructure );
@@ -93,7 +93,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ConsumerIdMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ConsumerIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
     ConsumerId* info =
         dynamic_cast<ConsumerId*>( dataStructure );
     BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/V2/BaseDataStreamMarshaller.h>
+#include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
 #include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
 
 namespace activemq{
 namespace connector{
@@ -55,7 +56,7 @@
          * Creates a new instance of this marshalable type.
          * @return new DataStructure object pointer caller owns it.
          */
-        virtual DataStructure* createObject() const;
+        virtual commands::DataStructure* createObject() const;
 
         /**
          * Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
         virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
                                      io::DataInputStream* dataIn,
-                                     util::BooleanStream* bs ) throws( io::IOException );
+                                     utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
          */
         virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   BooleanStream* bs ) throws( io::IOException );
+                                   utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -96,7 +97,7 @@
         virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
                                     io::DataOutputStream* dataOut,
-                                    BooleanStream* bs ) throws( io::IOException );
+                                    utils::BooleanStream* bs ) throw( io::IOException );
 
         /**
          * Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
          */
         virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn ) throws( io::IOException );
+                                     io::DataInputStream* dataIn ) throw( io::IOException );
 
         /**
          * Write a object instance to data output stream
@@ -116,7 +117,7 @@
          */
         virtual void looseMarshal( OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   io::DataOutputStream* dataOut ) throws( io::IOException );
+                                   io::DataOutputStream* dataOut ) throw( io::IOException );
 
     };
 



Mime
View raw message