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 [7/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/v1/ActiveMQTempTopicMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/ActiveMQTempTopic.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::v1;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* ActiveMQTempTopicMarshaller::createObject() const {

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

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

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v1{
 
     /**
-     * Marshalling code for Open Wire Format for ActiveMQTopicMarshaller
+     * Marshaling code for Open Wire Format for ActiveMQTopicMarshaller
      *
-     *  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/v1/BaseCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BaseCommandMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BaseCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BaseCommandMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/BaseCommand.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::v1;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 void BaseCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
@@ -45,8 +47,8 @@
 
         BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
-        commands::Command* info =
-            dynamic_cast<commands::Command*>( dataStructure );
+        BaseCommand* info =
+            dynamic_cast<BaseCommand*>( dataStructure );
         info->setCommandId( dataIn->readInt() );
         info->setResponseRequired( bs->readBoolean() );
     }
@@ -60,8 +62,8 @@
 
     try {
 
-        commands::Command* info =
-            dynamic_cast<commands::Command*>( dataStructure );
+        BaseCommand* info =
+            dynamic_cast<BaseCommand*>( dataStructure );
 
         int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
         bs->writeBoolean( info->isResponseRequired() );
@@ -80,8 +82,8 @@
 
         BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
-        commands::Command* info =
-            dynamic_cast<commands::Command*>( dataStructure );
+        BaseCommand* info =
+            dynamic_cast<BaseCommand*>( dataStructure );
         dataOut->writeInt( info->getCommandId() );
         bs->readBoolean();
     }
@@ -96,8 +98,8 @@
     try {
 
         BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
-        commands::Command* info =
-            dynamic_cast<commands::Command*>( dataStructure );
+        BaseCommand* info =
+            dynamic_cast<BaseCommand*>( dataStructure );
         info->setCommandId( dataIn->readInt() );
         info->setResponseRequired( dataIn->readBoolean() );
     }
@@ -111,8 +113,8 @@
 
     try {
 
-        commands::Command* info =
-            dynamic_cast<commands::Command*>( dataStructure );
+        BaseCommand* info =
+            dynamic_cast<BaseCommand*>( dataStructure );
         BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         dataOut->writeInt( info->getCommandId() );

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

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerIdMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerIdMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v1{
 
     /**
-     * Marshalling code for Open Wire Format for BrokerIdMarshaller
+     * Marshaling code for Open Wire Format for BrokerIdMarshaller
      *
-     *  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/v1/BrokerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/BrokerInfo.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::v1;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* BrokerInfoMarshaller::createObject() const {
@@ -57,16 +59,16 @@
 
         BrokerInfo* info =
             dynamic_cast<BrokerInfo*>( dataStructure );
-        info->setBrokerId( dynamic_cast< BrokerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setBrokerId( Pointer<BrokerId>( dynamic_cast< BrokerId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setBrokerURL( tightUnmarshalString( dataIn, bs ) );
 
         if( bs->readBoolean() ) {
             short size = dataIn->readShort();
             info->getPeerBrokerInfos().reserve( size );
             for( int i = 0; i < size; i++ ) {
-                info->getPeerBrokerInfos().push_back( dynamic_cast< BrokerInfo* >(
-                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+                info->getPeerBrokerInfos().push_back( Pointer<BrokerInfo>( dynamic_cast< BrokerInfo* >(
+                    tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
             }
         }
         else {
@@ -96,7 +98,7 @@
             dynamic_cast<BrokerInfo*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getBrokerId(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getBrokerId().get(), bs );
         rc += tightMarshalString1( info->getBrokerURL(), bs );
         rc += tightMarshalObjectArray1( wireFormat, info->getPeerBrokerInfos(), bs );
         rc += tightMarshalString1( info->getBrokerName(), bs );
@@ -125,7 +127,7 @@
 
         BrokerInfo* info =
             dynamic_cast<BrokerInfo*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getBrokerId(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getBrokerId().get(), dataOut, bs );
         tightMarshalString2( info->getBrokerURL(), dataOut, bs );
         tightMarshalObjectArray2( wireFormat, info->getPeerBrokerInfos(), dataOut, bs );
         tightMarshalString2( info->getBrokerName(), dataOut, bs );
@@ -151,16 +153,16 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         BrokerInfo* info =
             dynamic_cast<BrokerInfo*>( dataStructure );
-        info->setBrokerId( dynamic_cast< BrokerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setBrokerId( Pointer<BrokerId>( dynamic_cast< BrokerId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setBrokerURL( looseUnmarshalString( dataIn ) );
 
         if( dataIn->readBoolean() ) {
             short size = dataIn->readShort();
             info->getPeerBrokerInfos().reserve( size );
             for( int i = 0; i < size; i++ ) {
-                info->getPeerBrokerInfos().push_back( dynamic_cast<BrokerInfo* >(
-                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+                info->getPeerBrokerInfos().push_back( Pointer<BrokerInfo>( dynamic_cast<BrokerInfo* >(
+                    looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
             }
         }
         else {
@@ -190,7 +192,7 @@
             dynamic_cast<BrokerInfo*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalCachedObject( wireFormat, info->getBrokerId(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getBrokerId().get(), dataOut );
         looseMarshalString( info->getBrokerURL(), dataOut );
         looseMarshalObjectArray( wireFormat, info->getPeerBrokerInfos(), dataOut );
         looseMarshalString( info->getBrokerName(), dataOut );

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

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v1{
 
     /**
-     * Marshalling code for Open Wire Format for ConnectionControlMarshaller
+     * Marshaling code for Open Wire Format for ConnectionControlMarshaller
      *
-     *  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/v1/ConnectionErrorMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/ConnectionError.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::v1;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* ConnectionErrorMarshaller::createObject() const {
@@ -57,10 +59,10 @@
 
         ConnectionError* info =
             dynamic_cast<ConnectionError*>( dataStructure );
-        info->setException( dynamic_cast< BrokerError* >(
-            tightUnmarshalBrokerError( wireFormat, dataIn, bs ) ) );
-        info->setConnectionId( dynamic_cast< ConnectionId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setException( Pointer<BrokerError>( dynamic_cast< BrokerError* >(
+            tightUnmarshalBrokerError( wireFormat, dataIn, bs ) ) ) );
+        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >(
+            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<ConnectionError*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalBrokerError1( wireFormat, info->getException(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getConnectionId(), bs );
+        rc += tightMarshalBrokerError1( wireFormat, info->getException().get(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getConnectionId().get(), bs );
 
         return rc + 0;
     }
@@ -95,8 +97,8 @@
 
         ConnectionError* info =
             dynamic_cast<ConnectionError*>( dataStructure );
-        tightMarshalBrokerError2( wireFormat, info->getException(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getConnectionId(), dataOut, bs );
+        tightMarshalBrokerError2( wireFormat, info->getException().get(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getConnectionId().get(), dataOut, bs );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -111,10 +113,10 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         ConnectionError* info =
             dynamic_cast<ConnectionError*>( dataStructure );
-        info->setException( dynamic_cast< BrokerError* >(
-            looseUnmarshalBrokerError( wireFormat, dataIn ) ) );
-        info->setConnectionId( dynamic_cast< ConnectionId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setException( Pointer<BrokerError>( dynamic_cast< BrokerError* >(
+            looseUnmarshalBrokerError( wireFormat, dataIn ) ) ) );
+        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
     }
     AMQ_CATCH_RETHROW( decaf::io::IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -130,8 +132,8 @@
             dynamic_cast<ConnectionError*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalBrokerError( wireFormat, info->getException(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getConnectionId(), dataOut );
+        looseMarshalBrokerError( wireFormat, info->getException().get(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getConnectionId().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/v1/ConnectionErrorMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v1{
 
     /**
-     * Marshalling code for Open Wire Format for ConnectionErrorMarshaller
+     * Marshaling code for Open Wire Format for ConnectionErrorMarshaller
      *
-     *  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/v1/ConnectionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/ConnectionId.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::v1;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* ConnectionIdMarshaller::createObject() const {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v1{
 
     /**
-     * Marshalling code for Open Wire Format for ConnectionIdMarshaller
+     * Marshaling code for Open Wire Format for ConnectionIdMarshaller
      *
-     *  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/v1/ConnectionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/ConnectionInfo.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::v1;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* ConnectionInfoMarshaller::createObject() const {
@@ -57,8 +59,8 @@
 
         ConnectionInfo* info =
             dynamic_cast<ConnectionInfo*>( dataStructure );
-        info->setConnectionId( dynamic_cast< ConnectionId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setClientId( tightUnmarshalString( dataIn, bs ) );
         info->setPassword( tightUnmarshalString( dataIn, bs ) );
         info->setUserName( tightUnmarshalString( dataIn, bs ) );
@@ -67,8 +69,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 {
@@ -92,7 +94,7 @@
             dynamic_cast<ConnectionInfo*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId().get(), bs );
         rc += tightMarshalString1( info->getClientId(), bs );
         rc += tightMarshalString1( info->getPassword(), bs );
         rc += tightMarshalString1( info->getUserName(), bs );
@@ -117,7 +119,7 @@
 
         ConnectionInfo* info =
             dynamic_cast<ConnectionInfo*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getConnectionId(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getConnectionId().get(), dataOut, bs );
         tightMarshalString2( info->getClientId(), dataOut, bs );
         tightMarshalString2( info->getPassword(), dataOut, bs );
         tightMarshalString2( info->getUserName(), dataOut, bs );
@@ -139,8 +141,8 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         ConnectionInfo* info =
             dynamic_cast<ConnectionInfo*>( dataStructure );
-        info->setConnectionId( dynamic_cast< ConnectionId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setConnectionId( Pointer<ConnectionId>( dynamic_cast< ConnectionId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setClientId( looseUnmarshalString( dataIn ) );
         info->setPassword( looseUnmarshalString( dataIn ) );
         info->setUserName( looseUnmarshalString( dataIn ) );
@@ -149,8 +151,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 {
@@ -174,7 +176,7 @@
             dynamic_cast<ConnectionInfo*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getConnectionId().get(), dataOut );
         looseMarshalString( info->getClientId(), dataOut );
         looseMarshalString( info->getPassword(), dataOut );
         looseMarshalString( info->getUserName(), dataOut );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v1{
 
     /**
-     * Marshalling code for Open Wire Format for ConnectionInfoMarshaller
+     * Marshaling code for Open Wire Format for ConnectionInfoMarshaller
      *
-     *  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/v1/ConsumerControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/ConsumerControl.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::v1;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* ConsumerControlMarshaller::createObject() const {
@@ -58,8 +60,8 @@
         ConsumerControl* info =
             dynamic_cast<ConsumerControl*>( dataStructure );
         info->setClose( bs->readBoolean() );
-        info->setConsumerId( dynamic_cast< ConsumerId* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
         info->setPrefetch( dataIn->readInt() );
         info->setFlush( bs->readBoolean() );
         info->setStart( bs->readBoolean() );
@@ -80,7 +82,7 @@
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
         bs->writeBoolean( info->isClose() );
-        rc += tightMarshalNestedObject1( wireFormat, info->getConsumerId(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getConsumerId().get(), bs );
         bs->writeBoolean( info->isFlush() );
         bs->writeBoolean( info->isStart() );
         bs->writeBoolean( info->isStop() );
@@ -102,7 +104,7 @@
         ConsumerControl* info =
             dynamic_cast<ConsumerControl*>( dataStructure );
         bs->readBoolean();
-        tightMarshalNestedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getConsumerId().get(), dataOut, bs );
         dataOut->writeInt( info->getPrefetch() );
         bs->readBoolean();
         bs->readBoolean();
@@ -122,8 +124,8 @@
         ConsumerControl* info =
             dynamic_cast<ConsumerControl*>( dataStructure );
         info->setClose( dataIn->readBoolean() );
-        info->setConsumerId( dynamic_cast< ConsumerId* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
         info->setPrefetch( dataIn->readInt() );
         info->setFlush( dataIn->readBoolean() );
         info->setStart( dataIn->readBoolean() );
@@ -144,7 +146,7 @@
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         dataOut->writeBoolean( info->isClose() );
-        looseMarshalNestedObject( wireFormat, info->getConsumerId(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getConsumerId().get(), dataOut );
         dataOut->writeInt( info->getPrefetch() );
         dataOut->writeBoolean( info->isFlush() );
         dataOut->writeBoolean( info->isStart() );

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

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v1{
 
     /**
-     * Marshalling code for Open Wire Format for ConsumerIdMarshaller
+     * Marshaling code for Open Wire Format for ConsumerIdMarshaller
      *
-     *  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/v1/ConsumerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.cpp Fri Feb  6 23:11:28 2009
@@ -19,6 +19,7 @@
 
 #include <activemq/commands/ConsumerInfo.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::v1;
 using namespace decaf;
 using namespace decaf::io;
+using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* ConsumerInfoMarshaller::createObject() const {
@@ -57,11 +59,11 @@
 
         ConsumerInfo* info =
             dynamic_cast<ConsumerInfo*>( dataStructure );
-        info->setConsumerId( dynamic_cast< ConsumerId* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setBrowser( bs->readBoolean() );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >(
-            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
+            tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
         info->setPrefetchSize( dataIn->readInt() );
         info->setMaximumPendingMessageLimit( dataIn->readInt() );
         info->setDispatchAsync( bs->readBoolean() );
@@ -76,15 +78,15 @@
             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 {
             info->getBrokerPath().clear();
         }
-        info->setAdditionalPredicate( dynamic_cast< BooleanExpression* >(
-            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
+        info->setAdditionalPredicate( Pointer<BooleanExpression>( dynamic_cast< BooleanExpression* >(
+            tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
         info->setNetworkSubscription( bs->readBoolean() );
         info->setOptimizedAcknowledge( bs->readBoolean() );
         info->setNoRangeAcks( bs->readBoolean() );
@@ -103,9 +105,9 @@
             dynamic_cast<ConsumerInfo*>( dataStructure );
 
         int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
-        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId().get(), bs );
         bs->writeBoolean( info->isBrowser() );
-        rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
+        rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
         bs->writeBoolean( info->isDispatchAsync() );
         rc += tightMarshalString1( info->getSelector(), bs );
         rc += tightMarshalString1( info->getSubscriptionName(), bs );
@@ -113,7 +115,7 @@
         bs->writeBoolean( info->isExclusive() );
         bs->writeBoolean( info->isRetroactive() );
         rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
-        rc += tightMarshalNestedObject1( wireFormat, info->getAdditionalPredicate(), bs );
+        rc += tightMarshalNestedObject1( wireFormat, info->getAdditionalPredicate().get(), bs );
         bs->writeBoolean( info->isNetworkSubscription() );
         bs->writeBoolean( info->isOptimizedAcknowledge() );
         bs->writeBoolean( info->isNoRangeAcks() );
@@ -134,9 +136,9 @@
 
         ConsumerInfo* info =
             dynamic_cast<ConsumerInfo*>( dataStructure );
-        tightMarshalCachedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getConsumerId().get(), dataOut, bs );
         bs->readBoolean();
-        tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
+        tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
         dataOut->writeInt( info->getPrefetchSize() );
         dataOut->writeInt( info->getMaximumPendingMessageLimit() );
         bs->readBoolean();
@@ -147,7 +149,7 @@
         bs->readBoolean();
         dataOut->write( info->getPriority() );
         tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
-        tightMarshalNestedObject2( wireFormat, info->getAdditionalPredicate(), dataOut, bs );
+        tightMarshalNestedObject2( wireFormat, info->getAdditionalPredicate().get(), dataOut, bs );
         bs->readBoolean();
         bs->readBoolean();
         bs->readBoolean();
@@ -165,11 +167,11 @@
         BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         ConsumerInfo* info =
             dynamic_cast<ConsumerInfo*>( dataStructure );
-        info->setConsumerId( dynamic_cast< ConsumerId* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setBrowser( dataIn->readBoolean() );
-        info->setDestination( dynamic_cast< ActiveMQDestination* >( 
-            looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+        info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >( 
+            looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
         info->setPrefetchSize( dataIn->readInt() );
         info->setMaximumPendingMessageLimit( dataIn->readInt() );
         info->setDispatchAsync( dataIn->readBoolean() );
@@ -184,15 +186,15 @@
             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 {
             info->getBrokerPath().clear();
         }
-        info->setAdditionalPredicate( dynamic_cast< BooleanExpression* >( 
-            looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+        info->setAdditionalPredicate( Pointer<BooleanExpression>( dynamic_cast< BooleanExpression* >( 
+            looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
         info->setNetworkSubscription( dataIn->readBoolean() );
         info->setOptimizedAcknowledge( dataIn->readBoolean() );
         info->setNoRangeAcks( dataIn->readBoolean() );
@@ -211,9 +213,9 @@
             dynamic_cast<ConsumerInfo*>( dataStructure );
         BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-        looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getConsumerId().get(), dataOut );
         dataOut->writeBoolean( info->isBrowser() );
-        looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
+        looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
         dataOut->writeInt( info->getPrefetchSize() );
         dataOut->writeInt( info->getMaximumPendingMessageLimit() );
         dataOut->writeBoolean( info->isDispatchAsync() );
@@ -224,7 +226,7 @@
         dataOut->writeBoolean( info->isRetroactive() );
         dataOut->write( info->getPriority() );
         looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
-        looseMarshalNestedObject( wireFormat, info->getAdditionalPredicate(), dataOut );
+        looseMarshalNestedObject( wireFormat, info->getAdditionalPredicate().get(), dataOut );
         dataOut->writeBoolean( info->isNetworkSubscription() );
         dataOut->writeBoolean( info->isOptimizedAcknowledge() );
         dataOut->writeBoolean( info->isNoRangeAcks() );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v1{
 
     /**
-     * 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/v1/ControlCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/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::v1;
 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/v1/ControlCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v1{
 
     /**
-     * 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/v1/DataArrayResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/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::v1;
 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/v1/DataArrayResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshaller.h Fri Feb  6 23:11:28 2009
@@ -40,9 +40,9 @@
 namespace v1{
 
     /**
-     * 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/v1/DataResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataResponseMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/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::v1;
 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 )