activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r747816 [3/5] - in /activemq/activemq-cpp/trunk: activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/ activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ activemq-cpp-openwir...
Date Wed, 25 Feb 2009 15:23:51 GMT
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_CONSUMERID_H_
 #define _ACTIVEMQ_COMMANDS_CONSUMERID_H_
 
@@ -23,24 +24,23 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
-#include <activemq/commands/BaseDataStructure.h>
 #include <decaf/lang/Pointer.h>
 #include <decaf/lang/Comparable.h>
-#include <vector>
+#include <activemq/util/Config.h>
 #include <string>
+#include <activemq/commands/BaseDataStructure.h>
+#include <vector>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for ConsumerId
-     *
+     *  Command code for OpenWire format for ConsumerId
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API ConsumerId : public BaseDataStructure, public decaf::lang::Comparable<ConsumerId> {
@@ -59,7 +59,9 @@
     public:
 
         ConsumerId();
+
         ConsumerId( const ConsumerId& other );
+
         virtual ~ConsumerId();
 
         /**
@@ -117,6 +119,7 @@
         virtual bool operator<( const ConsumerId& value ) const;
 
         ConsumerId& operator= ( const ConsumerId& other );
+
     };
 
 }}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.cpp Wed Feb 25 15:23:48 2009
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/ConsumerInfo.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/ConsumerInfo.h>
 
 using namespace std;
 using namespace activemq;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for ConsumerInfo
- *
+ *  Command code for OpenWire format for ConsumerInfo
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 ConsumerInfo::ConsumerInfo() {
 
@@ -56,7 +57,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 ConsumerInfo::~ConsumerInfo() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -253,13 +253,6 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ConsumerInfo::visit( activemq::state::CommandVisitor* visitor ) 
-    throw( exceptions::ActiveMQException ) {
-
-    return visitor->processConsumerInfo( this );
-}
-
-////////////////////////////////////////////////////////////////////////////////
 const decaf::lang::Pointer<ConsumerId>& ConsumerInfo::getConsumerId() const {
     return consumerId;
 }
@@ -459,3 +452,9 @@
     this->noRangeAcks = noRangeAcks;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+decaf::lang::Pointer<commands::Command> ConsumerInfo::visit( activemq::state::CommandVisitor* visitor ) 
+    throw( exceptions::ActiveMQException ) {
+
+    return visitor->processConsumerInfo( this );
+}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_CONSUMERINFO_H_
 #define _ACTIVEMQ_COMMANDS_CONSUMERINFO_H_
 
@@ -23,27 +24,26 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
-#include <activemq/commands/BaseCommand.h>
-#include <decaf/lang/Pointer.h>
 #include <activemq/commands/BrokerId.h>
-#include <activemq/commands/ConsumerId.h>
+#include <decaf/lang/Pointer.h>
 #include <activemq/commands/BooleanExpression.h>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <vector>
+#include <activemq/util/Config.h>
 #include <string>
+#include <activemq/commands/BaseCommand.h>
+#include <vector>
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/ConsumerId.h>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for ConsumerInfo
-     *
+     *  Command code for OpenWire format for ConsumerInfo
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API ConsumerInfo : public BaseCommand {
@@ -67,6 +67,10 @@
         bool optimizedAcknowledge;
         bool noRangeAcks;
 
+    public:
+
+        const static unsigned char ID_CONSUMERINFO = 5;
+
     protected:
 
         ConsumerInfo( const ConsumerInfo& other );
@@ -74,11 +78,8 @@
 
     public:
 
-        const static unsigned char ID_CONSUMERINFO = 5;
-
-    public:
-
         ConsumerInfo();
+
         virtual ~ConsumerInfo();
 
         /**
@@ -117,16 +118,6 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        /**
-         * Allows a Visitor to visit this command and return a response to the
-         * command based on the command type being visited.  The command will call
-         * the proper processXXX method in the visitor.
-         * 
-         * @return a Response to the visitor being called or NULL if no response.
-         */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
-            throw( exceptions::ActiveMQException );
-
         virtual const decaf::lang::Pointer<ConsumerId>& getConsumerId() const;
         virtual decaf::lang::Pointer<ConsumerId>& getConsumerId();
         virtual void setConsumerId( const decaf::lang::Pointer<ConsumerId>& consumerId );
@@ -184,6 +175,16 @@
         virtual bool isNoRangeAcks() const;
         virtual void setNoRangeAcks( bool noRangeAcks );
 
+        /**
+         * Allows a Visitor to visit this command and return a response to the
+         * command based on the command type being visited.  The command will call
+         * the proper processXXX method in the visitor.
+         * 
+         * @return a Response to the visitor being called or NULL if no response.
+         */
+        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+            throw( exceptions::ActiveMQException );
+
     };
 
 }}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.cpp Wed Feb 25 15:23:48 2009
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/ControlCommand.h>
 #include <activemq/state/CommandVisitor.h>
-#include <activemq/exceptions/ActiveMQException.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for ControlCommand
- *
+ *  Command code for OpenWire format for ControlCommand
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 ControlCommand::ControlCommand() {
 
@@ -44,7 +45,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 ControlCommand::~ControlCommand() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -121,13 +121,6 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ControlCommand::visit( activemq::state::CommandVisitor* visitor ) 
-    throw( exceptions::ActiveMQException ) {
-
-    return visitor->processControlCommand( this );
-}
-
-////////////////////////////////////////////////////////////////////////////////
 const std::string& ControlCommand::getCommand() const {
     return command;
 }
@@ -142,3 +135,9 @@
     this->command = command;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+decaf::lang::Pointer<commands::Command> ControlCommand::visit( activemq::state::CommandVisitor* visitor ) 
+    throw( exceptions::ActiveMQException ) {
+
+    return visitor->processControlCommand( this );
+}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_CONTROLCOMMAND_H_
 #define _ACTIVEMQ_COMMANDS_CONTROLCOMMAND_H_
 
@@ -23,23 +24,22 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <string>
 #include <activemq/commands/BaseCommand.h>
-#include <decaf/lang/Pointer.h>
 #include <vector>
-#include <string>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for ControlCommand
-     *
+     *  Command code for OpenWire format for ControlCommand
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API ControlCommand : public BaseCommand {
@@ -47,6 +47,10 @@
 
         std::string command;
 
+    public:
+
+        const static unsigned char ID_CONTROLCOMMAND = 14;
+
     protected:
 
         ControlCommand( const ControlCommand& other );
@@ -54,11 +58,8 @@
 
     public:
 
-        const static unsigned char ID_CONTROLCOMMAND = 14;
-
-    public:
-
         ControlCommand();
+
         virtual ~ControlCommand();
 
         /**
@@ -97,6 +98,10 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
+        virtual const std::string& getCommand() const;
+        virtual std::string& getCommand();
+        virtual void setCommand( const std::string& command );
+
         /**
          * Allows a Visitor to visit this command and return a response to the
          * command based on the command type being visited.  The command will call
@@ -107,10 +112,6 @@
         virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
             throw( exceptions::ActiveMQException );
 
-        virtual const std::string& getCommand() const;
-        virtual std::string& getCommand();
-        virtual void setCommand( const std::string& command );
-
     };
 
 }}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.cpp Wed Feb 25 15:23:48 2009
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/DataArrayResponse.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/DataArrayResponse.h>
 
 using namespace std;
 using namespace activemq;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for DataArrayResponse
- *
+ *  Command code for OpenWire format for DataArrayResponse
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 DataArrayResponse::DataArrayResponse() {
 
@@ -43,7 +44,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 DataArrayResponse::~DataArrayResponse() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_DATAARRAYRESPONSE_H_
 #define _ACTIVEMQ_COMMANDS_DATAARRAYRESPONSE_H_
 
@@ -23,24 +24,23 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
-#include <activemq/commands/Response.h>
-#include <decaf/lang/Pointer.h>
 #include <activemq/commands/DataStructure.h>
-#include <vector>
+#include <decaf/lang/Pointer.h>
+#include <activemq/commands/Response.h>
+#include <activemq/util/Config.h>
 #include <string>
+#include <vector>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for DataArrayResponse
-     *
+     *  Command code for OpenWire format for DataArrayResponse
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API DataArrayResponse : public Response {
@@ -48,6 +48,10 @@
 
         std::vector< decaf::lang::Pointer<DataStructure> > data;
 
+    public:
+
+        const static unsigned char ID_DATAARRAYRESPONSE = 33;
+
     protected:
 
         DataArrayResponse( const DataArrayResponse& other );
@@ -55,11 +59,8 @@
 
     public:
 
-        const static unsigned char ID_DATAARRAYRESPONSE = 33;
-
-    public:
-
         DataArrayResponse();
+
         virtual ~DataArrayResponse();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.cpp Wed Feb 25 15:23:48 2009
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/DataResponse.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/DataResponse.h>
 
 using namespace std;
 using namespace activemq;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for DataResponse
- *
+ *  Command code for OpenWire format for DataResponse
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 DataResponse::DataResponse() {
 
@@ -43,7 +44,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 DataResponse::~DataResponse() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_DATARESPONSE_H_
 #define _ACTIVEMQ_COMMANDS_DATARESPONSE_H_
 
@@ -23,24 +24,23 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
-#include <activemq/commands/Response.h>
-#include <decaf/lang/Pointer.h>
 #include <activemq/commands/DataStructure.h>
-#include <vector>
+#include <decaf/lang/Pointer.h>
+#include <activemq/commands/Response.h>
+#include <activemq/util/Config.h>
 #include <string>
+#include <vector>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for DataResponse
-     *
+     *  Command code for OpenWire format for DataResponse
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API DataResponse : public Response {
@@ -48,6 +48,10 @@
 
         decaf::lang::Pointer<DataStructure> data;
 
+    public:
+
+        const static unsigned char ID_DATARESPONSE = 32;
+
     protected:
 
         DataResponse( const DataResponse& other );
@@ -55,11 +59,8 @@
 
     public:
 
-        const static unsigned char ID_DATARESPONSE = 32;
-
-    public:
-
         DataResponse();
+
         virtual ~DataResponse();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.cpp Wed Feb 25 15:23:48 2009
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/DestinationInfo.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/DestinationInfo.h>
 
 using namespace std;
 using namespace activemq;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for DestinationInfo
- *
+ *  Command code for OpenWire format for DestinationInfo
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 DestinationInfo::DestinationInfo() {
 
@@ -45,7 +46,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 DestinationInfo::~DestinationInfo() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -173,13 +173,6 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> DestinationInfo::visit( activemq::state::CommandVisitor* visitor ) 
-    throw( exceptions::ActiveMQException ) {
-
-    return visitor->processDestinationInfo( this );
-}
-
-////////////////////////////////////////////////////////////////////////////////
 const decaf::lang::Pointer<ConnectionId>& DestinationInfo::getConnectionId() const {
     return connectionId;
 }
@@ -244,3 +237,9 @@
     this->brokerPath = brokerPath;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+decaf::lang::Pointer<commands::Command> DestinationInfo::visit( activemq::state::CommandVisitor* visitor ) 
+    throw( exceptions::ActiveMQException ) {
+
+    return visitor->processDestinationInfo( this );
+}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_DESTINATIONINFO_H_
 #define _ACTIVEMQ_COMMANDS_DESTINATIONINFO_H_
 
@@ -23,26 +24,25 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
-#include <activemq/commands/BaseCommand.h>
-#include <decaf/lang/Pointer.h>
 #include <activemq/commands/BrokerId.h>
+#include <decaf/lang/Pointer.h>
 #include <activemq/commands/ConnectionId.h>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <vector>
+#include <activemq/util/Config.h>
 #include <string>
+#include <activemq/commands/BaseCommand.h>
+#include <vector>
+#include <activemq/commands/ActiveMQDestination.h>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for DestinationInfo
-     *
+     *  Command code for OpenWire format for DestinationInfo
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API DestinationInfo : public BaseCommand {
@@ -54,6 +54,10 @@
         long long timeout;
         std::vector< decaf::lang::Pointer<BrokerId> > brokerPath;
 
+    public:
+
+        const static unsigned char ID_DESTINATIONINFO = 8;
+
     protected:
 
         DestinationInfo( const DestinationInfo& other );
@@ -61,11 +65,8 @@
 
     public:
 
-        const static unsigned char ID_DESTINATIONINFO = 8;
-
-    public:
-
         DestinationInfo();
+
         virtual ~DestinationInfo();
 
         /**
@@ -104,16 +105,6 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        /**
-         * Allows a Visitor to visit this command and return a response to the
-         * command based on the command type being visited.  The command will call
-         * the proper processXXX method in the visitor.
-         * 
-         * @return a Response to the visitor being called or NULL if no response.
-         */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
-            throw( exceptions::ActiveMQException );
-
         virtual const decaf::lang::Pointer<ConnectionId>& getConnectionId() const;
         virtual decaf::lang::Pointer<ConnectionId>& getConnectionId();
         virtual void setConnectionId( const decaf::lang::Pointer<ConnectionId>& connectionId );
@@ -132,6 +123,16 @@
         virtual std::vector< decaf::lang::Pointer<BrokerId> >& getBrokerPath();
         virtual void setBrokerPath( const std::vector< decaf::lang::Pointer<BrokerId> >& brokerPath );
 
+        /**
+         * Allows a Visitor to visit this command and return a response to the
+         * command based on the command type being visited.  The command will call
+         * the proper processXXX method in the visitor.
+         * 
+         * @return a Response to the visitor being called or NULL if no response.
+         */
+        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+            throw( exceptions::ActiveMQException );
+
     };
 
 }}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.cpp Wed Feb 25 15:23:48 2009
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/DiscoveryEvent.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/DiscoveryEvent.h>
 
 using namespace std;
 using namespace activemq;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for DiscoveryEvent
- *
+ *  Command code for OpenWire format for DiscoveryEvent
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 DiscoveryEvent::DiscoveryEvent() {
 
@@ -45,7 +46,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 DiscoveryEvent::~DiscoveryEvent() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_DISCOVERYEVENT_H_
 #define _ACTIVEMQ_COMMANDS_DISCOVERYEVENT_H_
 
@@ -23,23 +24,22 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <string>
 #include <activemq/commands/BaseDataStructure.h>
-#include <decaf/lang/Pointer.h>
 #include <vector>
-#include <string>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for DiscoveryEvent
-     *
+     *  Command code for OpenWire format for DiscoveryEvent
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API DiscoveryEvent : public BaseDataStructure {
@@ -48,6 +48,10 @@
         std::string serviceName;
         std::string brokerName;
 
+    public:
+
+        const static unsigned char ID_DISCOVERYEVENT = 40;
+
     protected:
 
         DiscoveryEvent( const DiscoveryEvent& other );
@@ -55,11 +59,8 @@
 
     public:
 
-        const static unsigned char ID_DISCOVERYEVENT = 40;
-
-    public:
-
         DiscoveryEvent();
+
         virtual ~DiscoveryEvent();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.cpp Wed Feb 25 15:23:48 2009
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/ExceptionResponse.h>
 #include <activemq/state/CommandVisitor.h>
-#include <activemq/exceptions/ActiveMQException.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for ExceptionResponse
- *
+ *  Command code for OpenWire format for ExceptionResponse
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 ExceptionResponse::ExceptionResponse() {
 
@@ -43,7 +44,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 ExceptionResponse::~ExceptionResponse() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_EXCEPTIONRESPONSE_H_
 #define _ACTIVEMQ_COMMANDS_EXCEPTIONRESPONSE_H_
 
@@ -23,24 +24,23 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
-#include <activemq/commands/Response.h>
 #include <decaf/lang/Pointer.h>
+#include <activemq/commands/Response.h>
+#include <activemq/util/Config.h>
+#include <string>
 #include <activemq/commands/BrokerError.h>
 #include <vector>
-#include <string>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for ExceptionResponse
-     *
+     *  Command code for OpenWire format for ExceptionResponse
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API ExceptionResponse : public Response {
@@ -48,6 +48,10 @@
 
         decaf::lang::Pointer<BrokerError> exception;
 
+    public:
+
+        const static unsigned char ID_EXCEPTIONRESPONSE = 31;
+
     protected:
 
         ExceptionResponse( const ExceptionResponse& other );
@@ -55,11 +59,8 @@
 
     public:
 
-        const static unsigned char ID_EXCEPTIONRESPONSE = 31;
-
-    public:
-
         ExceptionResponse();
+
         virtual ~ExceptionResponse();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp Wed Feb 25 15:23:48 2009
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/FlushCommand.h>
 #include <activemq/state/CommandVisitor.h>
-#include <activemq/exceptions/ActiveMQException.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for FlushCommand
- *
+ *  Command code for OpenWire format for FlushCommand
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 FlushCommand::FlushCommand() {
 
@@ -43,7 +44,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 FlushCommand::~FlushCommand() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -120,4 +120,3 @@
 
     return visitor->processFlushCommand( this );
 }
-

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_FLUSHCOMMAND_H_
 #define _ACTIVEMQ_COMMANDS_FLUSHCOMMAND_H_
 
@@ -23,29 +24,32 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <string>
 #include <activemq/commands/BaseCommand.h>
-#include <decaf/lang/Pointer.h>
 #include <vector>
-#include <string>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for FlushCommand
-     *
+     *  Command code for OpenWire format for FlushCommand
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API FlushCommand : public BaseCommand {
     protected:
 
 
+    public:
+
+        const static unsigned char ID_FLUSHCOMMAND = 15;
+
     protected:
 
         FlushCommand( const FlushCommand& other );
@@ -53,11 +57,8 @@
 
     public:
 
-        const static unsigned char ID_FLUSHCOMMAND = 15;
-
-    public:
-
         FlushCommand();
+
         virtual ~FlushCommand();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp Wed Feb 25 15:23:48 2009
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/IntegerResponse.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/IntegerResponse.h>
 
 using namespace std;
 using namespace activemq;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for IntegerResponse
- *
+ *  Command code for OpenWire format for IntegerResponse
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 IntegerResponse::IntegerResponse() {
 
@@ -44,7 +45,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 IntegerResponse::~IntegerResponse() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_INTEGERRESPONSE_H_
 #define _ACTIVEMQ_COMMANDS_INTEGERRESPONSE_H_
 
@@ -23,23 +24,22 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
-#include <activemq/commands/Response.h>
 #include <decaf/lang/Pointer.h>
-#include <vector>
+#include <activemq/commands/Response.h>
+#include <activemq/util/Config.h>
 #include <string>
+#include <vector>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for IntegerResponse
-     *
+     *  Command code for OpenWire format for IntegerResponse
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API IntegerResponse : public Response {
@@ -47,6 +47,10 @@
 
         int result;
 
+    public:
+
+        const static unsigned char ID_INTEGERRESPONSE = 34;
+
     protected:
 
         IntegerResponse( const IntegerResponse& other );
@@ -54,11 +58,8 @@
 
     public:
 
-        const static unsigned char ID_INTEGERRESPONSE = 34;
-
-    public:
-
         IntegerResponse();
+
         virtual ~IntegerResponse();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp Wed Feb 25 15:23:48 2009
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/JournalQueueAck.h>
 #include <activemq/state/CommandVisitor.h>
-#include <activemq/exceptions/ActiveMQException.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for JournalQueueAck
- *
+ *  Command code for OpenWire format for JournalQueueAck
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 JournalQueueAck::JournalQueueAck() {
 
@@ -43,7 +44,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 JournalQueueAck::~JournalQueueAck() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_JOURNALQUEUEACK_H_
 #define _ACTIVEMQ_COMMANDS_JOURNALQUEUEACK_H_
 
@@ -23,25 +24,24 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
-#include <activemq/commands/BaseDataStructure.h>
 #include <decaf/lang/Pointer.h>
 #include <activemq/commands/MessageAck.h>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <vector>
+#include <activemq/util/Config.h>
 #include <string>
+#include <activemq/commands/BaseDataStructure.h>
+#include <vector>
+#include <activemq/commands/ActiveMQDestination.h>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for JournalQueueAck
-     *
+     *  Command code for OpenWire format for JournalQueueAck
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API JournalQueueAck : public BaseDataStructure {
@@ -50,6 +50,10 @@
         decaf::lang::Pointer<ActiveMQDestination> destination;
         decaf::lang::Pointer<MessageAck> messageAck;
 
+    public:
+
+        const static unsigned char ID_JOURNALQUEUEACK = 52;
+
     protected:
 
         JournalQueueAck( const JournalQueueAck& other );
@@ -57,11 +61,8 @@
 
     public:
 
-        const static unsigned char ID_JOURNALQUEUEACK = 52;
-
-    public:
-
         JournalQueueAck();
+
         virtual ~JournalQueueAck();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp Wed Feb 25 15:23:48 2009
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/JournalTopicAck.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/JournalTopicAck.h>
 
 using namespace std;
 using namespace activemq;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for JournalTopicAck
- *
+ *  Command code for OpenWire format for JournalTopicAck
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 JournalTopicAck::JournalTopicAck() {
 
@@ -46,7 +47,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 JournalTopicAck::~JournalTopicAck() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_JOURNALTOPICACK_H_
 #define _ACTIVEMQ_COMMANDS_JOURNALTOPICACK_H_
 
@@ -23,26 +24,25 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <activemq/commands/MessageId.h>
+#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <string>
 #include <activemq/commands/BaseDataStructure.h>
-#include <decaf/lang/Pointer.h>
-#include <activemq/commands/TransactionId.h>
-#include <activemq/commands/MessageId.h>
-#include <activemq/commands/ActiveMQDestination.h>
 #include <vector>
-#include <string>
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/TransactionId.h>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for JournalTopicAck
-     *
+     *  Command code for OpenWire format for JournalTopicAck
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API JournalTopicAck : public BaseDataStructure {
@@ -55,6 +55,10 @@
         std::string clientId;
         decaf::lang::Pointer<TransactionId> transactionId;
 
+    public:
+
+        const static unsigned char ID_JOURNALTOPICACK = 50;
+
     protected:
 
         JournalTopicAck( const JournalTopicAck& other );
@@ -62,11 +66,8 @@
 
     public:
 
-        const static unsigned char ID_JOURNALTOPICACK = 50;
-
-    public:
-
         JournalTopicAck();
+
         virtual ~JournalTopicAck();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp Wed Feb 25 15:23:48 2009
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/JournalTrace.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/JournalTrace.h>
 
 using namespace std;
 using namespace activemq;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for JournalTrace
- *
+ *  Command code for OpenWire format for JournalTrace
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 JournalTrace::JournalTrace() {
 
@@ -44,7 +45,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 JournalTrace::~JournalTrace() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_JOURNALTRACE_H_
 #define _ACTIVEMQ_COMMANDS_JOURNALTRACE_H_
 
@@ -23,23 +24,22 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <string>
 #include <activemq/commands/BaseDataStructure.h>
-#include <decaf/lang/Pointer.h>
 #include <vector>
-#include <string>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for JournalTrace
-     *
+     *  Command code for OpenWire format for JournalTrace
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API JournalTrace : public BaseDataStructure {
@@ -47,6 +47,10 @@
 
         std::string message;
 
+    public:
+
+        const static unsigned char ID_JOURNALTRACE = 53;
+
     protected:
 
         JournalTrace( const JournalTrace& other );
@@ -54,11 +58,8 @@
 
     public:
 
-        const static unsigned char ID_JOURNALTRACE = 53;
-
-    public:
-
         JournalTrace();
+
         virtual ~JournalTrace();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp Wed Feb 25 15:23:48 2009
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/JournalTransaction.h>
 #include <activemq/state/CommandVisitor.h>
-#include <activemq/exceptions/ActiveMQException.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for JournalTransaction
- *
+ *  Command code for OpenWire format for JournalTransaction
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 JournalTransaction::JournalTransaction() {
 
@@ -45,7 +46,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 JournalTransaction::~JournalTransaction() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_JOURNALTRANSACTION_H_
 #define _ACTIVEMQ_COMMANDS_JOURNALTRANSACTION_H_
 
@@ -23,24 +24,23 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <string>
 #include <activemq/commands/BaseDataStructure.h>
-#include <decaf/lang/Pointer.h>
-#include <activemq/commands/TransactionId.h>
 #include <vector>
-#include <string>
+#include <activemq/commands/TransactionId.h>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for JournalTransaction
-     *
+     *  Command code for OpenWire format for JournalTransaction
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API JournalTransaction : public BaseDataStructure {
@@ -50,6 +50,10 @@
         unsigned char type;
         bool wasPrepared;
 
+    public:
+
+        const static unsigned char ID_JOURNALTRANSACTION = 54;
+
     protected:
 
         JournalTransaction( const JournalTransaction& other );
@@ -57,11 +61,8 @@
 
     public:
 
-        const static unsigned char ID_JOURNALTRANSACTION = 54;
-
-    public:
-
         JournalTransaction();
+
         virtual ~JournalTransaction();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp Wed Feb 25 15:23:48 2009
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/KeepAliveInfo.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/state/CommandVisitor.h>
+#include <activemq/commands/KeepAliveInfo.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for KeepAliveInfo
- *
+ *  Command code for OpenWire format for KeepAliveInfo
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 KeepAliveInfo::KeepAliveInfo() {
 
@@ -43,7 +44,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 KeepAliveInfo::~KeepAliveInfo() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -120,4 +120,3 @@
 
     return visitor->processKeepAliveInfo( this );
 }
-

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_KEEPALIVEINFO_H_
 #define _ACTIVEMQ_COMMANDS_KEEPALIVEINFO_H_
 
@@ -23,29 +24,32 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <string>
 #include <activemq/commands/BaseCommand.h>
-#include <decaf/lang/Pointer.h>
 #include <vector>
-#include <string>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for KeepAliveInfo
-     *
+     *  Command code for OpenWire format for KeepAliveInfo
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API KeepAliveInfo : public BaseCommand {
     protected:
 
 
+    public:
+
+        const static unsigned char ID_KEEPALIVEINFO = 10;
+
     protected:
 
         KeepAliveInfo( const KeepAliveInfo& other );
@@ -53,11 +57,8 @@
 
     public:
 
-        const static unsigned char ID_KEEPALIVEINFO = 10;
-
-    public:
-
         KeepAliveInfo();
+
         virtual ~KeepAliveInfo();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp Wed Feb 25 15:23:48 2009
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/LastPartialCommand.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/LastPartialCommand.h>
 
 using namespace std;
 using namespace activemq;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for LastPartialCommand
- *
+ *  Command code for OpenWire format for LastPartialCommand
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 LastPartialCommand::LastPartialCommand() {
 
@@ -43,7 +44,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 LastPartialCommand::~LastPartialCommand() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_LASTPARTIALCOMMAND_H_
 #define _ACTIVEMQ_COMMANDS_LASTPARTIALCOMMAND_H_
 
@@ -23,29 +24,32 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
-#include <activemq/commands/PartialCommand.h>
 #include <decaf/lang/Pointer.h>
-#include <vector>
+#include <activemq/util/Config.h>
 #include <string>
+#include <vector>
+#include <activemq/commands/PartialCommand.h>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for LastPartialCommand
-     *
+     *  Command code for OpenWire format for LastPartialCommand
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API LastPartialCommand : public PartialCommand {
     protected:
 
 
+    public:
+
+        const static unsigned char ID_LASTPARTIALCOMMAND = 61;
+
     protected:
 
         LastPartialCommand( const LastPartialCommand& other );
@@ -53,11 +57,8 @@
 
     public:
 
-        const static unsigned char ID_LASTPARTIALCOMMAND = 61;
-
-    public:
-
         LastPartialCommand();
+
         virtual ~LastPartialCommand();
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp Wed Feb 25 15:23:48 2009
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/LocalTransactionId.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
-#include <decaf/lang/exceptions/NullPointerException.h>
 #include <apr_strings.h>
+#include <activemq/state/CommandVisitor.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/LocalTransactionId.h>
 
 using namespace std;
 using namespace activemq;
@@ -29,14 +30,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for LocalTransactionId
- *
+ *  Command code for OpenWire format for LocalTransactionId
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 LocalTransactionId::LocalTransactionId() {
 
@@ -50,7 +51,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 LocalTransactionId::~LocalTransactionId() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -200,6 +200,7 @@
 bool LocalTransactionId::operator<( const LocalTransactionId& value ) const {
     return this->compareTo( value ) < 0;
 }
+
 ////////////////////////////////////////////////////////////////////////////////
 LocalTransactionId& LocalTransactionId::operator= ( const LocalTransactionId& other ) {
     this->copyDataStructure( &other );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_LOCALTRANSACTIONID_H_
 #define _ACTIVEMQ_COMMANDS_LOCALTRANSACTIONID_H_
 
@@ -23,25 +24,24 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
-#include <activemq/commands/TransactionId.h>
 #include <decaf/lang/Pointer.h>
 #include <decaf/lang/Comparable.h>
 #include <activemq/commands/ConnectionId.h>
-#include <vector>
+#include <activemq/util/Config.h>
 #include <string>
+#include <vector>
+#include <activemq/commands/TransactionId.h>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for LocalTransactionId
-     *
+     *  Command code for OpenWire format for LocalTransactionId
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API LocalTransactionId : public TransactionId, public decaf::lang::Comparable<LocalTransactionId> {
@@ -59,7 +59,9 @@
     public:
 
         LocalTransactionId();
+
         LocalTransactionId( const LocalTransactionId& other );
+
         virtual ~LocalTransactionId();
 
         /**
@@ -114,6 +116,7 @@
         virtual bool operator<( const LocalTransactionId& value ) const;
 
         LocalTransactionId& operator= ( const LocalTransactionId& other );
+
     };
 
 }}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp Wed Feb 25 15:23:48 2009
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <activemq/commands/Message.h>
-#include <activemq/state/CommandVisitor.h>
+
 #include <activemq/exceptions/ActiveMQException.h>
+#include <activemq/wireformat/openwire/marshal/PrimitiveMapMarshaller.h>
+#include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <activemq/commands/Message.h>
 #include <activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h>
-#include <activemq/wireformat/openwire/marshal/PrimitiveMapMarshaller.h>
 
 using namespace std;
 using namespace activemq;
@@ -30,14 +31,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for Message
- *
+ *  Command code for OpenWire format for Message
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 Message::Message() {
 
@@ -64,7 +65,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 Message::~Message() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -96,15 +96,11 @@
     // Copy the data of the base class or classes
     BaseCommand::copyDataStructure( src );
 
-    this->properties.copy( srcPtr->properties );
-    this->setAckHandler( srcPtr->getAckHandler() );
     this->setProducerId( srcPtr->getProducerId() );
     this->setDestination( srcPtr->getDestination() );
     this->setTransactionId( srcPtr->getTransactionId() );
     this->setOriginalDestination( srcPtr->getOriginalDestination() );
-    if( this->getMessageId() != NULL ) {
-        this->setMessageId( Pointer<MessageId>( new MessageId( *( srcPtr->getMessageId() ) ) ) );
-    }
+    this->setMessageId( srcPtr->getMessageId() );
     this->setOriginalTransactionId( srcPtr->getOriginalTransactionId() );
     this->setGroupID( srcPtr->getGroupID() );
     this->setGroupSequence( srcPtr->getGroupSequence() );
@@ -129,6 +125,10 @@
     this->setCluster( srcPtr->getCluster() );
     this->setBrokerInTime( srcPtr->getBrokerInTime() );
     this->setBrokerOutTime( srcPtr->getBrokerOutTime() );
+    this->properties.copy( srcPtr->properties );
+    this->setAckHandler( srcPtr->getAckHandler() );
+    this->setReadOnlyBody( srcPtr->isReadOnlyBody() );
+    this->setReadOnlyProperties( srcPtr->isReadOnlyProperties() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -143,10 +143,6 @@
 
     stream << "Begin Class = Message" << std::endl;
     stream << " Value of Message::ID_MESSAGE = 0" << std::endl;
-    stream << " Value of ackHandler = " << ackHandler << std::endl;
-    stream << " Value of properties = " << this->properties.toString() << std::endl;
-    stream << " Value of readOnlyBody = " << this->readOnlyBody << std::endl;
-    stream << " Value of readOnlyProperties = " << this->readOnlyBody << std::endl;
     stream << " Value of ProducerId is Below:" << std::endl;
     if( this->getProducerId() != NULL ) {
         stream << this->getProducerId()->toString() << std::endl;
@@ -239,6 +235,10 @@
     }
     stream << " Value of BrokerInTime = " << this->getBrokerInTime() << std::endl;
     stream << " Value of BrokerOutTime = " << this->getBrokerOutTime() << std::endl;
+    stream << " Value of ackHandler = " << ackHandler << std::endl;
+    stream << " Value of properties = " << this->properties.toString() << std::endl;
+    stream << " Value of readOnlyBody = " << this->readOnlyBody << std::endl;
+    stream << " Value of readOnlyProperties = " << this->readOnlyBody << std::endl;
     stream << BaseCommand::toString();
     stream << "End Class = Message" << std::endl;
 
@@ -258,14 +258,6 @@
         return false;
     }
 
-    if( ackHandler != valuePtr->getAckHandler() ){
-        return false;
-    }
-
-    if( !properties.equals( valuePtr->properties ) ) {
-        return false;
-    }
-
     if( this->getProducerId() != NULL ) {
         if( !this->getProducerId()->equals( valuePtr->getProducerId().get() ) ) {
             return false;
@@ -405,28 +397,26 @@
     if( this->getBrokerOutTime() != valuePtr->getBrokerOutTime() ) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if( ackHandler != valuePtr->getAckHandler() ){
         return false;
     }
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned int Message::getSize() const {
 
-    unsigned int size = DEFAULT_MESSAGE_SIZE;
-
-    size += (unsigned int)this->getContent().size();
-    size += (unsigned int)this->getMarshalledProperties().size();
+    if( !properties.equals( valuePtr->properties ) ) {
+        return false;
+    }
 
-    return size;
-}
+    if( readOnlyBody != valuePtr->isReadOnlyBody() ){
+        return false;
+    }
 
-////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> Message::visit( activemq::state::CommandVisitor* visitor ) 
-    throw( exceptions::ActiveMQException ) {
+    if( readOnlyProperties != valuePtr->isReadOnlyProperties() ){
+        return false;
+    }
 
-    return visitor->processMessage( this );
+    if( !BaseCommand::equals( value ) ) {
+        return false;
+    }
+    return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -805,34 +795,50 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-    void Message::beforeMarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED )
-        throw ( decaf::io::IOException ) {
+decaf::lang::Pointer<commands::Command> Message::visit( activemq::state::CommandVisitor* visitor ) 
+    throw( exceptions::ActiveMQException ) {
 
-        try{
+    return visitor->processMessage( this );
+}
+////////////////////////////////////////////////////////////////////////////////
+unsigned int Message::getSize() const {
 
-            marshalledProperties.clear();
-            if( !properties.isEmpty() )
-            {
-                wireformat::openwire::marshal::PrimitiveMapMarshaller::marshal(
-                    &properties, marshalledProperties );
-            }
-        }
-        AMQ_CATCH_RETHROW( decaf::io::IOException )
-        AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, decaf::io::IOException )
-        AMQ_CATCHALL_THROW( decaf::io::IOException )
-    }
+    unsigned int size = DEFAULT_MESSAGE_SIZE;
+
+    size += (unsigned int)this->getContent().size();
+    size += (unsigned int)this->getMarshalledProperties().size();
+
+    return size;
+}
 
 ////////////////////////////////////////////////////////////////////////////////
-    void Message::afterUnmarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED )
-        throw ( decaf::io::IOException ) {
+void Message::beforeMarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED )
+    throw ( decaf::io::IOException ) {
 
-        try{
+    try{
 
-            wireformat::openwire::marshal::PrimitiveMapMarshaller::unmarshal(
+        marshalledProperties.clear();
+        if( !properties.isEmpty() ) {
+            wireformat::openwire::marshal::PrimitiveMapMarshaller::marshal(
                 &properties, marshalledProperties );
         }
-        AMQ_CATCH_RETHROW( decaf::io::IOException )
-        AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, decaf::io::IOException )
-        AMQ_CATCHALL_THROW( decaf::io::IOException )
     }
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void Message::afterUnmarshal( wireformat::WireFormat* wireFormat AMQCPP_UNUSED )
+    throw ( decaf::io::IOException ) {
+
+    try{
+
+        wireformat::openwire::marshal::PrimitiveMapMarshaller::unmarshal(
+            &properties, marshalledProperties );
+    }
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
+}
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_MESSAGE_H_
 #define _ACTIVEMQ_COMMANDS_MESSAGE_H_
 
@@ -23,20 +24,20 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/util/Config.h>
+#include <activemq/commands/MessageId.h>
+#include <activemq/commands/DataStructure.h>
+#include <decaf/util/Date.h>
 #include <activemq/commands/BaseCommand.h>
+#include <vector>
+#include <activemq/commands/ProducerId.h>
 #include <activemq/util/PrimitiveMap.h>
-#include <decaf/util/Date.h>
 #include <decaf/lang/Pointer.h>
 #include <activemq/commands/BrokerId.h>
+#include <string>
+#include <activemq/util/Config.h>
+#include <activemq/commands/ActiveMQDestination.h>
 #include <activemq/commands/TransactionId.h>
 #include <activemq/commands/ConsumerId.h>
-#include <activemq/commands/MessageId.h>
-#include <activemq/commands/ProducerId.h>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <activemq/commands/DataStructure.h>
-#include <vector>
-#include <string>
 
 namespace activemq{
 namespace core{
@@ -46,12 +47,11 @@
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for Message
-     *
+     *  Command code for OpenWire format for Message
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API Message : public BaseCommand {
@@ -75,6 +75,8 @@
 
         static const unsigned int DEFAULT_MESSAGE_SIZE = 1024;
 
+    protected:
+
         decaf::lang::Pointer<ProducerId> producerId;
         decaf::lang::Pointer<ActiveMQDestination> destination;
         decaf::lang::Pointer<TransactionId> transactionId;
@@ -105,6 +107,10 @@
         long long brokerInTime;
         long long brokerOutTime;
 
+    public:
+
+        const static unsigned char ID_MESSAGE = 0;
+
     protected:
 
         Message( const Message& other );
@@ -112,11 +118,8 @@
 
     public:
 
-        const static unsigned char ID_MESSAGE = 0;
-
-    public:
-
         Message();
+
         virtual ~Message();
 
         /**
@@ -156,13 +159,6 @@
         virtual bool equals( const DataStructure* value ) const;
 
         /**
-         * @return an answer of true to the isMessage() query.
-         */
-        virtual bool isMessage() const {
-            return true;
-        }
-
-        /**
          * Handles the marshaling of the objects properties into the
          * internal byte array before the object is marshaled to the
          * wire
@@ -271,16 +267,6 @@
             this->readOnlyBody = value;
         }
 
-        /**
-         * Allows a Visitor to visit this command and return a response to the
-         * command based on the command type being visited.  The command will call
-         * the proper processXXX method in the visitor.
-         * 
-         * @return a Response to the visitor being called or NULL if no response.
-         */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
-            throw( exceptions::ActiveMQException );
-
         virtual const decaf::lang::Pointer<ProducerId>& getProducerId() const;
         virtual decaf::lang::Pointer<ProducerId>& getProducerId();
         virtual void setProducerId( const decaf::lang::Pointer<ProducerId>& producerId );
@@ -385,6 +371,16 @@
         virtual long long getBrokerOutTime() const;
         virtual void setBrokerOutTime( long long brokerOutTime );
 
+        /**
+         * Allows a Visitor to visit this command and return a response to the
+         * command based on the command type being visited.  The command will call
+         * the proper processXXX method in the visitor.
+         * 
+         * @return a Response to the visitor being called or NULL if no response.
+         */
+        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+            throw( exceptions::ActiveMQException );
+
     };
 
 }}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp Wed Feb 25 15:23:48 2009
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/MessageAck.h>
 #include <activemq/state/CommandVisitor.h>
-#include <activemq/exceptions/ActiveMQException.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
@@ -28,14 +29,14 @@
 
 /*
  *
- *  Command and marshaling code for OpenWire format for MessageAck
- *
+ *  Command code for OpenWire format for MessageAck
  *
  *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
+ *         activemq-cpp-openwire-generator module
  *
  */
+
 ////////////////////////////////////////////////////////////////////////////////
 MessageAck::MessageAck() {
 
@@ -45,7 +46,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 MessageAck::~MessageAck() {
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -197,13 +197,6 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> MessageAck::visit( activemq::state::CommandVisitor* visitor ) 
-    throw( exceptions::ActiveMQException ) {
-
-    return visitor->processMessageAck( this );
-}
-
-////////////////////////////////////////////////////////////////////////////////
 const decaf::lang::Pointer<ActiveMQDestination>& MessageAck::getDestination() const {
     return destination;
 }
@@ -298,3 +291,9 @@
     this->messageCount = messageCount;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+decaf::lang::Pointer<commands::Command> MessageAck::visit( activemq::state::CommandVisitor* visitor ) 
+    throw( exceptions::ActiveMQException ) {
+
+    return visitor->processMessageAck( this );
+}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h?rev=747816&r1=747815&r2=747816&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h Wed Feb 25 15:23:48 2009
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #ifndef _ACTIVEMQ_COMMANDS_MESSAGEACK_H_
 #define _ACTIVEMQ_COMMANDS_MESSAGEACK_H_
 
@@ -23,27 +24,26 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <activemq/commands/MessageId.h>
+#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <string>
 #include <activemq/commands/BaseCommand.h>
-#include <decaf/lang/Pointer.h>
+#include <vector>
+#include <activemq/commands/ActiveMQDestination.h>
 #include <activemq/commands/TransactionId.h>
-#include <activemq/commands/MessageId.h>
 #include <activemq/commands/ConsumerId.h>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <vector>
-#include <string>
 
 namespace activemq{
 namespace commands{
 
     /*
      *
-     *  Command and marshaling code for OpenWire format for MessageAck
-     *
+     *  Command code for OpenWire format for MessageAck
      *
      *  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
+     *         in the activemq-cpp-openwire-generator module
      *
      */
     class AMQCPP_API MessageAck : public BaseCommand {
@@ -57,6 +57,10 @@
         decaf::lang::Pointer<MessageId> lastMessageId;
         int messageCount;
 
+    public:
+
+        const static unsigned char ID_MESSAGEACK = 22;
+
     protected:
 
         MessageAck( const MessageAck& other );
@@ -64,11 +68,8 @@
 
     public:
 
-        const static unsigned char ID_MESSAGEACK = 22;
-
-    public:
-
         MessageAck();
+
         virtual ~MessageAck();
 
         /**
@@ -107,23 +108,6 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
-        /**
-         * @return an answer of true to the isMessageAck() query.
-         */
-        virtual bool isMessageAck() const {
-            return true;
-        }
-
-        /**
-         * Allows a Visitor to visit this command and return a response to the
-         * command based on the command type being visited.  The command will call
-         * the proper processXXX method in the visitor.
-         * 
-         * @return a Response to the visitor being called or NULL if no response.
-         */
-        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
-            throw( exceptions::ActiveMQException );
-
         virtual const decaf::lang::Pointer<ActiveMQDestination>& getDestination() const;
         virtual decaf::lang::Pointer<ActiveMQDestination>& getDestination();
         virtual void setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination );
@@ -150,6 +134,23 @@
         virtual int getMessageCount() const;
         virtual void setMessageCount( int messageCount );
 
+        /**
+         * @return an answer of true to the isMessageAck() query.
+         */
+        virtual bool isMessageAck() const {
+            return true;
+        }
+
+        /**
+         * Allows a Visitor to visit this command and return a response to the
+         * command based on the command type being visited.  The command will call
+         * the proper processXXX method in the visitor.
+         * 
+         * @return a Response to the visitor being called or NULL if no response.
+         */
+        virtual decaf::lang::Pointer<commands::Command> visit( activemq::state::CommandVisitor* visitor )
+            throw( exceptions::ActiveMQException );
+
     };
 
 }}



Mime
View raw message