activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r503438 [1/3] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/activemq/connector/openwire/commands/ main/activemq/connector/openwire/marshal/v2/ main/activemq/connector/stomp/commands/ main/activemq/transport/ test/activemq/connect...
Date Sun, 04 Feb 2007 16:37:52 GMT
Author: tabish
Date: Sun Feb  4 08:37:46 2007
New Revision: 503438

URL: http://svn.apache.org/viewvc?view=rev&rev=503438
Log:
http://issues.apache.org/activemq/browse/AMQCPP-30

Fix the commands ands marshallers to have fewer warnings and correct heirarchy.  The Response message now returns an int for correlation id instead of unsigned int so as to match the Java version.

Removed:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseCommand.cpp
Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerError.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionError.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionError.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ControlCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ControlCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/FlushCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/FlushCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/IntegerResponse.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/IntegerResponse.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTopicAck.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTopicAck.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/KeepAliveInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/KeepAliveInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/LocalTransactionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/LocalTransactionId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatch.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatch.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessagePull.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessagePull.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ReplayCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Response.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Response.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/SessionInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ShutdownInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/srcmakefile.mk
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectedCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/Command.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/Response.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/openwire/marshal/v2/BrokerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/IOTransportTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/ResponseCorrelatorTest.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseCommand.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseCommand.h Sun Feb  4 08:37:46 2007
@@ -19,6 +19,7 @@
 #define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_BASECOMMAND_H_
 
 #include <activemq/transport/Command.h>
+#include <activemq/transport/Response.h>
 #include <activemq/connector/openwire/commands/BaseDataStructure.h>
 
 namespace activemq{
@@ -26,19 +27,24 @@
 namespace openwire{
 namespace commands{
 
-    class BaseCommand : public transport::Command,
+    template< typename T > 
+    class BaseCommand : public T,
                         public BaseDataStructure
     {
     public:
     
-        BaseCommand();
-        virtual ~BaseCommand();
+        BaseCommand() {
+            this->commandId = 0;
+            this->responseRequired = false;
+        }
+        
+        virtual ~BaseCommand() {}
         
         /**
          * Sets the Command Id of this Message
          * @param id Command Id
          */
-        virtual void setCommandId( const unsigned int id ) {
+        virtual void setCommandId( int id ) {
             this->commandId = id;
         }
 
@@ -46,7 +52,7 @@
          * Gets the Command Id of this Message
          * @return Command Id
          */
-        virtual unsigned int getCommandId() const {
+        virtual int getCommandId() const {
             return commandId;
         }
         

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerError.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerError.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerError.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerError.h Sun Feb  4 08:37:46 2007
@@ -33,7 +33,7 @@
      * This class represents an Exception sent from the Broker.  The Broker
      * sends java Throwables, so we must mimic its structure here.
      */
-    class BrokerError : public BaseCommand
+    class BrokerError : public BaseCommand<transport::Command>
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp Sun Feb  4 08:37:46 2007
@@ -71,7 +71,7 @@
 void BrokerInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const BrokerInfo* srcPtr = dynamic_cast<const BrokerInfo*>( src );
 
@@ -165,12 +165,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool BrokerInfo::isSlaveBroker() const {
-    return slaveBroker;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool BrokerInfo::isSlaveBroker() {
+bool BrokerInfo::isSlaveBroker() const {
     return slaveBroker;
 }
 
@@ -180,12 +175,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool BrokerInfo::isMasterBroker() const {
-    return masterBroker;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool BrokerInfo::isMasterBroker() {
+bool BrokerInfo::isMasterBroker() const {
     return masterBroker;
 }
 
@@ -195,12 +185,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool BrokerInfo::isFaultTolerantConfiguration() const {
-    return faultTolerantConfiguration;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool BrokerInfo::isFaultTolerantConfiguration() {
+bool BrokerInfo::isFaultTolerantConfiguration() const {
     return faultTolerantConfiguration;
 }
 
@@ -210,12 +195,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool BrokerInfo::isDuplexConnection() const {
-    return duplexConnection;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool BrokerInfo::isDuplexConnection() {
+bool BrokerInfo::isDuplexConnection() const {
     return duplexConnection;
 }
 
@@ -225,12 +205,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool BrokerInfo::isNetworkConnection() const {
-    return networkConnection;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool BrokerInfo::isNetworkConnection() {
+bool BrokerInfo::isNetworkConnection() const {
     return networkConnection;
 }
 
@@ -240,12 +215,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long BrokerInfo::getConnectionId() const {
-    return connectionId;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long BrokerInfo::getConnectionId() {
+long long BrokerInfo::getConnectionId() const {
     return connectionId;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.h Sun Feb  4 08:37:46 2007
@@ -44,7 +44,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class BrokerInfo : public BaseCommand
+    class BrokerInfo : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -105,28 +105,22 @@
         virtual std::string& getBrokerName();
         virtual void setBrokerName( const std::string& brokerName );
 
-        virtual const bool isSlaveBroker() const;
-        virtual bool isSlaveBroker();
+        virtual bool isSlaveBroker() const;
         virtual void setSlaveBroker( bool slaveBroker );
 
-        virtual const bool isMasterBroker() const;
-        virtual bool isMasterBroker();
+        virtual bool isMasterBroker() const;
         virtual void setMasterBroker( bool masterBroker );
 
-        virtual const bool isFaultTolerantConfiguration() const;
-        virtual bool isFaultTolerantConfiguration();
+        virtual bool isFaultTolerantConfiguration() const;
         virtual void setFaultTolerantConfiguration( bool faultTolerantConfiguration );
 
-        virtual const bool isDuplexConnection() const;
-        virtual bool isDuplexConnection();
+        virtual bool isDuplexConnection() const;
         virtual void setDuplexConnection( bool duplexConnection );
 
-        virtual const bool isNetworkConnection() const;
-        virtual bool isNetworkConnection();
+        virtual bool isNetworkConnection() const;
         virtual void setNetworkConnection( bool networkConnection );
 
-        virtual const long long getConnectionId() const;
-        virtual long long getConnectionId();
+        virtual long long getConnectionId() const;
         virtual void setConnectionId( long long connectionId );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp Sun Feb  4 08:37:46 2007
@@ -63,7 +63,7 @@
 void ConnectionControl::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const ConnectionControl* srcPtr = dynamic_cast<const ConnectionControl*>( src );
 
@@ -86,12 +86,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConnectionControl::isClose() const {
-    return close;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConnectionControl::isClose() {
+bool ConnectionControl::isClose() const {
     return close;
 }
 
@@ -101,12 +96,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConnectionControl::isExit() const {
-    return exit;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConnectionControl::isExit() {
+bool ConnectionControl::isExit() const {
     return exit;
 }
 
@@ -116,12 +106,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConnectionControl::isFaultTolerant() const {
-    return faultTolerant;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConnectionControl::isFaultTolerant() {
+bool ConnectionControl::isFaultTolerant() const {
     return faultTolerant;
 }
 
@@ -131,12 +116,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConnectionControl::isResume() const {
-    return resume;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConnectionControl::isResume() {
+bool ConnectionControl::isResume() const {
     return resume;
 }
 
@@ -146,12 +126,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConnectionControl::isSuspend() const {
-    return suspend;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConnectionControl::isSuspend() {
+bool ConnectionControl::isSuspend() const {
     return suspend;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.h Sun Feb  4 08:37:46 2007
@@ -42,7 +42,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class ConnectionControl : public BaseCommand
+    class ConnectionControl : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -82,24 +82,19 @@
          */
         virtual void copyDataStructure( const DataStructure* src );
 
-        virtual const bool isClose() const;
-        virtual bool isClose();
+        virtual bool isClose() const;
         virtual void setClose( bool close );
 
-        virtual const bool isExit() const;
-        virtual bool isExit();
+        virtual bool isExit() const;
         virtual void setExit( bool exit );
 
-        virtual const bool isFaultTolerant() const;
-        virtual bool isFaultTolerant();
+        virtual bool isFaultTolerant() const;
         virtual void setFaultTolerant( bool faultTolerant );
 
-        virtual const bool isResume() const;
-        virtual bool isResume();
+        virtual bool isResume() const;
         virtual void setResume( bool resume );
 
-        virtual const bool isSuspend() const;
-        virtual bool isSuspend();
+        virtual bool isSuspend() const;
         virtual void setSuspend( bool suspend );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionError.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionError.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionError.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionError.cpp Sun Feb  4 08:37:46 2007
@@ -62,7 +62,7 @@
 void ConnectionError::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const ConnectionError* srcPtr = dynamic_cast<const ConnectionError*>( src );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionError.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionError.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionError.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionError.h Sun Feb  4 08:37:46 2007
@@ -44,7 +44,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class ConnectionError : public BaseCommand
+    class ConnectionError : public BaseCommand<transport::Command>
     {
     protected:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp Sun Feb  4 08:37:46 2007
@@ -69,7 +69,7 @@
 void ConnectionInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const ConnectionInfo* srcPtr = dynamic_cast<const ConnectionInfo*>( src );
 
@@ -176,12 +176,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConnectionInfo::isBrokerMasterConnector() const {
-    return brokerMasterConnector;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConnectionInfo::isBrokerMasterConnector() {
+bool ConnectionInfo::isBrokerMasterConnector() const {
     return brokerMasterConnector;
 }
 
@@ -191,12 +186,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConnectionInfo::isManageable() const {
-    return manageable;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConnectionInfo::isManageable() {
+bool ConnectionInfo::isManageable() const {
     return manageable;
 }
 
@@ -206,12 +196,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConnectionInfo::isClientMaster() const {
-    return clientMaster;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConnectionInfo::isClientMaster() {
+bool ConnectionInfo::isClientMaster() const {
     return clientMaster;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.h Sun Feb  4 08:37:46 2007
@@ -44,7 +44,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class ConnectionInfo : public BaseCommand
+    class ConnectionInfo : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -107,16 +107,13 @@
         virtual std::vector<BrokerId*>& getBrokerPath();
         virtual void setBrokerPath( const std::vector<BrokerId*>& brokerPath );
 
-        virtual const bool isBrokerMasterConnector() const;
-        virtual bool isBrokerMasterConnector();
+        virtual bool isBrokerMasterConnector() const;
         virtual void setBrokerMasterConnector( bool brokerMasterConnector );
 
-        virtual const bool isManageable() const;
-        virtual bool isManageable();
+        virtual bool isManageable() const;
         virtual void setManageable( bool manageable );
 
-        virtual const bool isClientMaster() const;
-        virtual bool isClientMaster();
+        virtual bool isClientMaster() const;
         virtual void setClientMaster( bool clientMaster );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp Sun Feb  4 08:37:46 2007
@@ -65,7 +65,7 @@
 void ConsumerControl::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const ConsumerControl* srcPtr = dynamic_cast<const ConsumerControl*>( src );
 
@@ -91,12 +91,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerControl::isClose() const {
-    return close;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerControl::isClose() {
+bool ConsumerControl::isClose() const {
     return close;
 }
 
@@ -121,12 +116,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int ConsumerControl::getPrefetch() const {
-    return prefetch;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ConsumerControl::getPrefetch() {
+int ConsumerControl::getPrefetch() const {
     return prefetch;
 }
 
@@ -136,12 +126,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerControl::isFlush() const {
-    return flush;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerControl::isFlush() {
+bool ConsumerControl::isFlush() const {
     return flush;
 }
 
@@ -151,12 +136,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerControl::isStart() const {
-    return start;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerControl::isStart() {
+bool ConsumerControl::isStart() const {
     return start;
 }
 
@@ -166,12 +146,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerControl::isStop() const {
-    return stop;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerControl::isStop() {
+bool ConsumerControl::isStop() const {
     return stop;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.h Sun Feb  4 08:37:46 2007
@@ -43,7 +43,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class ConsumerControl : public BaseCommand
+    class ConsumerControl : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -84,28 +84,23 @@
          */
         virtual void copyDataStructure( const DataStructure* src );
 
-        virtual const bool isClose() const;
-        virtual bool isClose();
+        virtual bool isClose() const;
         virtual void setClose( bool close );
 
         virtual const ConsumerId* getConsumerId() const;
         virtual ConsumerId* getConsumerId();
         virtual void setConsumerId( ConsumerId* consumerId );
 
-        virtual const int getPrefetch() const;
-        virtual int getPrefetch();
+        virtual int getPrefetch() const;
         virtual void setPrefetch( int prefetch );
 
-        virtual const bool isFlush() const;
-        virtual bool isFlush();
+        virtual bool isFlush() const;
         virtual void setFlush( bool flush );
 
-        virtual const bool isStart() const;
-        virtual bool isStart();
+        virtual bool isStart() const;
         virtual void setStart( bool start );
 
-        virtual const bool isStop() const;
-        virtual bool isStop();
+        virtual bool isStop() const;
         virtual void setStop( bool stop );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerId.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerId.cpp Sun Feb  4 08:37:46 2007
@@ -97,12 +97,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long ConsumerId::getSessionId() const {
-    return sessionId;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long ConsumerId::getSessionId() {
+long long ConsumerId::getSessionId() const {
     return sessionId;
 }
 
@@ -112,12 +107,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long ConsumerId::getValue() const {
-    return value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long ConsumerId::getValue() {
+long long ConsumerId::getValue() const {
     return value;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerId.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerId.h Sun Feb  4 08:37:46 2007
@@ -84,12 +84,10 @@
         virtual std::string& getConnectionId();
         virtual void setConnectionId( const std::string& connectionId );
 
-        virtual const long long getSessionId() const;
-        virtual long long getSessionId();
+        virtual long long getSessionId() const;
         virtual void setSessionId( long long sessionId );
 
-        virtual const long long getValue() const;
-        virtual long long getValue();
+        virtual long long getValue() const;
         virtual void setValue( long long value );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp Sun Feb  4 08:37:46 2007
@@ -80,7 +80,7 @@
 void ConsumerInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const ConsumerInfo* srcPtr = dynamic_cast<const ConsumerInfo*>( src );
 
@@ -140,12 +140,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerInfo::isBrowser() const {
-    return browser;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerInfo::isBrowser() {
+bool ConsumerInfo::isBrowser() const {
     return browser;
 }
 
@@ -170,12 +165,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int ConsumerInfo::getPrefetchSize() const {
-    return prefetchSize;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ConsumerInfo::getPrefetchSize() {
+int ConsumerInfo::getPrefetchSize() const {
     return prefetchSize;
 }
 
@@ -185,12 +175,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int ConsumerInfo::getMaximumPendingMessageLimit() const {
-    return maximumPendingMessageLimit;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int ConsumerInfo::getMaximumPendingMessageLimit() {
+int ConsumerInfo::getMaximumPendingMessageLimit() const {
     return maximumPendingMessageLimit;
 }
 
@@ -200,12 +185,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerInfo::isDispatchAsync() const {
-    return dispatchAsync;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerInfo::isDispatchAsync() {
+bool ConsumerInfo::isDispatchAsync() const {
     return dispatchAsync;
 }
 
@@ -245,12 +225,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerInfo::isNoLocal() const {
-    return noLocal;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerInfo::isNoLocal() {
+bool ConsumerInfo::isNoLocal() const {
     return noLocal;
 }
 
@@ -260,12 +235,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerInfo::isExclusive() const {
-    return exclusive;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerInfo::isExclusive() {
+bool ConsumerInfo::isExclusive() const {
     return exclusive;
 }
 
@@ -275,12 +245,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerInfo::isRetroactive() const {
-    return retroactive;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerInfo::isRetroactive() {
+bool ConsumerInfo::isRetroactive() const {
     return retroactive;
 }
 
@@ -290,12 +255,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const unsigned char ConsumerInfo::getPriority() const {
-    return priority;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned char ConsumerInfo::getPriority() {
+unsigned char ConsumerInfo::getPriority() const {
     return priority;
 }
 
@@ -335,12 +295,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerInfo::isNetworkSubscription() const {
-    return networkSubscription;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerInfo::isNetworkSubscription() {
+bool ConsumerInfo::isNetworkSubscription() const {
     return networkSubscription;
 }
 
@@ -350,12 +305,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerInfo::isOptimizedAcknowledge() const {
-    return optimizedAcknowledge;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerInfo::isOptimizedAcknowledge() {
+bool ConsumerInfo::isOptimizedAcknowledge() const {
     return optimizedAcknowledge;
 }
 
@@ -365,12 +315,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool ConsumerInfo::isNoRangeAcks() const {
-    return noRangeAcks;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool ConsumerInfo::isNoRangeAcks() {
+bool ConsumerInfo::isNoRangeAcks() const {
     return noRangeAcks;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h Sun Feb  4 08:37:46 2007
@@ -46,7 +46,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class ConsumerInfo : public BaseCommand
+    class ConsumerInfo : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -102,24 +102,20 @@
         virtual ConsumerId* getConsumerId();
         virtual void setConsumerId( ConsumerId* consumerId );
 
-        virtual const bool isBrowser() const;
-        virtual bool isBrowser();
+        virtual bool isBrowser() const;
         virtual void setBrowser( bool browser );
 
         virtual const ActiveMQDestination* getDestination() const;
         virtual ActiveMQDestination* getDestination();
         virtual void setDestination( ActiveMQDestination* destination );
 
-        virtual const int getPrefetchSize() const;
-        virtual int getPrefetchSize();
+        virtual int getPrefetchSize() const;
         virtual void setPrefetchSize( int prefetchSize );
 
-        virtual const int getMaximumPendingMessageLimit() const;
-        virtual int getMaximumPendingMessageLimit();
+        virtual int getMaximumPendingMessageLimit() const;
         virtual void setMaximumPendingMessageLimit( int maximumPendingMessageLimit );
 
-        virtual const bool isDispatchAsync() const;
-        virtual bool isDispatchAsync();
+        virtual bool isDispatchAsync() const;
         virtual void setDispatchAsync( bool dispatchAsync );
 
         virtual const std::string& getSelector() const;
@@ -130,20 +126,16 @@
         virtual std::string& getSubscriptionName();
         virtual void setSubscriptionName( const std::string& subscriptionName );
 
-        virtual const bool isNoLocal() const;
-        virtual bool isNoLocal();
+        virtual bool isNoLocal() const;
         virtual void setNoLocal( bool noLocal );
 
-        virtual const bool isExclusive() const;
-        virtual bool isExclusive();
+        virtual bool isExclusive() const;
         virtual void setExclusive( bool exclusive );
 
-        virtual const bool isRetroactive() const;
-        virtual bool isRetroactive();
+        virtual bool isRetroactive() const;
         virtual void setRetroactive( bool retroactive );
 
-        virtual const unsigned char getPriority() const;
-        virtual unsigned char getPriority();
+        virtual unsigned char getPriority() const;
         virtual void setPriority( unsigned char priority );
 
         virtual const std::vector<BrokerId*>& getBrokerPath() const;
@@ -154,16 +146,13 @@
         virtual BooleanExpression* getAdditionalPredicate();
         virtual void setAdditionalPredicate( BooleanExpression* additionalPredicate );
 
-        virtual const bool isNetworkSubscription() const;
-        virtual bool isNetworkSubscription();
+        virtual bool isNetworkSubscription() const;
         virtual void setNetworkSubscription( bool networkSubscription );
 
-        virtual const bool isOptimizedAcknowledge() const;
-        virtual bool isOptimizedAcknowledge();
+        virtual bool isOptimizedAcknowledge() const;
         virtual void setOptimizedAcknowledge( bool optimizedAcknowledge );
 
-        virtual const bool isNoRangeAcks() const;
-        virtual bool isNoRangeAcks();
+        virtual bool isNoRangeAcks() const;
         virtual void setNoRangeAcks( bool noRangeAcks );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ControlCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ControlCommand.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ControlCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ControlCommand.cpp Sun Feb  4 08:37:46 2007
@@ -59,7 +59,7 @@
 void ControlCommand::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const ControlCommand* srcPtr = dynamic_cast<const ControlCommand*>( src );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ControlCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ControlCommand.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ControlCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ControlCommand.h Sun Feb  4 08:37:46 2007
@@ -42,7 +42,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class ControlCommand : public BaseCommand
+    class ControlCommand : public BaseCommand<transport::Command>
     {
     protected:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp Sun Feb  4 08:37:46 2007
@@ -67,7 +67,7 @@
 void DestinationInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const DestinationInfo* srcPtr = dynamic_cast<const DestinationInfo*>( src );
 
@@ -128,12 +128,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const unsigned char DestinationInfo::getOperationType() const {
-    return operationType;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned char DestinationInfo::getOperationType() {
+unsigned char DestinationInfo::getOperationType() const {
     return operationType;
 }
 
@@ -143,12 +138,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long DestinationInfo::getTimeout() const {
-    return timeout;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long DestinationInfo::getTimeout() {
+long long DestinationInfo::getTimeout() const {
     return timeout;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.h Sun Feb  4 08:37:46 2007
@@ -45,7 +45,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class DestinationInfo : public BaseCommand
+    class DestinationInfo : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -93,12 +93,10 @@
         virtual ActiveMQDestination* getDestination();
         virtual void setDestination( ActiveMQDestination* destination );
 
-        virtual const unsigned char getOperationType() const;
-        virtual unsigned char getOperationType();
+        virtual unsigned char getOperationType() const;
         virtual void setOperationType( unsigned char operationType );
 
-        virtual const long long getTimeout() const;
-        virtual long long getTimeout();
+        virtual long long getTimeout() const;
         virtual void setTimeout( long long timeout );
 
         virtual const std::vector<BrokerId*>& getBrokerPath() const;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/FlushCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/FlushCommand.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/FlushCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/FlushCommand.cpp Sun Feb  4 08:37:46 2007
@@ -58,7 +58,7 @@
 void FlushCommand::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const FlushCommand* srcPtr = dynamic_cast<const FlushCommand*>( src );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/FlushCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/FlushCommand.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/FlushCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/FlushCommand.h Sun Feb  4 08:37:46 2007
@@ -42,7 +42,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class FlushCommand : public BaseCommand
+    class FlushCommand : public BaseCommand<transport::Command>
     {
     protected:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/IntegerResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/IntegerResponse.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/IntegerResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/IntegerResponse.cpp Sun Feb  4 08:37:46 2007
@@ -78,12 +78,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int IntegerResponse::getResult() const {
-    return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int IntegerResponse::getResult() {
+int IntegerResponse::getResult() const {
     return result;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/IntegerResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/IntegerResponse.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/IntegerResponse.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/IntegerResponse.h Sun Feb  4 08:37:46 2007
@@ -78,8 +78,7 @@
          */
         virtual void copyDataStructure( const DataStructure* src );
 
-        virtual const int getResult() const;
-        virtual int getResult();
+        virtual int getResult() const;
         virtual void setResult( int result );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTopicAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTopicAck.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTopicAck.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTopicAck.cpp Sun Feb  4 08:37:46 2007
@@ -127,12 +127,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long JournalTopicAck::getMessageSequenceId() const {
-    return messageSequenceId;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long JournalTopicAck::getMessageSequenceId() {
+long long JournalTopicAck::getMessageSequenceId() const {
     return messageSequenceId;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTopicAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTopicAck.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTopicAck.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTopicAck.h Sun Feb  4 08:37:46 2007
@@ -94,8 +94,7 @@
         virtual MessageId* getMessageId();
         virtual void setMessageId( MessageId* messageId );
 
-        virtual const long long getMessageSequenceId() const;
-        virtual long long getMessageSequenceId();
+        virtual long long getMessageSequenceId() const;
         virtual void setMessageSequenceId( long long messageSequenceId );
 
         virtual const std::string& getSubscritionName() const;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp Sun Feb  4 08:37:46 2007
@@ -100,12 +100,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const unsigned char JournalTransaction::getType() const {
-    return type;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned char JournalTransaction::getType() {
+unsigned char JournalTransaction::getType() const {
     return type;
 }
 
@@ -115,12 +110,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool JournalTransaction::getWasPrepared() const {
-    return wasPrepared;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool JournalTransaction::getWasPrepared() {
+bool JournalTransaction::getWasPrepared() const {
     return wasPrepared;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.h Sun Feb  4 08:37:46 2007
@@ -85,12 +85,10 @@
         virtual TransactionId* getTransactionId();
         virtual void setTransactionId( TransactionId* transactionId );
 
-        virtual const unsigned char getType() const;
-        virtual unsigned char getType();
+        virtual unsigned char getType() const;
         virtual void setType( unsigned char type );
 
-        virtual const bool getWasPrepared() const;
-        virtual bool getWasPrepared();
+        virtual bool getWasPrepared() const;
         virtual void setWasPrepared( bool wasPrepared );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/KeepAliveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/KeepAliveInfo.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/KeepAliveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/KeepAliveInfo.cpp Sun Feb  4 08:37:46 2007
@@ -58,7 +58,7 @@
 void KeepAliveInfo::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const KeepAliveInfo* srcPtr = dynamic_cast<const KeepAliveInfo*>( src );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/KeepAliveInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/KeepAliveInfo.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/KeepAliveInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/KeepAliveInfo.h Sun Feb  4 08:37:46 2007
@@ -42,7 +42,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class KeepAliveInfo : public BaseCommand
+    class KeepAliveInfo : public BaseCommand<transport::Command>
     {
     protected:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/LocalTransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/LocalTransactionId.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/LocalTransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/LocalTransactionId.cpp Sun Feb  4 08:37:46 2007
@@ -83,12 +83,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long LocalTransactionId::getValue() const {
-    return value;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long LocalTransactionId::getValue() {
+long long LocalTransactionId::getValue() const {
     return value;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/LocalTransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/LocalTransactionId.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/LocalTransactionId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/LocalTransactionId.h Sun Feb  4 08:37:46 2007
@@ -80,8 +80,7 @@
          */
         virtual void copyDataStructure( const DataStructure* src );
 
-        virtual const long long getValue() const;
-        virtual long long getValue();
+        virtual long long getValue() const;
         virtual void setValue( long long value );
 
         virtual const ConnectionId* getConnectionId() const;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp Sun Feb  4 08:37:46 2007
@@ -93,7 +93,7 @@
 void Message::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const Message* srcPtr = dynamic_cast<const Message*>( src );
 
@@ -264,12 +264,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int Message::getGroupSequence() const {
-    return groupSequence;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int Message::getGroupSequence() {
+int Message::getGroupSequence() const {
     return groupSequence;
 }
 
@@ -294,12 +289,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool Message::isPersistent() const {
-    return persistent;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Message::isPersistent() {
+bool Message::isPersistent() const {
     return persistent;
 }
 
@@ -309,12 +299,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long Message::getExpiration() const {
-    return expiration;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long Message::getExpiration() {
+long long Message::getExpiration() const {
     return expiration;
 }
 
@@ -324,12 +309,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const unsigned char Message::getPriority() const {
-    return priority;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned char Message::getPriority() {
+unsigned char Message::getPriority() const {
     return priority;
 }
 
@@ -354,12 +334,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long Message::getTimestamp() const {
-    return timestamp;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long Message::getTimestamp() {
+long long Message::getTimestamp() const {
     return timestamp;
 }
 
@@ -444,12 +419,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool Message::isCompressed() const {
-    return compressed;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Message::isCompressed() {
+bool Message::isCompressed() const {
     return compressed;
 }
 
@@ -459,12 +429,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int Message::getRedeliveryCounter() const {
-    return redeliveryCounter;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int Message::getRedeliveryCounter() {
+int Message::getRedeliveryCounter() const {
     return redeliveryCounter;
 }
 
@@ -489,12 +454,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long Message::getArrival() const {
-    return arrival;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long Message::getArrival() {
+long long Message::getArrival() const {
     return arrival;
 }
 
@@ -519,12 +479,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool Message::isRecievedByDFBridge() const {
-    return recievedByDFBridge;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Message::isRecievedByDFBridge() {
+bool Message::isRecievedByDFBridge() const {
     return recievedByDFBridge;
 }
 
@@ -534,12 +489,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const bool Message::isDroppable() const {
-    return droppable;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-bool Message::isDroppable() {
+bool Message::isDroppable() const {
     return droppable;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h Sun Feb  4 08:37:46 2007
@@ -52,7 +52,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class Message : public BaseCommand
+    class Message : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -141,32 +141,27 @@
         virtual std::string& getGroupID();
         virtual void setGroupID( const std::string& groupID );
 
-        virtual const int getGroupSequence() const;
-        virtual int getGroupSequence();
+        virtual int getGroupSequence() const;
         virtual void setGroupSequence( int groupSequence );
 
         virtual const std::string& getCorrelationId() const;
         virtual std::string& getCorrelationId();
         virtual void setCorrelationId( const std::string& correlationId );
 
-        virtual const bool isPersistent() const;
-        virtual bool isPersistent();
+        virtual bool isPersistent() const;
         virtual void setPersistent( bool persistent );
 
-        virtual const long long getExpiration() const;
-        virtual long long getExpiration();
+        virtual long long getExpiration() const;
         virtual void setExpiration( long long expiration );
 
-        virtual const unsigned char getPriority() const;
-        virtual unsigned char getPriority();
+        virtual unsigned char getPriority() const;
         virtual void setPriority( unsigned char priority );
 
         virtual const ActiveMQDestination* getReplyTo() const;
         virtual ActiveMQDestination* getReplyTo();
         virtual void setReplyTo( ActiveMQDestination* replyTo );
 
-        virtual const long long getTimestamp() const;
-        virtual long long getTimestamp();
+        virtual long long getTimestamp() const;
         virtual void setTimestamp( long long timestamp );
 
         virtual const std::string& getType() const;
@@ -189,32 +184,27 @@
         virtual ConsumerId* getTargetConsumerId();
         virtual void setTargetConsumerId( ConsumerId* targetConsumerId );
 
-        virtual const bool isCompressed() const;
-        virtual bool isCompressed();
+        virtual bool isCompressed() const;
         virtual void setCompressed( bool compressed );
 
-        virtual const int getRedeliveryCounter() const;
-        virtual int getRedeliveryCounter();
+        virtual int getRedeliveryCounter() const;
         virtual void setRedeliveryCounter( int redeliveryCounter );
 
         virtual const std::vector<BrokerId*>& getBrokerPath() const;
         virtual std::vector<BrokerId*>& getBrokerPath();
         virtual void setBrokerPath( const std::vector<BrokerId*>& brokerPath );
 
-        virtual const long long getArrival() const;
-        virtual long long getArrival();
+        virtual long long getArrival() const;
         virtual void setArrival( long long arrival );
 
         virtual const std::string& getUserID() const;
         virtual std::string& getUserID();
         virtual void setUserID( const std::string& userID );
 
-        virtual const bool isRecievedByDFBridge() const;
-        virtual bool isRecievedByDFBridge();
+        virtual bool isRecievedByDFBridge() const;
         virtual void setRecievedByDFBridge( bool recievedByDFBridge );
 
-        virtual const bool isDroppable() const;
-        virtual bool isDroppable();
+        virtual bool isDroppable() const;
         virtual void setDroppable( bool droppable );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.cpp Sun Feb  4 08:37:46 2007
@@ -70,7 +70,7 @@
 void MessageAck::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const MessageAck* srcPtr = dynamic_cast<const MessageAck*>( src );
 
@@ -150,12 +150,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const unsigned char MessageAck::getAckType() const {
-    return ackType;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-unsigned char MessageAck::getAckType() {
+unsigned char MessageAck::getAckType() const {
     return ackType;
 }
 
@@ -195,12 +190,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int MessageAck::getMessageCount() const {
-    return messageCount;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int MessageAck::getMessageCount() {
+int MessageAck::getMessageCount() const {
     return messageCount;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.h Sun Feb  4 08:37:46 2007
@@ -47,7 +47,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class MessageAck : public BaseCommand
+    class MessageAck : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -101,8 +101,7 @@
         virtual ConsumerId* getConsumerId();
         virtual void setConsumerId( ConsumerId* consumerId );
 
-        virtual const unsigned char getAckType() const;
-        virtual unsigned char getAckType();
+        virtual unsigned char getAckType() const;
         virtual void setAckType( unsigned char ackType );
 
         virtual const MessageId* getFirstMessageId() const;
@@ -113,8 +112,7 @@
         virtual MessageId* getLastMessageId();
         virtual void setLastMessageId( MessageId* lastMessageId );
 
-        virtual const int getMessageCount() const;
-        virtual int getMessageCount();
+        virtual int getMessageCount() const;
         virtual void setMessageCount( int messageCount );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatch.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatch.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatch.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatch.cpp Sun Feb  4 08:37:46 2007
@@ -65,7 +65,7 @@
 void MessageDispatch::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const MessageDispatch* srcPtr = dynamic_cast<const MessageDispatch*>( src );
 
@@ -138,12 +138,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const int MessageDispatch::getRedeliveryCounter() const {
-    return redeliveryCounter;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int MessageDispatch::getRedeliveryCounter() {
+int MessageDispatch::getRedeliveryCounter() const {
     return redeliveryCounter;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatch.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatch.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatch.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatch.h Sun Feb  4 08:37:46 2007
@@ -45,7 +45,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class MessageDispatch : public BaseCommand
+    class MessageDispatch : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -96,8 +96,7 @@
         virtual Message* getMessage();
         virtual void setMessage( Message* message );
 
-        virtual const int getRedeliveryCounter() const;
-        virtual int getRedeliveryCounter();
+        virtual int getRedeliveryCounter() const;
         virtual void setRedeliveryCounter( int redeliveryCounter );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.cpp Sun Feb  4 08:37:46 2007
@@ -65,7 +65,7 @@
 void MessageDispatchNotification::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const MessageDispatchNotification* srcPtr = dynamic_cast<const MessageDispatchNotification*>( src );
 
@@ -123,12 +123,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long MessageDispatchNotification::getDeliverySequenceId() const {
-    return deliverySequenceId;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long MessageDispatchNotification::getDeliverySequenceId() {
+long long MessageDispatchNotification::getDeliverySequenceId() const {
     return deliverySequenceId;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.h Sun Feb  4 08:37:46 2007
@@ -45,7 +45,7 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class MessageDispatchNotification : public BaseCommand
+    class MessageDispatchNotification : public BaseCommand<transport::Command>
     {
     protected:
 
@@ -92,8 +92,7 @@
         virtual ActiveMQDestination* getDestination();
         virtual void setDestination( ActiveMQDestination* destination );
 
-        virtual const long long getDeliverySequenceId() const;
-        virtual long long getDeliverySequenceId();
+        virtual long long getDeliverySequenceId() const;
         virtual void setDeliverySequenceId( long long deliverySequenceId );
 
         virtual const MessageId* getMessageId() const;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageId.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageId.cpp Sun Feb  4 08:37:46 2007
@@ -100,12 +100,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long MessageId::getProducerSequenceId() const {
-    return producerSequenceId;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long MessageId::getProducerSequenceId() {
+long long MessageId::getProducerSequenceId() const {
     return producerSequenceId;
 }
 
@@ -115,12 +110,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long MessageId::getBrokerSequenceId() const {
-    return brokerSequenceId;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long MessageId::getBrokerSequenceId() {
+long long MessageId::getBrokerSequenceId() const {
     return brokerSequenceId;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageId.h?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageId.h Sun Feb  4 08:37:46 2007
@@ -85,12 +85,10 @@
         virtual ProducerId* getProducerId();
         virtual void setProducerId( ProducerId* producerId );
 
-        virtual const long long getProducerSequenceId() const;
-        virtual long long getProducerSequenceId();
+        virtual long long getProducerSequenceId() const;
         virtual void setProducerSequenceId( long long producerSequenceId );
 
-        virtual const long long getBrokerSequenceId() const;
-        virtual long long getBrokerSequenceId();
+        virtual long long getBrokerSequenceId() const;
         virtual void setBrokerSequenceId( long long brokerSequenceId );
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessagePull.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessagePull.cpp?view=diff&rev=503438&r1=503437&r2=503438
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessagePull.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessagePull.cpp Sun Feb  4 08:37:46 2007
@@ -63,7 +63,7 @@
 void MessagePull::copyDataStructure( const DataStructure* src ) {
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand<transport::Command>::copyDataStructure( src );
 
     const MessagePull* srcPtr = dynamic_cast<const MessagePull*>( src );
 
@@ -118,12 +118,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const long long MessagePull::getTimeout() const {
-    return timeout;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-long long MessagePull::getTimeout() {
+long long MessagePull::getTimeout() const {
     return timeout;
 }
 



Mime
View raw message