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 2007/10/17 19:35:11 UTC

svn commit: r585591 [2/2] - in /activemq/activemq-cpp/trunk/src: main/activemq/connector/openwire/ main/activemq/connector/openwire/commands/ main/java/org/apache/activemq/openwire/tool/ test/activemq/connector/openwire/commands/

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.h Wed Oct 17 10:35:05 2007
@@ -71,7 +71,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual NetworkBridgeFilter* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.cpp Wed Oct 17 10:35:05 2007
@@ -46,7 +46,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* PartialCommand::cloneDataStructure() const {
+PartialCommand* PartialCommand::cloneDataStructure() const {
     PartialCommand* partialCommand = new PartialCommand();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.h Wed Oct 17 10:35:05 2007
@@ -70,7 +70,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual PartialCommand* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.cpp Wed Oct 17 10:35:05 2007
@@ -48,7 +48,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* ProducerId::cloneDataStructure() const {
+ProducerId* ProducerId::cloneDataStructure() const {
     ProducerId* producerId = new ProducerId();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.h Wed Oct 17 10:35:05 2007
@@ -71,7 +71,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual ProducerId* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp Wed Oct 17 10:35:05 2007
@@ -53,7 +53,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* ProducerInfo::cloneDataStructure() const {
+ProducerInfo* ProducerInfo::cloneDataStructure() const {
     ProducerInfo* producerInfo = new ProducerInfo();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.h Wed Oct 17 10:35:05 2007
@@ -75,7 +75,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual ProducerInfo* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp Wed Oct 17 10:35:05 2007
@@ -47,7 +47,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* RemoveInfo::cloneDataStructure() const {
+RemoveInfo* RemoveInfo::cloneDataStructure() const {
     RemoveInfo* removeInfo = new RemoveInfo();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.h Wed Oct 17 10:35:05 2007
@@ -70,7 +70,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual RemoveInfo* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp Wed Oct 17 10:35:05 2007
@@ -49,7 +49,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* RemoveSubscriptionInfo::cloneDataStructure() const {
+RemoveSubscriptionInfo* RemoveSubscriptionInfo::cloneDataStructure() const {
     RemoveSubscriptionInfo* removeSubscriptionInfo = new RemoveSubscriptionInfo();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.h Wed Oct 17 10:35:05 2007
@@ -53,7 +53,7 @@
 
     public:
 
-        const static unsigned char ID_REMOVESUBSCRIPTIONINFO = 9;
+        const static unsigned char ID_REMOVESUBSCRIPTIONINFO = 0;
 
     public:
 
@@ -72,7 +72,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual RemoveSubscriptionInfo* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp Wed Oct 17 10:35:05 2007
@@ -47,7 +47,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* ReplayCommand::cloneDataStructure() const {
+ReplayCommand* ReplayCommand::cloneDataStructure() const {
     ReplayCommand* replayCommand = new ReplayCommand();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.h Wed Oct 17 10:35:05 2007
@@ -70,7 +70,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual ReplayCommand* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.cpp Wed Oct 17 10:35:05 2007
@@ -46,7 +46,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* Response::cloneDataStructure() const {
+Response* Response::cloneDataStructure() const {
     Response* response = new Response();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.h Wed Oct 17 10:35:05 2007
@@ -69,7 +69,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual Response* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.cpp Wed Oct 17 10:35:05 2007
@@ -47,7 +47,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* SessionId::cloneDataStructure() const {
+SessionId* SessionId::cloneDataStructure() const {
     SessionId* sessionId = new SessionId();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.h Wed Oct 17 10:35:05 2007
@@ -70,7 +70,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual SessionId* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.cpp Wed Oct 17 10:35:05 2007
@@ -47,7 +47,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* SessionInfo::cloneDataStructure() const {
+SessionInfo* SessionInfo::cloneDataStructure() const {
     SessionInfo* sessionInfo = new SessionInfo();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.h Wed Oct 17 10:35:05 2007
@@ -70,7 +70,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual SessionInfo* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp Wed Oct 17 10:35:05 2007
@@ -45,7 +45,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* ShutdownInfo::cloneDataStructure() const {
+ShutdownInfo* ShutdownInfo::cloneDataStructure() const {
     ShutdownInfo* shutdownInfo = new ShutdownInfo();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.h Wed Oct 17 10:35:05 2007
@@ -68,7 +68,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual ShutdownInfo* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.cpp Wed Oct 17 10:35:05 2007
@@ -50,7 +50,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* SubscriptionInfo::cloneDataStructure() const {
+SubscriptionInfo* SubscriptionInfo::cloneDataStructure() const {
     SubscriptionInfo* subscriptionInfo = new SubscriptionInfo();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.h Wed Oct 17 10:35:05 2007
@@ -73,7 +73,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual SubscriptionInfo* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.cpp Wed Oct 17 10:35:05 2007
@@ -45,7 +45,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* TransactionId::cloneDataStructure() const {
+TransactionId* TransactionId::cloneDataStructure() const {
     TransactionId* transactionId = new TransactionId();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.h Wed Oct 17 10:35:05 2007
@@ -68,7 +68,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual TransactionId* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp Wed Oct 17 10:35:05 2007
@@ -50,7 +50,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* TransactionInfo::cloneDataStructure() const {
+TransactionInfo* TransactionInfo::cloneDataStructure() const {
     TransactionInfo* transactionInfo = new TransactionInfo();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.h Wed Oct 17 10:35:05 2007
@@ -73,7 +73,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual TransactionInfo* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.cpp?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.cpp Wed Oct 17 10:35:05 2007
@@ -46,7 +46,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* XATransactionId::cloneDataStructure() const {
+XATransactionId* XATransactionId::cloneDataStructure() const {
     XATransactionId* xATransactionId = new XATransactionId();
 
     // Copy the data from the base class or classes

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.h Wed Oct 17 10:35:05 2007
@@ -71,7 +71,7 @@
          * caller now owns, this will be an exact copy of this one
          * @returns new copy of this object.
          */
-        virtual DataStructure* cloneDataStructure() const;
+        virtual XATransactionId* cloneDataStructure() const;
 
         /**
          * Copy the contents of the passed object into this object's

Modified: activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppClassesGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppClassesGenerator.java?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppClassesGenerator.java (original)
+++ activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppClassesGenerator.java Wed Oct 17 10:35:05 2007
@@ -210,7 +210,7 @@
 
 out.println("");
 out.println("////////////////////////////////////////////////////////////////////////////////");
-out.println("DataStructure* "+className+"::cloneDataStructure() const {");
+out.println(className+"* "+className+"::cloneDataStructure() const {");
 
     String newInstance = decapitalize( className );
 

Modified: activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppHeadersGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppHeadersGenerator.java?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppHeadersGenerator.java (original)
+++ activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppHeadersGenerator.java Wed Oct 17 10:35:05 2007
@@ -135,7 +135,7 @@
 out.println("         * caller now owns, this will be an exact copy of this one");
 out.println("         * @returns new copy of this object.");
 out.println("         */");
-out.println("        virtual DataStructure* cloneDataStructure() const;");
+out.println("        virtual "+className+"* cloneDataStructure() const;");
 out.println("");
 out.println("        /**");
 out.println("         * Copy the contents of the passed object into this object's");

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.h?rev=585591&r1=585590&r2=585591&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.h Wed Oct 17 10:35:05 2007
@@ -29,15 +29,15 @@
 namespace commands{
 
     class ActiveMQDestinationTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( ActiveMQDestinationTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST( testOptions );
         CPPUNIT_TEST_SUITE_END();
 
-        class MyDestination : public ActiveMQDestination {    
+        class MyDestination : public ActiveMQDestination {
         public:
-        
+
             /**
              * Returns the Type of Destination that this object represents
              * @returns int type qualifier.
@@ -51,9 +51,9 @@
              * caller now owns, this will be an exact copy of this one
              * @returns new copy of this object.
              */
-            virtual DataStructure* cloneDataStructure() const { 
+            virtual MyDestination* cloneDataStructure() const {
                 MyDestination* message = new MyDestination();
-                message->copyDataStructure( this );            
+                message->copyDataStructure( this );
                 return message;
             }
 
@@ -66,7 +66,7 @@
                 ActiveMQDestination::copyDataStructure( src );
             }
         };
-        
+
         class MyTempDestination : public MyDestination {
         public:
 
@@ -81,10 +81,10 @@
         };
 
     public:
-    
-    	ActiveMQDestinationTest() {}
-    	virtual ~ActiveMQDestinationTest() {}
-        
+
+        ActiveMQDestinationTest() {}
+        virtual ~ActiveMQDestinationTest() {}
+
         virtual void test();
         virtual void testOptions();