activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r741774 [13/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/...
Date Fri, 06 Feb 2009 23:11:39 GMT
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller
+     * Marshaling code for Open Wire Format for LocalTransactionIdMarshaller
      *
-     *  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/MarshallerFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MarshallerFactory.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MarshallerFactory.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MarshallerFactory.h Fri Feb  6 23:11:28 2009
@@ -34,7 +34,7 @@
      * Used to create marshallers for a specific version of the wire
      * protocol.
      *
-     *  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 Groovy scripts
      *         in the activemq-openwire-generator module
      */

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/MessageAck.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* MessageAckMarshaller::createObject() const {
@@ -57,17 +59,17 @@
 
         MessageAck* info =
             dynamic_cast<MessageAck*>( dataStructure );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setTransactionId( dynamic_cast< TransactionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setConsumerId( dynamic_cast< ConsumerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setAckType( dataIn->readByte() );
-        info->setFirstMessageId( dynamic_cast< MessageId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
-        info->setLastMessageId( dynamic_cast< MessageId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setFirstMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setLastMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
         info->setMessageCount( dataIn->readInt() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -84,11 +86,11 @@
             dynamic_cast<MessageAck*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getTransactionId(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getFirstMessageId(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getLastMessageId(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getTransactionId().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId().get(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getFirstMessageId().get(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getLastMessageId().get(), bs );
 
         return rc + 5;
     }
@@ -106,12 +108,12 @@
 
         MessageAck* info =
             dynamic_cast<MessageAck*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getTransactionId(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getTransactionId().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getConsumerId().get(), dataOut, bs );
         dataOut->write( info->getAckType() );
-        tightMarshalNestedObject2( wireFormat, info->getFirstMessageId(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getLastMessageId(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getFirstMessageId().get(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getLastMessageId().get(), dataOut, bs );
         dataOut->writeInt( info->getMessageCount() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -127,17 +129,17 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         MessageAck* info =
             dynamic_cast<MessageAck*>( dataStructure );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setTransactionId( dynamic_cast< TransactionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setConsumerId( dynamic_cast< ConsumerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setAckType( dataIn->readByte() );
-        info->setFirstMessageId( dynamic_cast< MessageId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
-        info->setLastMessageId( dynamic_cast< MessageId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setFirstMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+        info->setLastMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
         info->setMessageCount( dataIn->readInt() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -154,12 +156,12 @@
             dynamic_cast<MessageAck*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getTransactionId(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getTransactionId().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getConsumerId().get(), dataOut );
         dataOut->write( info->getAckType() );
-        looseMarshalNestedObject( wireFormat, info->getFirstMessageId(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getLastMessageId(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getFirstMessageId().get(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getLastMessageId().get(), dataOut );
         dataOut->writeInt( info->getMessageCount() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for MessageAckMarshaller
+     * Marshaling code for Open Wire Format for MessageAckMarshaller
      *
-     *  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/MessageDispatchMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/MessageDispatch.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* MessageDispatchMarshaller::createObject() const {
@@ -57,12 +59,12 @@
 
         MessageDispatch* info =
             dynamic_cast<MessageDispatch*>( dataStructure );
-        info->setConsumerId( dynamic_cast< ConsumerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setMessage( dynamic_cast< Message* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setMessage( Pointer<Message>( dynamic_cast< Message* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
         info->setRedeliveryCounter( dataIn->readInt() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -79,9 +81,9 @@
             dynamic_cast<MessageDispatch*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getMessage(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getMessage().get(), bs );
 
         return rc + 4;
     }
@@ -99,9 +101,9 @@
 
         MessageDispatch* info =
             dynamic_cast<MessageDispatch*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getMessage(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getConsumerId().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getMessage().get(), dataOut, bs );
         dataOut->writeInt( info->getRedeliveryCounter() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -117,12 +119,12 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         MessageDispatch* info =
             dynamic_cast<MessageDispatch*>( dataStructure );
-        info->setConsumerId( dynamic_cast< ConsumerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setMessage( dynamic_cast< Message* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setMessage( Pointer<Message>( dynamic_cast< Message* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
         info->setRedeliveryCounter( dataIn->readInt() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -139,9 +141,9 @@
             dynamic_cast<MessageDispatch*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getMessage(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getConsumerId().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getMessage().get(), dataOut );
         dataOut->writeInt( info->getRedeliveryCounter() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for MessageDispatchMarshaller
+     * Marshaling code for Open Wire Format for MessageDispatchMarshaller
      *
-     *  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/MessageDispatchNotificationMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/MessageDispatchNotification.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* MessageDispatchNotificationMarshaller::createObject() const {
@@ -57,13 +59,13 @@
 
         MessageDispatchNotification* info =
             dynamic_cast<MessageDispatchNotification*>( dataStructure );
-        info->setConsumerId( dynamic_cast< ConsumerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setDeliverySequenceId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
-        info->setMessageId( dynamic_cast< MessageId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -79,10 +81,10 @@
             dynamic_cast<MessageDispatchNotification*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
         rc += tightMarshalLong1( wireFormat, info->getDeliverySequenceId(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getMessageId(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getMessageId().get(), bs );
 
         return rc + 0;
     }
@@ -100,10 +102,10 @@
 
         MessageDispatchNotification* info =
             dynamic_cast<MessageDispatchNotification*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getConsumerId().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
         tightMarshalLong2( wireFormat, info->getDeliverySequenceId(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getMessageId(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getMessageId().get(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -118,13 +120,13 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         MessageDispatchNotification* info =
             dynamic_cast<MessageDispatchNotification*>( dataStructure );
-        info->setConsumerId( dynamic_cast< ConsumerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setDeliverySequenceId( looseUnmarshalLong( wireFormat, dataIn ) );
-        info->setMessageId( dynamic_cast< MessageId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -140,10 +142,10 @@
             dynamic_cast<MessageDispatchNotification*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getConsumerId().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
         looseMarshalLong( wireFormat, info->getDeliverySequenceId(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getMessageId(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getMessageId().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/MessageDispatchNotificationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for MessageDispatchNotificationMarshaller
+     * Marshaling code for Open Wire Format for MessageDispatchNotificationMarshaller
      *
-     *  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/MessageIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/MessageId.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* MessageIdMarshaller::createObject() const {
@@ -57,8 +59,8 @@
 
         MessageId* info =
             dynamic_cast<MessageId*>( dataStructure );
-        info->setProducerId( dynamic_cast< ProducerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setProducerId( Pointer<ProducerId>( dynamic_cast< ProducerId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setProducerSequenceId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
         info->setBrokerSequenceId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
     }
@@ -76,7 +78,7 @@
             dynamic_cast<MessageId*>( dataStructure );
 
         int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getProducerId(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getProducerId().get(), bs );
         rc += tightMarshalLong1( wireFormat, info->getProducerSequenceId(), bs );
         rc += tightMarshalLong1( wireFormat, info->getBrokerSequenceId(), bs );
 
@@ -96,7 +98,7 @@
 
         MessageId* info =
             dynamic_cast<MessageId*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getProducerId(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getProducerId().get(), dataOut, bs );
         tightMarshalLong2( wireFormat, info->getProducerSequenceId(), dataOut, bs );
         tightMarshalLong2( wireFormat, info->getBrokerSequenceId(), dataOut, bs );
     }
@@ -113,8 +115,8 @@
         BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         MessageId* info =
             dynamic_cast<MessageId*>( dataStructure );
-        info->setProducerId( dynamic_cast< ProducerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setProducerId( Pointer<ProducerId>( dynamic_cast< ProducerId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setProducerSequenceId( looseUnmarshalLong( wireFormat, dataIn ) );
         info->setBrokerSequenceId( looseUnmarshalLong( wireFormat, dataIn ) );
     }
@@ -132,7 +134,7 @@
             dynamic_cast<MessageId*>( dataStructure );
         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalCachedObject( wireFormat, info->getProducerId(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getProducerId().get(), dataOut );
         looseMarshalLong( wireFormat, info->getProducerSequenceId(), dataOut );
         looseMarshalLong( wireFormat, info->getBrokerSequenceId(), dataOut );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for MessageIdMarshaller
+     * Marshaling code for Open Wire Format for MessageIdMarshaller
      *
-     *  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/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/Message.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;
 
 ///////////////////////////////////////////////////////////////////////////////
 void MessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
@@ -47,34 +49,34 @@
 
         Message* info =
             dynamic_cast<Message*>( dataStructure );
-        info->setProducerId( dynamic_cast< ProducerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setTransactionId( dynamic_cast< TransactionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setOriginalDestination( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setMessageId( dynamic_cast< MessageId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
-        info->setOriginalTransactionId( dynamic_cast< TransactionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setProducerId( Pointer<ProducerId>( dynamic_cast< ProducerId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setOriginalDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setOriginalTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setGroupID( tightUnmarshalString( dataIn, bs ) );
         info->setGroupSequence( dataIn->readInt() );
         info->setCorrelationId( tightUnmarshalString( dataIn, bs ) );
         info->setPersistent( bs->readBoolean() );
         info->setExpiration( tightUnmarshalLong( wireFormat, dataIn, bs ) );
         info->setPriority( dataIn->readByte() );
-        info->setReplyTo( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setReplyTo( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
         info->setTimestamp( tightUnmarshalLong( wireFormat, dataIn, bs ) );
         info->setType( tightUnmarshalString( dataIn, bs ) );
         info->setContent( tightUnmarshalByteArray( dataIn, bs ) );
         info->setMarshalledProperties( tightUnmarshalByteArray( dataIn, bs ) );
-        info->setDataStructure( dynamic_cast< DataStructure* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
-        info->setTargetConsumerId( dynamic_cast< ConsumerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setDataStructure( Pointer<DataStructure>( dynamic_cast< DataStructure* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setTargetConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setCompressed( bs->readBoolean() );
         info->setRedeliveryCounter( dataIn->readInt() );
 
@@ -82,8 +84,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 {
@@ -98,8 +100,8 @@
             short size = dataIn->readShort();
             info->getCluster().reserve( size );
             for( int i = 0; i < size; i++ ) {
-                info->getCluster().push_back( dynamic_cast< BrokerId* >(
-                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+                info->getCluster().push_back( Pointer<BrokerId>( dynamic_cast< BrokerId* >(
+                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
             }
         }
         else {
@@ -122,25 +124,25 @@
             dynamic_cast<Message*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getProducerId(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getTransactionId(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getOriginalDestination(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getMessageId(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getOriginalTransactionId(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getProducerId().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getTransactionId().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getOriginalDestination().get(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getMessageId().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getOriginalTransactionId().get(), bs );
         rc += tightMarshalString1( info->getGroupID(), bs );
         rc += tightMarshalString1( info->getCorrelationId(), bs );
         bs->writeBoolean( info->isPersistent() );
         rc += tightMarshalLong1( wireFormat, info->getExpiration(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getReplyTo(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getReplyTo().get(), bs );
         rc += tightMarshalLong1( wireFormat, info->getTimestamp(), bs );
         rc += tightMarshalString1( info->getType(), bs );
         bs->writeBoolean( info->getContent().size() != 0 );
         rc += info->getContent().size() == 0 ? 0 : (int)info->getContent().size() + 4;
         bs->writeBoolean( info->getMarshalledProperties().size() != 0 );
         rc += info->getMarshalledProperties().size() == 0 ? 0 : (int)info->getMarshalledProperties().size() + 4;
-        rc += tightMarshalNestedObject1( wireFormat, info->getDataStructure(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getTargetConsumerId(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getDataStructure().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getTargetConsumerId().get(), bs );
         bs->writeBoolean( info->isCompressed() );
         rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
         rc += tightMarshalLong1( wireFormat, info->getArrival(), bs );
@@ -167,19 +169,19 @@
 
         Message* info =
             dynamic_cast<Message*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getProducerId(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getTransactionId(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getOriginalDestination(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getMessageId(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getOriginalTransactionId(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getProducerId().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getTransactionId().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getOriginalDestination().get(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getMessageId().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getOriginalTransactionId().get(), dataOut, bs );
         tightMarshalString2( info->getGroupID(), dataOut, bs );
         dataOut->writeInt( info->getGroupSequence() );
         tightMarshalString2( info->getCorrelationId(), dataOut, bs );
         bs->readBoolean();
         tightMarshalLong2( wireFormat, info->getExpiration(), dataOut, bs );
         dataOut->write( info->getPriority() );
-        tightMarshalNestedObject2( wireFormat, info->getReplyTo(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getReplyTo().get(), dataOut, bs );
         tightMarshalLong2( wireFormat, info->getTimestamp(), dataOut, bs );
         tightMarshalString2( info->getType(), dataOut, bs );
         if( bs->readBoolean() ) {
@@ -190,8 +192,8 @@
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
             dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), 0, (int)info->getMarshalledProperties().size() );
         }
-        tightMarshalNestedObject2( wireFormat, info->getDataStructure(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getTargetConsumerId(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getDataStructure().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getTargetConsumerId().get(), dataOut, bs );
         bs->readBoolean();
         dataOut->writeInt( info->getRedeliveryCounter() );
         tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
@@ -216,34 +218,34 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         Message* info =
             dynamic_cast<Message*>( dataStructure );
-        info->setProducerId( dynamic_cast< ProducerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setTransactionId( dynamic_cast< TransactionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setOriginalDestination( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setMessageId( dynamic_cast< MessageId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
-        info->setOriginalTransactionId( dynamic_cast< TransactionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setProducerId( Pointer<ProducerId>( dynamic_cast< ProducerId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setOriginalDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+        info->setOriginalTransactionId( Pointer<TransactionId>( dynamic_cast< TransactionId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setGroupID( looseUnmarshalString( dataIn ) );
         info->setGroupSequence( dataIn->readInt() );
         info->setCorrelationId( looseUnmarshalString( dataIn ) );
         info->setPersistent( dataIn->readBoolean() );
         info->setExpiration( looseUnmarshalLong( wireFormat, dataIn ) );
         info->setPriority( dataIn->readByte() );
-        info->setReplyTo( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setReplyTo( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
         info->setTimestamp( looseUnmarshalLong( wireFormat, dataIn ) );
         info->setType( looseUnmarshalString( dataIn ) );
         info->setContent( looseUnmarshalByteArray( dataIn ) );
         info->setMarshalledProperties( looseUnmarshalByteArray( dataIn ) );
-        info->setDataStructure( dynamic_cast< DataStructure* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
-        info->setTargetConsumerId( dynamic_cast< ConsumerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setDataStructure( Pointer<DataStructure>( dynamic_cast< DataStructure* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
+        info->setTargetConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setCompressed( dataIn->readBoolean() );
         info->setRedeliveryCounter( dataIn->readInt() );
 
@@ -251,8 +253,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 {
@@ -267,8 +269,8 @@
             short size = dataIn->readShort();
             info->getCluster().reserve( size );
             for( int i = 0; i < size; i++ ) {
-                info->getCluster().push_back( dynamic_cast<BrokerId* >(
-                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+                info->getCluster().push_back( Pointer<BrokerId>( dynamic_cast<BrokerId* >(
+                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
             }
         }
         else {
@@ -291,19 +293,19 @@
             dynamic_cast<Message*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalCachedObject( wireFormat, info->getProducerId(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getTransactionId(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getOriginalDestination(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getMessageId(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getOriginalTransactionId(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getProducerId().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getTransactionId().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getOriginalDestination().get(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getMessageId().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getOriginalTransactionId().get(), dataOut );
         looseMarshalString( info->getGroupID(), dataOut );
         dataOut->writeInt( info->getGroupSequence() );
         looseMarshalString( info->getCorrelationId(), dataOut );
         dataOut->writeBoolean( info->isPersistent() );
         looseMarshalLong( wireFormat, info->getExpiration(), dataOut );
         dataOut->write( info->getPriority() );
-        looseMarshalNestedObject( wireFormat, info->getReplyTo(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getReplyTo().get(), dataOut );
         looseMarshalLong( wireFormat, info->getTimestamp(), dataOut );
         looseMarshalString( info->getType(), dataOut );
         dataOut->write( info->getContent().size() != 0 );
@@ -316,8 +318,8 @@
             dataOut->writeInt( (int)info->getMarshalledProperties().size() );
             dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]), 0, (int)info->getMarshalledProperties().size() );
         }
-        looseMarshalNestedObject( wireFormat, info->getDataStructure(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getTargetConsumerId(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getDataStructure().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getTargetConsumerId().get(), dataOut );
         dataOut->writeBoolean( info->isCompressed() );
         dataOut->writeInt( info->getRedeliveryCounter() );
         looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for MessageMarshaller
+     * Marshaling code for Open Wire Format for MessageMarshaller
      *
-     *  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
      */
@@ -54,7 +54,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 un-marshaled
          * @param dataIn - BinaryReader that provides that data
          * @param bs - BooleanStream
@@ -66,7 +66,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
@@ -77,7 +77,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
@@ -89,7 +89,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/MessagePullMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/MessagePull.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* MessagePullMarshaller::createObject() const {
@@ -57,14 +59,14 @@
 
         MessagePull* info =
             dynamic_cast<MessagePull*>( dataStructure );
-        info->setConsumerId( dynamic_cast< ConsumerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setTimeout( tightUnmarshalLong( wireFormat, dataIn, bs ) );
         info->setCorrelationId( tightUnmarshalString( dataIn, bs ) );
-        info->setMessageId( dynamic_cast< MessageId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -80,11 +82,11 @@
             dynamic_cast<MessagePull*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId(), bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId().get(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
         rc += tightMarshalLong1( wireFormat, info->getTimeout(), bs );
         rc += tightMarshalString1( info->getCorrelationId(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getMessageId(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getMessageId().get(), bs );
 
         return rc + 0;
     }
@@ -102,11 +104,11 @@
 
         MessagePull* info =
             dynamic_cast<MessagePull*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
-        tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getConsumerId().get(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
         tightMarshalLong2( wireFormat, info->getTimeout(), dataOut, bs );
         tightMarshalString2( info->getCorrelationId(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getMessageId(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getMessageId().get(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -121,14 +123,14 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         MessagePull* info =
             dynamic_cast<MessagePull*>( dataStructure );
-        info->setConsumerId( dynamic_cast< ConsumerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setTimeout( looseUnmarshalLong( wireFormat, dataIn ) );
         info->setCorrelationId( looseUnmarshalString( dataIn ) );
-        info->setMessageId( dynamic_cast< MessageId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -144,11 +146,11 @@
             dynamic_cast<MessagePull*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
-        looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getConsumerId().get(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
         looseMarshalLong( wireFormat, info->getTimeout(), dataOut );
         looseMarshalString( info->getCorrelationId(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getMessageId(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getMessageId().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/MessagePullMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for MessagePullMarshaller
+     * Marshaling code for Open Wire Format for MessagePullMarshaller
      *
-     *  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/NetworkBridgeFilterMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/NetworkBridgeFilter.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* NetworkBridgeFilterMarshaller::createObject() const {
@@ -58,8 +60,8 @@
         NetworkBridgeFilter* info =
             dynamic_cast<NetworkBridgeFilter*>( dataStructure );
         info->setNetworkTTL( dataIn->readInt() );
-        info->setNetworkBrokerId( dynamic_cast< BrokerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setNetworkBrokerId( Pointer<BrokerId>( dynamic_cast< BrokerId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -75,7 +77,7 @@
             dynamic_cast<NetworkBridgeFilter*>( dataStructure );
 
         int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getNetworkBrokerId(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getNetworkBrokerId().get(), bs );
 
         return rc + 4;
     }
@@ -94,7 +96,7 @@
         NetworkBridgeFilter* info =
             dynamic_cast<NetworkBridgeFilter*>( dataStructure );
         dataOut->writeInt( info->getNetworkTTL() );
-        tightMarshalCachedObject2( wireFormat, info->getNetworkBrokerId(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getNetworkBrokerId().get(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -110,8 +112,8 @@
         NetworkBridgeFilter* info =
             dynamic_cast<NetworkBridgeFilter*>( dataStructure );
         info->setNetworkTTL( dataIn->readInt() );
-        info->setNetworkBrokerId( dynamic_cast< BrokerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setNetworkBrokerId( Pointer<BrokerId>( dynamic_cast< BrokerId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -128,7 +130,7 @@
         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         dataOut->writeInt( info->getNetworkTTL() );
-        looseMarshalCachedObject( wireFormat, info->getNetworkBrokerId(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getNetworkBrokerId().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/NetworkBridgeFilterMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for NetworkBridgeFilterMarshaller
+     * Marshaling code for Open Wire Format for NetworkBridgeFilterMarshaller
      *
-     *  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/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/PartialCommand.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* PartialCommandMarshaller::createObject() const {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for PartialCommandMarshaller
+     * Marshaling code for Open Wire Format for PartialCommandMarshaller
      *
-     *  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/ProducerAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/ProducerAck.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* ProducerAckMarshaller::createObject() const {
@@ -57,8 +59,8 @@
 
         ProducerAck* info =
             dynamic_cast<ProducerAck*>( dataStructure );
-        info->setProducerId( dynamic_cast< ProducerId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setProducerId( Pointer<ProducerId>( dynamic_cast< ProducerId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
         info->setSize( dataIn->readInt() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -75,7 +77,7 @@
             dynamic_cast<ProducerAck*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getProducerId(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getProducerId().get(), bs );
 
         return rc + 4;
     }
@@ -93,7 +95,7 @@
 
         ProducerAck* info =
             dynamic_cast<ProducerAck*>( dataStructure );
-        tightMarshalNestedObject2( wireFormat, info->getProducerId(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getProducerId().get(), dataOut, bs );
         dataOut->writeInt( info->getSize() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -109,8 +111,8 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         ProducerAck* info =
             dynamic_cast<ProducerAck*>( dataStructure );
-        info->setProducerId( dynamic_cast< ProducerId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setProducerId( Pointer<ProducerId>( dynamic_cast< ProducerId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
         info->setSize( dataIn->readInt() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
@@ -127,7 +129,7 @@
             dynamic_cast<ProducerAck*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalNestedObject( wireFormat, info->getProducerId(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getProducerId().get(), dataOut );
         dataOut->writeInt( info->getSize() );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v2{
 
     /**
-     * Marshalling code for Open Wire Format for ProducerAckMarshaller
+     * Marshaling code for Open Wire Format for ProducerAckMarshaller
      *
-     *  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/ProducerIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerIdMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerIdMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/ProducerId.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* ProducerIdMarshaller::createObject() const {



Mime
View raw message