You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2009/02/07 00:11:39 UTC

svn commit: r741774 [12/17] - in /activemq/activemq-cpp/trunk/src: main/ main/activemq/commands/ main/activemq/core/ main/activemq/exceptions/ main/activemq/state/ main/activemq/wireformat/openwire/marshal/ main/activemq/wireformat/openwire/marshal/v1/...

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConsumerInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConsumerInfoMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConsumerInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConsumerInfoMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for ConsumerInfoMarshaller
+     * Marshaling code for Open Wire Format for ConsumerInfoMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/ControlCommand.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* ControlCommandMarshaller::createObject() const {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for ControlCommandMarshaller
+     * Marshaling code for Open Wire Format for ControlCommandMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/DataArrayResponse.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* DataArrayResponseMarshaller::createObject() const {
@@ -62,8 +64,8 @@
             short size = dataIn->readShort();
             info->getData().reserve( size );
             for( int i = 0; i < size; i++ ) {
-                info->getData().push_back( dynamic_cast< DataStructure* >(
-                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+                info->getData().push_back( Pointer<DataStructure>( dynamic_cast< DataStructure* >(
+                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
             }
         }
         else {
@@ -122,8 +124,8 @@
             short size = dataIn->readShort();
             info->getData().reserve( size );
             for( int i = 0; i < size; i++ ) {
-                info->getData().push_back( dynamic_cast<DataStructure* >(
-                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+                info->getData().push_back( Pointer<DataStructure>( dynamic_cast<DataStructure* >(
+                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
             }
         }
         else {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for DataArrayResponseMarshaller
+     * Marshaling code for Open Wire Format for DataArrayResponseMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/DataResponse.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* DataResponseMarshaller::createObject() const {
@@ -57,8 +59,8 @@
 
         DataResponse* info =
             dynamic_cast<DataResponse*>( dataStructure );
-        info->setData( dynamic_cast< DataStructure* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setData( Pointer<DataStructure>( dynamic_cast< DataStructure* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -74,7 +76,7 @@
             dynamic_cast<DataResponse*>( dataStructure );
 
         int rc = ResponseMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getData(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getData().get(), bs );
 
         return rc + 0;
     }
@@ -92,7 +94,7 @@
 
         DataResponse* info =
             dynamic_cast<DataResponse*>( dataStructure );
-        tightMarshalNestedObject2( wireFormat, info->getData(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getData().get(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -107,8 +109,8 @@
         ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         DataResponse* info =
             dynamic_cast<DataResponse*>( dataStructure );
-        info->setData( dynamic_cast< DataStructure* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setData( Pointer<DataStructure>( dynamic_cast< DataStructure* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -124,7 +126,7 @@
             dynamic_cast<DataResponse*>( dataStructure );
         ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalNestedObject( wireFormat, info->getData(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getData().get(), dataOut );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for DataResponseMarshaller
+     * Marshaling code for Open Wire Format for DataResponseMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/DestinationInfo.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* DestinationInfoMarshaller::createObject() const {
@@ -57,10 +59,10 @@
 
         DestinationInfo* info =
             dynamic_cast<DestinationInfo*>( dataStructure );
-        info->setConnectionId( dynamic_cast< ConnectionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setOperationType( dataIn->readByte() );
         info->setTimeout( tightUnmarshalLong( wireFormat, dataIn, bs ) );
 
@@ -68,8 +70,8 @@
             short size = dataIn->readShort();
             info->getBrokerPath().reserve( size );
             for( int i = 0; i < size; i++ ) {
-                info->getBrokerPath().push_back( dynamic_cast< BrokerId* >(
-                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+                info->getBrokerPath().push_back( Pointer<BrokerId>( dynamic_cast< BrokerId* >(
+                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
             }
         }
         else {
@@ -90,8 +92,8 @@
             dynamic_cast<DestinationInfo*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
         rc += tightMarshalLong1( wireFormat, info->getTimeout(), bs );
         rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
 
@@ -111,8 +113,8 @@
 
         DestinationInfo* info =
             dynamic_cast<DestinationInfo*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getConnectionId(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getConnectionId().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
         dataOut->write( info->getOperationType() );
         tightMarshalLong2( wireFormat, info->getTimeout(), dataOut, bs );
         tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
@@ -130,10 +132,10 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         DestinationInfo* info =
             dynamic_cast<DestinationInfo*>( dataStructure );
-        info->setConnectionId( dynamic_cast< ConnectionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setOperationType( dataIn->readByte() );
         info->setTimeout( looseUnmarshalLong( wireFormat, dataIn ) );
 
@@ -141,8 +143,8 @@
             short size = dataIn->readShort();
             info->getBrokerPath().reserve( size );
             for( int i = 0; i < size; i++ ) {
-                info->getBrokerPath().push_back( dynamic_cast<BrokerId* >(
-                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+                info->getBrokerPath().push_back( Pointer<BrokerId>( dynamic_cast<BrokerId* >(
+                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
             }
         }
         else {
@@ -163,8 +165,8 @@
             dynamic_cast<DestinationInfo*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getConnectionId().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
         dataOut->write( info->getOperationType() );
         looseMarshalLong( wireFormat, info->getTimeout(), dataOut );
         looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for DestinationInfoMarshaller
+     * Marshaling code for Open Wire Format for DestinationInfoMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/DiscoveryEvent.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* DiscoveryEventMarshaller::createObject() const {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for DiscoveryEventMarshaller
+     * Marshaling code for Open Wire Format for DiscoveryEventMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/ExceptionResponse.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* ExceptionResponseMarshaller::createObject() const {
@@ -57,8 +59,8 @@
 
         ExceptionResponse* info =
             dynamic_cast<ExceptionResponse*>( dataStructure );
-        info->setException( dynamic_cast< BrokerError* >(
-            tightUnmarshalBrokerError( wireFormat, dataIn, bs ) ) );
+        info->setException( Pointer<BrokerError>( dynamic_cast< BrokerError* >(
+            tightUnmarshalBrokerError( wireFormat, dataIn, bs ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -74,7 +76,7 @@
             dynamic_cast<ExceptionResponse*>( dataStructure );
 
         int rc = ResponseMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalBrokerError1( wireFormat, info->getException(), bs );
+        rc += tightMarshalBrokerError1( wireFormat, info->getException().get(), bs );
 
         return rc + 0;
     }
@@ -92,7 +94,7 @@
 
         ExceptionResponse* info =
             dynamic_cast<ExceptionResponse*>( dataStructure );
-        tightMarshalBrokerError2( wireFormat, info->getException(), dataOut, bs );
+        tightMarshalBrokerError2( wireFormat, info->getException().get(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -107,8 +109,8 @@
         ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         ExceptionResponse* info =
             dynamic_cast<ExceptionResponse*>( dataStructure );
-        info->setException( dynamic_cast< BrokerError* >(
-            looseUnmarshalBrokerError( wireFormat, dataIn ) ) );
+        info->setException( Pointer<BrokerError>( dynamic_cast< BrokerError* >(
+            looseUnmarshalBrokerError( wireFormat, dataIn ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -124,7 +126,7 @@
             dynamic_cast<ExceptionResponse*>( dataStructure );
         ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalBrokerError( wireFormat, info->getException(), dataOut );
+        looseMarshalBrokerError( wireFormat, info->getException().get(), dataOut );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for ExceptionResponseMarshaller
+     * Marshaling code for Open Wire Format for ExceptionResponseMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/FlushCommand.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* FlushCommandMarshaller::createObject() const {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for FlushCommandMarshaller
+     * Marshaling code for Open Wire Format for FlushCommandMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/IntegerResponse.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* IntegerResponseMarshaller::createObject() const {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for IntegerResponseMarshaller
+     * Marshaling code for Open Wire Format for IntegerResponseMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/JournalQueueAck.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* JournalQueueAckMarshaller::createObject() const {
@@ -57,10 +59,10 @@
 
         JournalQueueAck* info =
             dynamic_cast<JournalQueueAck*>( dataStructure );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
-        info->setMessageAck( dynamic_cast< MessageAck* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setMessageAck( Pointer<MessageAck>( dynamic_cast< MessageAck* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -76,8 +78,8 @@
             dynamic_cast<JournalQueueAck*>( dataStructure );
 
         int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getDestination(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getMessageAck(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getDestination().get(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getMessageAck().get(), bs );
 
         return rc + 0;
     }
@@ -95,8 +97,8 @@
 
         JournalQueueAck* info =
             dynamic_cast<JournalQueueAck*>( dataStructure );
-        tightMarshalNestedObject2( wireFormat, info->getDestination(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getMessageAck(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getMessageAck().get(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -111,10 +113,10 @@
         BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         JournalQueueAck* info =
             dynamic_cast<JournalQueueAck*>( dataStructure );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
-        info->setMessageAck( dynamic_cast< MessageAck* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+        info->setMessageAck( Pointer<MessageAck>( dynamic_cast< MessageAck* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -130,8 +132,8 @@
             dynamic_cast<JournalQueueAck*>( dataStructure );
         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalNestedObject( wireFormat, info->getDestination(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getMessageAck(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getDestination().get(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getMessageAck().get(), dataOut );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for JournalQueueAckMarshaller
+     * Marshaling code for Open Wire Format for JournalQueueAckMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/JournalTopicAck.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* JournalTopicAckMarshaller::createObject() const {
@@ -57,15 +59,15 @@
 
         JournalTopicAck* info =
             dynamic_cast<JournalTopicAck*>( dataStructure );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
-        info->setMessageId( dynamic_cast< MessageId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
         info->setMessageSequenceId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
         info->setSubscritionName( tightUnmarshalString( dataIn, bs ) );
         info->setClientId( tightUnmarshalString( dataIn, bs ) );
-        info->setTransactionId( dynamic_cast< TransactionId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -81,12 +83,12 @@
             dynamic_cast<JournalTopicAck*>( dataStructure );
 
         int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getDestination(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getMessageId(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getDestination().get(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getMessageId().get(), bs );
         rc += tightMarshalLong1( wireFormat, info->getMessageSequenceId(), bs );
         rc += tightMarshalString1( info->getSubscritionName(), bs );
         rc += tightMarshalString1( info->getClientId(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getTransactionId(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getTransactionId().get(), bs );
 
         return rc + 0;
     }
@@ -104,12 +106,12 @@
 
         JournalTopicAck* info =
             dynamic_cast<JournalTopicAck*>( dataStructure );
-        tightMarshalNestedObject2( wireFormat, info->getDestination(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getMessageId(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getMessageId().get(), dataOut, bs );
         tightMarshalLong2( wireFormat, info->getMessageSequenceId(), dataOut, bs );
         tightMarshalString2( info->getSubscritionName(), dataOut, bs );
         tightMarshalString2( info->getClientId(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getTransactionId(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getTransactionId().get(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -124,15 +126,15 @@
         BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         JournalTopicAck* info =
             dynamic_cast<JournalTopicAck*>( dataStructure );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
-        info->setMessageId( dynamic_cast< MessageId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+        info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
         info->setMessageSequenceId( looseUnmarshalLong( wireFormat, dataIn ) );
         info->setSubscritionName( looseUnmarshalString( dataIn ) );
         info->setClientId( looseUnmarshalString( dataIn ) );
-        info->setTransactionId( dynamic_cast< TransactionId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -148,12 +150,12 @@
             dynamic_cast<JournalTopicAck*>( dataStructure );
         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalNestedObject( wireFormat, info->getDestination(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getMessageId(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getDestination().get(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getMessageId().get(), dataOut );
         looseMarshalLong( wireFormat, info->getMessageSequenceId(), dataOut );
         looseMarshalString( info->getSubscritionName(), dataOut );
         looseMarshalString( info->getClientId(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getTransactionId(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getTransactionId().get(), dataOut );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for JournalTopicAckMarshaller
+     * Marshaling code for Open Wire Format for JournalTopicAckMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/JournalTrace.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* JournalTraceMarshaller::createObject() const {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for JournalTraceMarshaller
+     * Marshaling code for Open Wire Format for JournalTraceMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/JournalTransaction.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* JournalTransactionMarshaller::createObject() const {
@@ -57,8 +59,8 @@
 
         JournalTransaction* info =
             dynamic_cast<JournalTransaction*>( dataStructure );
-        info->setTransactionId( dynamic_cast< TransactionId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
         info->setType( dataIn->readByte() );
         info->setWasPrepared( bs->readBoolean() );
     }
@@ -76,7 +78,7 @@
             dynamic_cast<JournalTransaction*>( dataStructure );
 
         int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getTransactionId(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getTransactionId().get(), bs );
         bs->writeBoolean( info->getWasPrepared() );
 
         return rc + 1;
@@ -95,7 +97,7 @@
 
         JournalTransaction* info =
             dynamic_cast<JournalTransaction*>( dataStructure );
-        tightMarshalNestedObject2( wireFormat, info->getTransactionId(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getTransactionId().get(), dataOut, bs );
         dataOut->write( info->getType() );
         bs->readBoolean();
     }
@@ -112,8 +114,8 @@
         BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         JournalTransaction* info =
             dynamic_cast<JournalTransaction*>( dataStructure );
-        info->setTransactionId( dynamic_cast< TransactionId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
         info->setType( dataIn->readByte() );
         info->setWasPrepared( dataIn->readBoolean() );
     }
@@ -131,7 +133,7 @@
             dynamic_cast<JournalTransaction*>( dataStructure );
         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalNestedObject( wireFormat, info->getTransactionId(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getTransactionId().get(), dataOut );
         dataOut->write( info->getType() );
         dataOut->writeBoolean( info->getWasPrepared() );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for JournalTransactionMarshaller
+     * Marshaling code for Open Wire Format for JournalTransactionMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/KeepAliveInfo.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* KeepAliveInfoMarshaller::createObject() const {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for KeepAliveInfoMarshaller
+     * Marshaling code for Open Wire Format for KeepAliveInfoMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/LastPartialCommand.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* LastPartialCommandMarshaller::createObject() const {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for LastPartialCommandMarshaller
+     * Marshaling code for Open Wire Format for LastPartialCommandMarshaller
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
@@ -59,14 +59,14 @@
         virtual commands::DataStructure* createObject() const;
 
         /**
-         * Get the Data Structure Type that identifies this Marshaller
+         * Get the Data Structure Type that identifies this Marshaler
          * @return byte holding the data structure type value
          */
         virtual unsigned char getDataStructureType() const;
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -78,7 +78,7 @@
 
         /**
          * Write the booleans that this object uses to a BooleanStream
-         * @param wireFormat - describis the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param bs - BooleanStream
          * @returns int
@@ -89,7 +89,7 @@
 
         /**
          * Write a object instance to data output stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataOut - BinaryReader that provides that data sink
          * @param bs - BooleanStream
@@ -101,7 +101,7 @@
 
         /**
          * Un-marshal an object instance from the data input stream
-         * @param wireFormat - describs the wire format of the broker
+         * @param wireFormat - describes the wire format of the broker
          * @param o - Object to be marshaled
          * @param dataIn - BinaryReader that provides that data source
          */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/LocalTransactionId.h>
 #include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
 
 //
 //     NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
 using namespace activemq::wireformat::openwire::marshal::v2;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* LocalTransactionIdMarshaller::createObject() const {
@@ -58,8 +60,8 @@
         LocalTransactionId* info =
             dynamic_cast<LocalTransactionId*>( dataStructure );
         info->setValue( tightUnmarshalLong( wireFormat, dataIn, bs ) );
-        info->setConnectionId( dynamic_cast< ConnectionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -76,7 +78,7 @@
 
         int rc = TransactionIdMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
         rc += tightMarshalLong1( wireFormat, info->getValue(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId().get(), bs );
 
         return rc + 0;
     }
@@ -95,7 +97,7 @@
         LocalTransactionId* info =
             dynamic_cast<LocalTransactionId*>( dataStructure );
         tightMarshalLong2( wireFormat, info->getValue(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getConnectionId(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getConnectionId().get(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -111,8 +113,8 @@
         LocalTransactionId* info =
             dynamic_cast<LocalTransactionId*>( dataStructure );
         info->setValue( looseUnmarshalLong( wireFormat, dataIn ) );
-        info->setConnectionId( dynamic_cast< ConnectionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -129,7 +131,7 @@
         TransactionIdMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalLong( wireFormat, info->getValue(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getConnectionId().get(), dataOut );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )