activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r382103 [1/2] - /incubator/activemq/trunk/openwire-cpp/src/command/
Date Wed, 01 Mar 2006 17:52:43 GMT
Author: jstrachan
Date: Wed Mar  1 09:52:38 2006
New Revision: 382103

URL: http://svn.apache.org/viewcvs?rev=382103&view=rev
Log:
Applied modified generated code using Mats latest patch for the generator

Modified:
    incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQObjectMessage.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/FlushCommand.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/KeepAliveInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/Message.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/Message.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageId.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/MessageId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/Response.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/Response.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/SessionId.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/SessionId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/ShutdownInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/TransactionId.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.hpp
    incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.cpp
    incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.hpp

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQObjectMessage.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQObjectMessage.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQObjectMessage.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ActiveMQObjectMessage.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define ActiveMQObjectMessage_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/ActiveMQMessage.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -62,6 +57,7 @@
     ActiveMQObjectMessage() ;
     virtual ~ActiveMQObjectMessage() ;
 
+    virtual int getCommandType() ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.cpp Wed Mar  1 09:52:38 2006
@@ -30,7 +30,7 @@
  */
 BrokerId::BrokerId()
 {
-    this->value = NULL ;
+    this->value = 0 ;
 }
 
 BrokerId::~BrokerId()

Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define BrokerId_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -63,6 +58,7 @@
     BrokerId() ;
     virtual ~BrokerId() ;
 
+    virtual int getCommandType() ;
 
     virtual p<string> getValue() ;
     virtual void setValue(p<string> value) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp Wed Mar  1 09:52:38 2006
@@ -30,11 +30,11 @@
  */
 BrokerInfo::BrokerInfo()
 {
-    this->brokerId = NULL ;
-    this->brokerURL = NULL ;
-    this->peerBrokerInfos = NULL ;
-    this->brokerName = NULL ;
-    this->slaveBroker = NULL ;
+    this->brokerId = 0 ;
+    this->brokerURL = 0 ;
+    this->peerBrokerInfos = 0 ;
+    this->brokerName = 0 ;
+    this->slaveBroker = 0 ;
 }
 
 BrokerInfo::~BrokerInfo()
@@ -64,12 +64,12 @@
 }
 
         
-BrokerInfo[] BrokerInfo::getPeerBrokerInfos()
+ap<BrokerInfo> BrokerInfo::getPeerBrokerInfos()
 {
     return peerBrokerInfos ;
 }
 
-void BrokerInfo::setPeerBrokerInfos(BrokerInfo[] peerBrokerInfos)
+void BrokerInfo::setPeerBrokerInfos(ap<BrokerInfo> peerBrokerInfos)
 {
     this->peerBrokerInfos = peerBrokerInfos ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,12 @@
 #define BrokerInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
+    
 #include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+#include "command/BrokerInfo.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +35,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -56,7 +53,7 @@
 private:
     p<BrokerId> brokerId ;
     p<string> brokerURL ;
-    BrokerInfo[] peerBrokerInfos ;
+    ap<BrokerInfo> peerBrokerInfos ;
     p<string> brokerName ;
     bool slaveBroker ;
 
@@ -67,6 +64,7 @@
     BrokerInfo() ;
     virtual ~BrokerInfo() ;
 
+    virtual int getCommandType() ;
 
     virtual p<BrokerId> getBrokerId() ;
     virtual void setBrokerId(p<BrokerId> brokerId) ;
@@ -74,8 +72,8 @@
     virtual p<string> getBrokerURL() ;
     virtual void setBrokerURL(p<string> brokerURL) ;
 
-    virtual BrokerInfo[] getPeerBrokerInfos() ;
-    virtual void setPeerBrokerInfos(BrokerInfo[] peerBrokerInfos) ;
+    virtual ap<BrokerInfo> getPeerBrokerInfos() ;
+    virtual void setPeerBrokerInfos(ap<BrokerInfo> peerBrokerInfos) ;
 
     virtual p<string> getBrokerName() ;
     virtual void setBrokerName(p<string> brokerName) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.cpp Wed Mar  1 09:52:38 2006
@@ -30,8 +30,8 @@
  */
 ConnectionError::ConnectionError()
 {
-    this->exception = NULL ;
-    this->connectionId = NULL ;
+    this->exception = 0 ;
+    this->connectionId = 0 ;
 }
 
 ConnectionError::~ConnectionError()
@@ -39,12 +39,12 @@
 }
 
         
-BrokerError ConnectionError::getException()
+p<BrokerError> ConnectionError::getException()
 {
     return exception ;
 }
 
-void ConnectionError::setException(BrokerError exception)
+void ConnectionError::setException(p<BrokerError> exception)
 {
     this->exception = exception ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionError.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,12 @@
 #define ConnectionError_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
+    
+#include "BrokerError.hpp"
 #include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +35,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -54,7 +51,7 @@
 class ConnectionError : public BaseCommand
 {
 private:
-    BrokerError exception ;
+    p<BrokerError> exception ;
     p<ConnectionId> connectionId ;
 
 public:
@@ -64,9 +61,10 @@
     ConnectionError() ;
     virtual ~ConnectionError() ;
 
+    virtual int getCommandType() ;
 
-    virtual BrokerError getException() ;
-    virtual void setException(BrokerError exception) ;
+    virtual p<BrokerError> getException() ;
+    virtual void setException(p<BrokerError> exception) ;
 
     virtual p<ConnectionId> getConnectionId() ;
     virtual void setConnectionId(p<ConnectionId> connectionId) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.cpp Wed Mar  1 09:52:38 2006
@@ -30,7 +30,7 @@
  */
 ConnectionId::ConnectionId()
 {
-    this->value = NULL ;
+    this->value = 0 ;
 }
 
 ConnectionId::~ConnectionId()

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define ConnectionId_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -63,6 +58,7 @@
     ConnectionId() ;
     virtual ~ConnectionId() ;
 
+    virtual int getCommandType() ;
 
     virtual p<string> getValue() ;
     virtual void setValue(p<string> value) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp Wed Mar  1 09:52:38 2006
@@ -30,11 +30,11 @@
  */
 ConnectionInfo::ConnectionInfo()
 {
-    this->connectionId = NULL ;
-    this->clientId = NULL ;
-    this->password = NULL ;
-    this->userName = NULL ;
-    this->brokerPath = NULL ;
+    this->connectionId = 0 ;
+    this->clientId = 0 ;
+    this->password = 0 ;
+    this->userName = 0 ;
+    this->brokerPath = 0 ;
 }
 
 ConnectionInfo::~ConnectionInfo()
@@ -86,12 +86,12 @@
 }
 
         
-BrokerId[] ConnectionInfo::getBrokerPath()
+ap<BrokerId> ConnectionInfo::getBrokerPath()
 {
     return brokerPath ;
 }
 
-void ConnectionInfo::setBrokerPath(BrokerId[] brokerPath)
+void ConnectionInfo::setBrokerPath(ap<BrokerId> brokerPath)
 {
     this->brokerPath = brokerPath ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,12 @@
 #define ConnectionInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
+    
 #include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+#include "command/BrokerId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +35,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -58,7 +55,7 @@
     p<string> clientId ;
     p<string> password ;
     p<string> userName ;
-    BrokerId[] brokerPath ;
+    ap<BrokerId> brokerPath ;
 
 public:
     const static int TYPE = 3;
@@ -67,6 +64,7 @@
     ConnectionInfo() ;
     virtual ~ConnectionInfo() ;
 
+    virtual int getCommandType() ;
 
     virtual p<ConnectionId> getConnectionId() ;
     virtual void setConnectionId(p<ConnectionId> connectionId) ;
@@ -80,8 +78,8 @@
     virtual p<string> getUserName() ;
     virtual void setUserName(p<string> userName) ;
 
-    virtual BrokerId[] getBrokerPath() ;
-    virtual void setBrokerPath(BrokerId[] brokerPath) ;
+    virtual ap<BrokerId> getBrokerPath() ;
+    virtual void setBrokerPath(ap<BrokerId> brokerPath) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.cpp Wed Mar  1 09:52:38 2006
@@ -30,9 +30,9 @@
  */
 ConsumerId::ConsumerId()
 {
-    this->connectionId = NULL ;
-    this->sessionId = NULL ;
-    this->value = NULL ;
+    this->connectionId = 0 ;
+    this->sessionId = 0 ;
+    this->value = 0 ;
 }
 
 ConsumerId::~ConsumerId()
@@ -51,23 +51,23 @@
 }
 
         
-long ConsumerId::getSessionId()
+long long ConsumerId::getSessionId()
 {
     return sessionId ;
 }
 
-void ConsumerId::setSessionId(long sessionId)
+void ConsumerId::setSessionId(long long sessionId)
 {
     this->sessionId = sessionId ;
 }
 
         
-long ConsumerId::getValue()
+long long ConsumerId::getValue()
 {
     return value ;
 }
 
-void ConsumerId::setValue(long value)
+void ConsumerId::setValue(long long value)
 {
     this->value = value ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define ConsumerId_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,8 +50,8 @@
 {
 private:
     p<string> connectionId ;
-    long sessionId ;
-    long value ;
+    long long sessionId ;
+    long long value ;
 
 public:
     const static int TYPE = 122;
@@ -65,15 +60,16 @@
     ConsumerId() ;
     virtual ~ConsumerId() ;
 
+    virtual int getCommandType() ;
 
     virtual p<string> getConnectionId() ;
     virtual void setConnectionId(p<string> connectionId) ;
 
-    virtual long getSessionId() ;
-    virtual void setSessionId(long sessionId) ;
+    virtual long long getSessionId() ;
+    virtual void setSessionId(long long sessionId) ;
 
-    virtual long getValue() ;
-    virtual void setValue(long value) ;
+    virtual long long getValue() ;
+    virtual void setValue(long long value) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp Wed Mar  1 09:52:38 2006
@@ -30,19 +30,19 @@
  */
 ConsumerInfo::ConsumerInfo()
 {
-    this->consumerId = NULL ;
-    this->browser = NULL ;
-    this->destination = NULL ;
-    this->prefetchSize = NULL ;
-    this->dispatchAsync = NULL ;
-    this->selector = NULL ;
-    this->subcriptionName = NULL ;
-    this->noLocal = NULL ;
-    this->exclusive = NULL ;
-    this->retroactive = NULL ;
-    this->priority = NULL ;
-    this->brokerPath = NULL ;
-    this->networkSubscription = NULL ;
+    this->consumerId = 0 ;
+    this->browser = 0 ;
+    this->destination = 0 ;
+    this->prefetchSize = 0 ;
+    this->dispatchAsync = 0 ;
+    this->selector = 0 ;
+    this->subcriptionName = 0 ;
+    this->noLocal = 0 ;
+    this->exclusive = 0 ;
+    this->retroactive = 0 ;
+    this->priority = 0 ;
+    this->brokerPath = 0 ;
+    this->networkSubscription = 0 ;
 }
 
 ConsumerInfo::~ConsumerInfo()
@@ -72,12 +72,12 @@
 }
 
         
-ActiveMQDestination ConsumerInfo::getDestination()
+p<ActiveMQDestination> ConsumerInfo::getDestination()
 {
     return destination ;
 }
 
-void ConsumerInfo::setDestination(ActiveMQDestination destination)
+void ConsumerInfo::setDestination(p<ActiveMQDestination> destination)
 {
     this->destination = destination ;
 }
@@ -160,23 +160,23 @@
 }
 
         
-byte ConsumerInfo::getPriority()
+char ConsumerInfo::getPriority()
 {
     return priority ;
 }
 
-void ConsumerInfo::setPriority(byte priority)
+void ConsumerInfo::setPriority(char priority)
 {
     this->priority = priority ;
 }
 
         
-BrokerId[] ConsumerInfo::getBrokerPath()
+ap<BrokerId> ConsumerInfo::getBrokerPath()
 {
     return brokerPath ;
 }
 
-void ConsumerInfo::setBrokerPath(BrokerId[] brokerPath)
+void ConsumerInfo::setBrokerPath(ap<BrokerId> brokerPath)
 {
     this->brokerPath = brokerPath ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,13 @@
 #define ConsumerInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
+    
 #include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/BrokerId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +36,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -56,7 +54,7 @@
 private:
     p<ConsumerId> consumerId ;
     bool browser ;
-    ActiveMQDestination destination ;
+    p<ActiveMQDestination> destination ;
     int prefetchSize ;
     bool dispatchAsync ;
     p<string> selector ;
@@ -64,8 +62,8 @@
     bool noLocal ;
     bool exclusive ;
     bool retroactive ;
-    byte priority ;
-    BrokerId[] brokerPath ;
+    char priority ;
+    ap<BrokerId> brokerPath ;
     bool networkSubscription ;
 
 public:
@@ -75,6 +73,7 @@
     ConsumerInfo() ;
     virtual ~ConsumerInfo() ;
 
+    virtual int getCommandType() ;
 
     virtual p<ConsumerId> getConsumerId() ;
     virtual void setConsumerId(p<ConsumerId> consumerId) ;
@@ -82,8 +81,8 @@
     virtual bool getBrowser() ;
     virtual void setBrowser(bool browser) ;
 
-    virtual ActiveMQDestination getDestination() ;
-    virtual void setDestination(ActiveMQDestination destination) ;
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
 
     virtual int getPrefetchSize() ;
     virtual void setPrefetchSize(int prefetchSize) ;
@@ -106,11 +105,11 @@
     virtual bool getRetroactive() ;
     virtual void setRetroactive(bool retroactive) ;
 
-    virtual byte getPriority() ;
-    virtual void setPriority(byte priority) ;
+    virtual char getPriority() ;
+    virtual void setPriority(char priority) ;
 
-    virtual BrokerId[] getBrokerPath() ;
-    virtual void setBrokerPath(BrokerId[] brokerPath) ;
+    virtual ap<BrokerId> getBrokerPath() ;
+    virtual void setBrokerPath(ap<BrokerId> brokerPath) ;
 
     virtual bool getNetworkSubscription() ;
     virtual void setNetworkSubscription(bool networkSubscription) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.cpp Wed Mar  1 09:52:38 2006
@@ -30,7 +30,7 @@
  */
 ControlCommand::ControlCommand()
 {
-    this->command = NULL ;
+    this->command = 0 ;
 }
 
 ControlCommand::~ControlCommand()

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ControlCommand.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define ControlCommand_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+    
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -63,6 +58,7 @@
     ControlCommand() ;
     virtual ~ControlCommand() ;
 
+    virtual int getCommandType() ;
 
     virtual p<string> getCommand() ;
     virtual void setCommand(p<string> command) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.cpp Wed Mar  1 09:52:38 2006
@@ -30,7 +30,7 @@
  */
 DataArrayResponse::DataArrayResponse()
 {
-    this->data = NULL ;
+    this->data = 0 ;
 }
 
 DataArrayResponse::~DataArrayResponse()
@@ -38,12 +38,12 @@
 }
 
         
-DataStructure[] DataArrayResponse::getData()
+ap<IDataStructure> DataArrayResponse::getData()
 {
     return data ;
 }
 
-void DataArrayResponse::setData(DataStructure[] data)
+void DataArrayResponse::setData(ap<IDataStructure> data)
 {
     this->data = data ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DataArrayResponse.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,11 @@
 #define DataArrayResponse_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/Response.hpp"
+    
+#include "command/IDataStructure.hpp"
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +34,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -54,7 +50,7 @@
 class DataArrayResponse : public Response
 {
 private:
-    DataStructure[] data ;
+    ap<IDataStructure> data ;
 
 public:
     const static int TYPE = 33;
@@ -63,9 +59,10 @@
     DataArrayResponse() ;
     virtual ~DataArrayResponse() ;
 
+    virtual int getCommandType() ;
 
-    virtual DataStructure[] getData() ;
-    virtual void setData(DataStructure[] data) ;
+    virtual ap<IDataStructure> getData() ;
+    virtual void setData(ap<IDataStructure> data) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.cpp Wed Mar  1 09:52:38 2006
@@ -30,7 +30,7 @@
  */
 DataResponse::DataResponse()
 {
-    this->data = NULL ;
+    this->data = 0 ;
 }
 
 DataResponse::~DataResponse()
@@ -38,12 +38,12 @@
 }
 
         
-DataStructure DataResponse::getData()
+p<IDataStructure> DataResponse::getData()
 {
     return data ;
 }
 
-void DataResponse::setData(DataStructure data)
+void DataResponse::setData(p<IDataStructure> data)
 {
     this->data = data ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DataResponse.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,11 @@
 #define DataResponse_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/Response.hpp"
+    
+#include "command/IDataStructure.hpp"
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +34,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -54,7 +50,7 @@
 class DataResponse : public Response
 {
 private:
-    DataStructure data ;
+    p<IDataStructure> data ;
 
 public:
     const static int TYPE = 32;
@@ -63,9 +59,10 @@
     DataResponse() ;
     virtual ~DataResponse() ;
 
+    virtual int getCommandType() ;
 
-    virtual DataStructure getData() ;
-    virtual void setData(DataStructure data) ;
+    virtual p<IDataStructure> getData() ;
+    virtual void setData(p<IDataStructure> data) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.cpp Wed Mar  1 09:52:38 2006
@@ -30,11 +30,11 @@
  */
 DestinationInfo::DestinationInfo()
 {
-    this->connectionId = NULL ;
-    this->destination = NULL ;
-    this->operationType = NULL ;
-    this->timeout = NULL ;
-    this->brokerPath = NULL ;
+    this->connectionId = 0 ;
+    this->destination = 0 ;
+    this->operationType = 0 ;
+    this->timeout = 0 ;
+    this->brokerPath = 0 ;
 }
 
 DestinationInfo::~DestinationInfo()
@@ -53,45 +53,45 @@
 }
 
         
-ActiveMQDestination DestinationInfo::getDestination()
+p<ActiveMQDestination> DestinationInfo::getDestination()
 {
     return destination ;
 }
 
-void DestinationInfo::setDestination(ActiveMQDestination destination)
+void DestinationInfo::setDestination(p<ActiveMQDestination> destination)
 {
     this->destination = destination ;
 }
 
         
-byte DestinationInfo::getOperationType()
+char DestinationInfo::getOperationType()
 {
     return operationType ;
 }
 
-void DestinationInfo::setOperationType(byte operationType)
+void DestinationInfo::setOperationType(char operationType)
 {
     this->operationType = operationType ;
 }
 
         
-long DestinationInfo::getTimeout()
+long long DestinationInfo::getTimeout()
 {
     return timeout ;
 }
 
-void DestinationInfo::setTimeout(long timeout)
+void DestinationInfo::setTimeout(long long timeout)
 {
     this->timeout = timeout ;
 }
 
         
-BrokerId[] DestinationInfo::getBrokerPath()
+ap<BrokerId> DestinationInfo::getBrokerPath()
 {
     return brokerPath ;
 }
 
-void DestinationInfo::setBrokerPath(BrokerId[] brokerPath)
+void DestinationInfo::setBrokerPath(ap<BrokerId> brokerPath)
 {
     this->brokerPath = brokerPath ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DestinationInfo.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,13 @@
 #define DestinationInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
+    
 #include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/BrokerId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +36,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,10 +53,10 @@
 {
 private:
     p<ConnectionId> connectionId ;
-    ActiveMQDestination destination ;
-    byte operationType ;
-    long timeout ;
-    BrokerId[] brokerPath ;
+    p<ActiveMQDestination> destination ;
+    char operationType ;
+    long long timeout ;
+    ap<BrokerId> brokerPath ;
 
 public:
     const static int TYPE = 8;
@@ -67,21 +65,22 @@
     DestinationInfo() ;
     virtual ~DestinationInfo() ;
 
+    virtual int getCommandType() ;
 
     virtual p<ConnectionId> getConnectionId() ;
     virtual void setConnectionId(p<ConnectionId> connectionId) ;
 
-    virtual ActiveMQDestination getDestination() ;
-    virtual void setDestination(ActiveMQDestination destination) ;
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
 
-    virtual byte getOperationType() ;
-    virtual void setOperationType(byte operationType) ;
+    virtual char getOperationType() ;
+    virtual void setOperationType(char operationType) ;
 
-    virtual long getTimeout() ;
-    virtual void setTimeout(long timeout) ;
+    virtual long long getTimeout() ;
+    virtual void setTimeout(long long timeout) ;
 
-    virtual BrokerId[] getBrokerPath() ;
-    virtual void setBrokerPath(BrokerId[] brokerPath) ;
+    virtual ap<BrokerId> getBrokerPath() ;
+    virtual void setBrokerPath(ap<BrokerId> brokerPath) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.cpp Wed Mar  1 09:52:38 2006
@@ -30,8 +30,8 @@
  */
 DiscoveryEvent::DiscoveryEvent()
 {
-    this->serviceName = NULL ;
-    this->brokerName = NULL ;
+    this->serviceName = 0 ;
+    this->brokerName = 0 ;
 }
 
 DiscoveryEvent::~DiscoveryEvent()

Modified: incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define DiscoveryEvent_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -64,6 +59,7 @@
     DiscoveryEvent() ;
     virtual ~DiscoveryEvent() ;
 
+    virtual int getCommandType() ;
 
     virtual p<string> getServiceName() ;
     virtual void setServiceName(p<string> serviceName) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.cpp Wed Mar  1 09:52:38 2006
@@ -30,7 +30,7 @@
  */
 ExceptionResponse::ExceptionResponse()
 {
-    this->exception = NULL ;
+    this->exception = 0 ;
 }
 
 ExceptionResponse::~ExceptionResponse()
@@ -38,12 +38,12 @@
 }
 
         
-BrokerError ExceptionResponse::getException()
+p<BrokerError> ExceptionResponse::getException()
 {
     return exception ;
 }
 
-void ExceptionResponse::setException(BrokerError exception)
+void ExceptionResponse::setException(p<BrokerError> exception)
 {
     this->exception = exception ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ExceptionResponse.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,11 @@
 #define ExceptionResponse_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/Response.hpp"
+    
+#include "BrokerError.hpp"
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +34,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -54,7 +50,7 @@
 class ExceptionResponse : public Response
 {
 private:
-    BrokerError exception ;
+    p<BrokerError> exception ;
 
 public:
     const static int TYPE = 31;
@@ -63,9 +59,10 @@
     ExceptionResponse() ;
     virtual ~ExceptionResponse() ;
 
+    virtual int getCommandType() ;
 
-    virtual BrokerError getException() ;
-    virtual void setException(BrokerError exception) ;
+    virtual p<BrokerError> getException() ;
+    virtual void setException(p<BrokerError> exception) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/FlushCommand.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/FlushCommand.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/FlushCommand.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/FlushCommand.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define FlushCommand_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+    
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -62,6 +57,7 @@
     FlushCommand() ;
     virtual ~FlushCommand() ;
 
+    virtual int getCommandType() ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.cpp Wed Mar  1 09:52:38 2006
@@ -30,7 +30,7 @@
  */
 IntegerResponse::IntegerResponse()
 {
-    this->result = NULL ;
+    this->result = 0 ;
 }
 
 IntegerResponse::~IntegerResponse()

Modified: incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/IntegerResponse.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define IntegerResponse_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/Response.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -63,6 +58,7 @@
     IntegerResponse() ;
     virtual ~IntegerResponse() ;
 
+    virtual int getCommandType() ;
 
     virtual int getResult() ;
     virtual void setResult(int result) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.cpp Wed Mar  1 09:52:38 2006
@@ -30,8 +30,8 @@
  */
 JournalQueueAck::JournalQueueAck()
 {
-    this->destination = NULL ;
-    this->messageAck = NULL ;
+    this->destination = 0 ;
+    this->messageAck = 0 ;
 }
 
 JournalQueueAck::~JournalQueueAck()
@@ -39,23 +39,23 @@
 }
 
         
-ActiveMQDestination JournalQueueAck::getDestination()
+p<ActiveMQDestination> JournalQueueAck::getDestination()
 {
     return destination ;
 }
 
-void JournalQueueAck::setDestination(ActiveMQDestination destination)
+void JournalQueueAck::setDestination(p<ActiveMQDestination> destination)
 {
     this->destination = destination ;
 }
 
         
-MessageAck JournalQueueAck::getMessageAck()
+p<MessageAck> JournalQueueAck::getMessageAck()
 {
     return messageAck ;
 }
 
-void JournalQueueAck::setMessageAck(MessageAck messageAck)
+void JournalQueueAck::setMessageAck(p<MessageAck> messageAck)
 {
     this->messageAck = messageAck ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,12 @@
 #define JournalQueueAck_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+#include "command/ActiveMQDestination.hpp"
+#include "command/MessageAck.hpp"
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +35,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -54,8 +51,8 @@
 class JournalQueueAck : public AbstractCommand
 {
 private:
-    ActiveMQDestination destination ;
-    MessageAck messageAck ;
+    p<ActiveMQDestination> destination ;
+    p<MessageAck> messageAck ;
 
 public:
     const static int TYPE = 52;
@@ -64,12 +61,13 @@
     JournalQueueAck() ;
     virtual ~JournalQueueAck() ;
 
+    virtual int getCommandType() ;
 
-    virtual ActiveMQDestination getDestination() ;
-    virtual void setDestination(ActiveMQDestination destination) ;
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
 
-    virtual MessageAck getMessageAck() ;
-    virtual void setMessageAck(MessageAck messageAck) ;
+    virtual p<MessageAck> getMessageAck() ;
+    virtual void setMessageAck(p<MessageAck> messageAck) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.cpp Wed Mar  1 09:52:38 2006
@@ -30,12 +30,12 @@
  */
 JournalTopicAck::JournalTopicAck()
 {
-    this->destination = NULL ;
-    this->messageId = NULL ;
-    this->messageSequenceId = NULL ;
-    this->subscritionName = NULL ;
-    this->clientId = NULL ;
-    this->transactionId = NULL ;
+    this->destination = 0 ;
+    this->messageId = 0 ;
+    this->messageSequenceId = 0 ;
+    this->subscritionName = 0 ;
+    this->clientId = 0 ;
+    this->transactionId = 0 ;
 }
 
 JournalTopicAck::~JournalTopicAck()
@@ -43,12 +43,12 @@
 }
 
         
-ActiveMQDestination JournalTopicAck::getDestination()
+p<ActiveMQDestination> JournalTopicAck::getDestination()
 {
     return destination ;
 }
 
-void JournalTopicAck::setDestination(ActiveMQDestination destination)
+void JournalTopicAck::setDestination(p<ActiveMQDestination> destination)
 {
     this->destination = destination ;
 }
@@ -65,12 +65,12 @@
 }
 
         
-long JournalTopicAck::getMessageSequenceId()
+long long JournalTopicAck::getMessageSequenceId()
 {
     return messageSequenceId ;
 }
 
-void JournalTopicAck::setMessageSequenceId(long messageSequenceId)
+void JournalTopicAck::setMessageSequenceId(long long messageSequenceId)
 {
     this->messageSequenceId = messageSequenceId ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,13 @@
 #define JournalTopicAck_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+#include "command/ActiveMQDestination.hpp"
+#include "command/MessageId.hpp"
+#include "command/TransactionId.hpp"
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +36,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -54,9 +52,9 @@
 class JournalTopicAck : public AbstractCommand
 {
 private:
-    ActiveMQDestination destination ;
+    p<ActiveMQDestination> destination ;
     p<MessageId> messageId ;
-    long messageSequenceId ;
+    long long messageSequenceId ;
     p<string> subscritionName ;
     p<string> clientId ;
     p<TransactionId> transactionId ;
@@ -68,15 +66,16 @@
     JournalTopicAck() ;
     virtual ~JournalTopicAck() ;
 
+    virtual int getCommandType() ;
 
-    virtual ActiveMQDestination getDestination() ;
-    virtual void setDestination(ActiveMQDestination destination) ;
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
 
     virtual p<MessageId> getMessageId() ;
     virtual void setMessageId(p<MessageId> messageId) ;
 
-    virtual long getMessageSequenceId() ;
-    virtual void setMessageSequenceId(long messageSequenceId) ;
+    virtual long long getMessageSequenceId() ;
+    virtual void setMessageSequenceId(long long messageSequenceId) ;
 
     virtual p<string> getSubscritionName() ;
     virtual void setSubscritionName(p<string> subscritionName) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.cpp Wed Mar  1 09:52:38 2006
@@ -30,7 +30,7 @@
  */
 JournalTrace::JournalTrace()
 {
-    this->message = NULL ;
+    this->message = 0 ;
 }
 
 JournalTrace::~JournalTrace()

Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define JournalTrace_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -63,6 +58,7 @@
     JournalTrace() ;
     virtual ~JournalTrace() ;
 
+    virtual int getCommandType() ;
 
     virtual p<string> getMessage() ;
     virtual void setMessage(p<string> message) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.cpp Wed Mar  1 09:52:38 2006
@@ -30,9 +30,9 @@
  */
 JournalTransaction::JournalTransaction()
 {
-    this->transactionId = NULL ;
-    this->type = NULL ;
-    this->wasPrepared = NULL ;
+    this->transactionId = 0 ;
+    this->type = 0 ;
+    this->wasPrepared = 0 ;
 }
 
 JournalTransaction::~JournalTransaction()
@@ -51,12 +51,12 @@
 }
 
         
-byte JournalTransaction::getType()
+char JournalTransaction::getType()
 {
     return type ;
 }
 
-void JournalTransaction::setType(byte type)
+void JournalTransaction::setType(char type)
 {
     this->type = type ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalTransaction.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,11 @@
 #define JournalTransaction_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+#include "command/TransactionId.hpp"
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +34,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,7 +51,7 @@
 {
 private:
     p<TransactionId> transactionId ;
-    byte type ;
+    char type ;
     bool wasPrepared ;
 
 public:
@@ -65,12 +61,13 @@
     JournalTransaction() ;
     virtual ~JournalTransaction() ;
 
+    virtual int getCommandType() ;
 
     virtual p<TransactionId> getTransactionId() ;
     virtual void setTransactionId(p<TransactionId> transactionId) ;
 
-    virtual byte getType() ;
-    virtual void setType(byte type) ;
+    virtual char getType() ;
+    virtual void setType(char type) ;
 
     virtual bool getWasPrepared() ;
     virtual void setWasPrepared(bool wasPrepared) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/KeepAliveInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/KeepAliveInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/KeepAliveInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/KeepAliveInfo.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define KeepAliveInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -62,6 +57,7 @@
     KeepAliveInfo() ;
     virtual ~KeepAliveInfo() ;
 
+    virtual int getCommandType() ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.cpp Wed Mar  1 09:52:38 2006
@@ -30,8 +30,8 @@
  */
 LocalTransactionId::LocalTransactionId()
 {
-    this->value = NULL ;
-    this->connectionId = NULL ;
+    this->value = 0 ;
+    this->connectionId = 0 ;
 }
 
 LocalTransactionId::~LocalTransactionId()
@@ -39,12 +39,12 @@
 }
 
         
-long LocalTransactionId::getValue()
+long long LocalTransactionId::getValue()
 {
     return value ;
 }
 
-void LocalTransactionId::setValue(long value)
+void LocalTransactionId::setValue(long long value)
 {
     this->value = value ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/LocalTransactionId.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,11 @@
 #define LocalTransactionId_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
+#include "command/TransactionId.hpp"
+    
 #include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
 
-#include "command/TransactionId.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +34,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -54,7 +50,7 @@
 class LocalTransactionId : public TransactionId
 {
 private:
-    long value ;
+    long long value ;
     p<ConnectionId> connectionId ;
 
 public:
@@ -64,9 +60,10 @@
     LocalTransactionId() ;
     virtual ~LocalTransactionId() ;
 
+    virtual int getCommandType() ;
 
-    virtual long getValue() ;
-    virtual void setValue(long value) ;
+    virtual long long getValue() ;
+    virtual void setValue(long long value) ;
 
     virtual p<ConnectionId> getConnectionId() ;
     virtual void setConnectionId(p<ConnectionId> connectionId) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/Message.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/Message.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/Message.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/Message.cpp Wed Mar  1 09:52:38 2006
@@ -30,31 +30,31 @@
  */
 Message::Message()
 {
-    this->producerId = NULL ;
-    this->destination = NULL ;
-    this->transactionId = NULL ;
-    this->originalDestination = NULL ;
-    this->messageId = NULL ;
-    this->originalTransactionId = NULL ;
-    this->groupID = NULL ;
-    this->groupSequence = NULL ;
-    this->correlationId = NULL ;
-    this->persistent = NULL ;
-    this->expiration = NULL ;
-    this->priority = NULL ;
-    this->replyTo = NULL ;
-    this->timestamp = NULL ;
-    this->type = NULL ;
-    this->content = NULL ;
-    this->marshalledProperties = NULL ;
-    this->dataStructure = NULL ;
-    this->targetConsumerId = NULL ;
-    this->compressed = NULL ;
-    this->redeliveryCounter = NULL ;
-    this->brokerPath = NULL ;
-    this->arrival = NULL ;
-    this->userID = NULL ;
-    this->recievedByDFBridge = NULL ;
+    this->producerId = 0 ;
+    this->destination = 0 ;
+    this->transactionId = 0 ;
+    this->originalDestination = 0 ;
+    this->messageId = 0 ;
+    this->originalTransactionId = 0 ;
+    this->groupID = 0 ;
+    this->groupSequence = 0 ;
+    this->correlationId = 0 ;
+    this->persistent = 0 ;
+    this->expiration = 0 ;
+    this->priority = 0 ;
+    this->replyTo = 0 ;
+    this->timestamp = 0 ;
+    this->type = 0 ;
+    this->content = 0 ;
+    this->marshalledProperties = 0 ;
+    this->dataStructure = 0 ;
+    this->targetConsumerId = 0 ;
+    this->compressed = 0 ;
+    this->redeliveryCounter = 0 ;
+    this->brokerPath = 0 ;
+    this->arrival = 0 ;
+    this->userID = 0 ;
+    this->recievedByDFBridge = 0 ;
 }
 
 Message::~Message()
@@ -73,12 +73,12 @@
 }
 
         
-ActiveMQDestination Message::getDestination()
+p<ActiveMQDestination> Message::getDestination()
 {
     return destination ;
 }
 
-void Message::setDestination(ActiveMQDestination destination)
+void Message::setDestination(p<ActiveMQDestination> destination)
 {
     this->destination = destination ;
 }
@@ -95,12 +95,12 @@
 }
 
         
-ActiveMQDestination Message::getOriginalDestination()
+p<ActiveMQDestination> Message::getOriginalDestination()
 {
     return originalDestination ;
 }
 
-void Message::setOriginalDestination(ActiveMQDestination originalDestination)
+void Message::setOriginalDestination(p<ActiveMQDestination> originalDestination)
 {
     this->originalDestination = originalDestination ;
 }
@@ -172,45 +172,45 @@
 }
 
         
-long Message::getExpiration()
+long long Message::getExpiration()
 {
     return expiration ;
 }
 
-void Message::setExpiration(long expiration)
+void Message::setExpiration(long long expiration)
 {
     this->expiration = expiration ;
 }
 
         
-byte Message::getPriority()
+char Message::getPriority()
 {
     return priority ;
 }
 
-void Message::setPriority(byte priority)
+void Message::setPriority(char priority)
 {
     this->priority = priority ;
 }
 
         
-ActiveMQDestination Message::getReplyTo()
+p<ActiveMQDestination> Message::getReplyTo()
 {
     return replyTo ;
 }
 
-void Message::setReplyTo(ActiveMQDestination replyTo)
+void Message::setReplyTo(p<ActiveMQDestination> replyTo)
 {
     this->replyTo = replyTo ;
 }
 
         
-long Message::getTimestamp()
+long long Message::getTimestamp()
 {
     return timestamp ;
 }
 
-void Message::setTimestamp(long timestamp)
+void Message::setTimestamp(long long timestamp)
 {
     this->timestamp = timestamp ;
 }
@@ -227,34 +227,34 @@
 }
 
         
-void* Message::getContent()
+char* Message::getContent()
 {
     return content ;
 }
 
-void Message::setContent(void* content)
+void Message::setContent(char* content)
 {
     this->content = content ;
 }
 
         
-void* Message::getMarshalledProperties()
+char* Message::getMarshalledProperties()
 {
     return marshalledProperties ;
 }
 
-void Message::setMarshalledProperties(void* marshalledProperties)
+void Message::setMarshalledProperties(char* marshalledProperties)
 {
     this->marshalledProperties = marshalledProperties ;
 }
 
         
-DataStructure Message::getDataStructure()
+p<IDataStructure> Message::getDataStructure()
 {
     return dataStructure ;
 }
 
-void Message::setDataStructure(DataStructure dataStructure)
+void Message::setDataStructure(p<IDataStructure> dataStructure)
 {
     this->dataStructure = dataStructure ;
 }
@@ -293,23 +293,23 @@
 }
 
         
-BrokerId[] Message::getBrokerPath()
+ap<BrokerId> Message::getBrokerPath()
 {
     return brokerPath ;
 }
 
-void Message::setBrokerPath(BrokerId[] brokerPath)
+void Message::setBrokerPath(ap<BrokerId> brokerPath)
 {
     this->brokerPath = brokerPath ;
 }
 
         
-long Message::getArrival()
+long long Message::getArrival()
 {
     return arrival ;
 }
 
-void Message::setArrival(long arrival)
+void Message::setArrival(long long arrival)
 {
     this->arrival = arrival ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/Message.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/Message.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/Message.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/Message.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,20 @@
 #define Message_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
+    
 #include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/TransactionId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/MessageId.hpp"
+#include "command/TransactionId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/IDataStructure.hpp"
+#include "command/ConsumerId.hpp"
+#include "command/BrokerId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +43,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,28 +60,28 @@
 {
 private:
     p<ProducerId> producerId ;
-    ActiveMQDestination destination ;
+    p<ActiveMQDestination> destination ;
     p<TransactionId> transactionId ;
-    ActiveMQDestination originalDestination ;
+    p<ActiveMQDestination> originalDestination ;
     p<MessageId> messageId ;
     p<TransactionId> originalTransactionId ;
     p<string> groupID ;
     int groupSequence ;
     p<string> correlationId ;
     bool persistent ;
-    long expiration ;
-    byte priority ;
-    ActiveMQDestination replyTo ;
-    long timestamp ;
+    long long expiration ;
+    char priority ;
+    p<ActiveMQDestination> replyTo ;
+    long long timestamp ;
     p<string> type ;
-    void* content ;
-    void* marshalledProperties ;
-    DataStructure dataStructure ;
+    char* content ;
+    char* marshalledProperties ;
+    p<IDataStructure> dataStructure ;
     p<ConsumerId> targetConsumerId ;
     bool compressed ;
     int redeliveryCounter ;
-    BrokerId[] brokerPath ;
-    long arrival ;
+    ap<BrokerId> brokerPath ;
+    long long arrival ;
     p<string> userID ;
     bool recievedByDFBridge ;
 
@@ -87,18 +92,19 @@
     Message() ;
     virtual ~Message() ;
 
+    virtual int getCommandType() ;
 
     virtual p<ProducerId> getProducerId() ;
     virtual void setProducerId(p<ProducerId> producerId) ;
 
-    virtual ActiveMQDestination getDestination() ;
-    virtual void setDestination(ActiveMQDestination destination) ;
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
 
     virtual p<TransactionId> getTransactionId() ;
     virtual void setTransactionId(p<TransactionId> transactionId) ;
 
-    virtual ActiveMQDestination getOriginalDestination() ;
-    virtual void setOriginalDestination(ActiveMQDestination originalDestination) ;
+    virtual p<ActiveMQDestination> getOriginalDestination() ;
+    virtual void setOriginalDestination(p<ActiveMQDestination> originalDestination) ;
 
     virtual p<MessageId> getMessageId() ;
     virtual void setMessageId(p<MessageId> messageId) ;
@@ -118,29 +124,29 @@
     virtual bool getPersistent() ;
     virtual void setPersistent(bool persistent) ;
 
-    virtual long getExpiration() ;
-    virtual void setExpiration(long expiration) ;
+    virtual long long getExpiration() ;
+    virtual void setExpiration(long long expiration) ;
 
-    virtual byte getPriority() ;
-    virtual void setPriority(byte priority) ;
+    virtual char getPriority() ;
+    virtual void setPriority(char priority) ;
 
-    virtual ActiveMQDestination getReplyTo() ;
-    virtual void setReplyTo(ActiveMQDestination replyTo) ;
+    virtual p<ActiveMQDestination> getReplyTo() ;
+    virtual void setReplyTo(p<ActiveMQDestination> replyTo) ;
 
-    virtual long getTimestamp() ;
-    virtual void setTimestamp(long timestamp) ;
+    virtual long long getTimestamp() ;
+    virtual void setTimestamp(long long timestamp) ;
 
     virtual p<string> getType() ;
     virtual void setType(p<string> type) ;
 
-    virtual void* getContent() ;
-    virtual void setContent(void* content) ;
+    virtual char* getContent() ;
+    virtual void setContent(char* content) ;
 
-    virtual void* getMarshalledProperties() ;
-    virtual void setMarshalledProperties(void* marshalledProperties) ;
+    virtual char* getMarshalledProperties() ;
+    virtual void setMarshalledProperties(char* marshalledProperties) ;
 
-    virtual DataStructure getDataStructure() ;
-    virtual void setDataStructure(DataStructure dataStructure) ;
+    virtual p<IDataStructure> getDataStructure() ;
+    virtual void setDataStructure(p<IDataStructure> dataStructure) ;
 
     virtual p<ConsumerId> getTargetConsumerId() ;
     virtual void setTargetConsumerId(p<ConsumerId> targetConsumerId) ;
@@ -151,11 +157,11 @@
     virtual int getRedeliveryCounter() ;
     virtual void setRedeliveryCounter(int redeliveryCounter) ;
 
-    virtual BrokerId[] getBrokerPath() ;
-    virtual void setBrokerPath(BrokerId[] brokerPath) ;
+    virtual ap<BrokerId> getBrokerPath() ;
+    virtual void setBrokerPath(ap<BrokerId> brokerPath) ;
 
-    virtual long getArrival() ;
-    virtual void setArrival(long arrival) ;
+    virtual long long getArrival() ;
+    virtual void setArrival(long long arrival) ;
 
     virtual p<string> getUserID() ;
     virtual void setUserID(p<string> userID) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.cpp Wed Mar  1 09:52:38 2006
@@ -30,13 +30,13 @@
  */
 MessageAck::MessageAck()
 {
-    this->destination = NULL ;
-    this->transactionId = NULL ;
-    this->consumerId = NULL ;
-    this->ackType = NULL ;
-    this->firstMessageId = NULL ;
-    this->lastMessageId = NULL ;
-    this->messageCount = NULL ;
+    this->destination = 0 ;
+    this->transactionId = 0 ;
+    this->consumerId = 0 ;
+    this->ackType = 0 ;
+    this->firstMessageId = 0 ;
+    this->lastMessageId = 0 ;
+    this->messageCount = 0 ;
 }
 
 MessageAck::~MessageAck()
@@ -44,12 +44,12 @@
 }
 
         
-ActiveMQDestination MessageAck::getDestination()
+p<ActiveMQDestination> MessageAck::getDestination()
 {
     return destination ;
 }
 
-void MessageAck::setDestination(ActiveMQDestination destination)
+void MessageAck::setDestination(p<ActiveMQDestination> destination)
 {
     this->destination = destination ;
 }
@@ -77,12 +77,12 @@
 }
 
         
-byte MessageAck::getAckType()
+char MessageAck::getAckType()
 {
     return ackType ;
 }
 
-void MessageAck::setAckType(byte ackType)
+void MessageAck::setAckType(char ackType)
 {
     this->ackType = ackType ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/MessageAck.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,15 @@
 #define MessageAck_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
+    
+#include "command/ActiveMQDestination.hpp"
+#include "command/TransactionId.hpp"
 #include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+#include "command/MessageId.hpp"
+#include "command/MessageId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +38,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -54,10 +54,10 @@
 class MessageAck : public BaseCommand
 {
 private:
-    ActiveMQDestination destination ;
+    p<ActiveMQDestination> destination ;
     p<TransactionId> transactionId ;
     p<ConsumerId> consumerId ;
-    byte ackType ;
+    char ackType ;
     p<MessageId> firstMessageId ;
     p<MessageId> lastMessageId ;
     int messageCount ;
@@ -69,9 +69,10 @@
     MessageAck() ;
     virtual ~MessageAck() ;
 
+    virtual int getCommandType() ;
 
-    virtual ActiveMQDestination getDestination() ;
-    virtual void setDestination(ActiveMQDestination destination) ;
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
 
     virtual p<TransactionId> getTransactionId() ;
     virtual void setTransactionId(p<TransactionId> transactionId) ;
@@ -79,8 +80,8 @@
     virtual p<ConsumerId> getConsumerId() ;
     virtual void setConsumerId(p<ConsumerId> consumerId) ;
 
-    virtual byte getAckType() ;
-    virtual void setAckType(byte ackType) ;
+    virtual char getAckType() ;
+    virtual void setAckType(char ackType) ;
 
     virtual p<MessageId> getFirstMessageId() ;
     virtual void setFirstMessageId(p<MessageId> firstMessageId) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.cpp Wed Mar  1 09:52:38 2006
@@ -30,10 +30,10 @@
  */
 MessageDispatch::MessageDispatch()
 {
-    this->consumerId = NULL ;
-    this->destination = NULL ;
-    this->message = NULL ;
-    this->redeliveryCounter = NULL ;
+    this->consumerId = 0 ;
+    this->destination = 0 ;
+    this->message = 0 ;
+    this->redeliveryCounter = 0 ;
 }
 
 MessageDispatch::~MessageDispatch()
@@ -52,23 +52,23 @@
 }
 
         
-ActiveMQDestination MessageDispatch::getDestination()
+p<ActiveMQDestination> MessageDispatch::getDestination()
 {
     return destination ;
 }
 
-void MessageDispatch::setDestination(ActiveMQDestination destination)
+void MessageDispatch::setDestination(p<ActiveMQDestination> destination)
 {
     this->destination = destination ;
 }
 
         
-Message MessageDispatch::getMessage()
+p<Message> MessageDispatch::getMessage()
 {
     return message ;
 }
 
-void MessageDispatch::setMessage(Message message)
+void MessageDispatch::setMessage(p<Message> message)
 {
     this->message = message ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatch.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,13 @@
 #define MessageDispatch_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
+    
 #include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/Message.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +36,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,8 +53,8 @@
 {
 private:
     p<ConsumerId> consumerId ;
-    ActiveMQDestination destination ;
-    Message message ;
+    p<ActiveMQDestination> destination ;
+    p<Message> message ;
     int redeliveryCounter ;
 
 public:
@@ -66,15 +64,16 @@
     MessageDispatch() ;
     virtual ~MessageDispatch() ;
 
+    virtual int getCommandType() ;
 
     virtual p<ConsumerId> getConsumerId() ;
     virtual void setConsumerId(p<ConsumerId> consumerId) ;
 
-    virtual ActiveMQDestination getDestination() ;
-    virtual void setDestination(ActiveMQDestination destination) ;
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
 
-    virtual Message getMessage() ;
-    virtual void setMessage(Message message) ;
+    virtual p<Message> getMessage() ;
+    virtual void setMessage(p<Message> message) ;
 
     virtual int getRedeliveryCounter() ;
     virtual void setRedeliveryCounter(int redeliveryCounter) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.cpp Wed Mar  1 09:52:38 2006
@@ -30,10 +30,10 @@
  */
 MessageDispatchNotification::MessageDispatchNotification()
 {
-    this->consumerId = NULL ;
-    this->destination = NULL ;
-    this->deliverySequenceId = NULL ;
-    this->messageId = NULL ;
+    this->consumerId = 0 ;
+    this->destination = 0 ;
+    this->deliverySequenceId = 0 ;
+    this->messageId = 0 ;
 }
 
 MessageDispatchNotification::~MessageDispatchNotification()
@@ -52,23 +52,23 @@
 }
 
         
-ActiveMQDestination MessageDispatchNotification::getDestination()
+p<ActiveMQDestination> MessageDispatchNotification::getDestination()
 {
     return destination ;
 }
 
-void MessageDispatchNotification::setDestination(ActiveMQDestination destination)
+void MessageDispatchNotification::setDestination(p<ActiveMQDestination> destination)
 {
     this->destination = destination ;
 }
 
         
-long MessageDispatchNotification::getDeliverySequenceId()
+long long MessageDispatchNotification::getDeliverySequenceId()
 {
     return deliverySequenceId ;
 }
 
-void MessageDispatchNotification::setDeliverySequenceId(long deliverySequenceId)
+void MessageDispatchNotification::setDeliverySequenceId(long long deliverySequenceId)
 {
     this->deliverySequenceId = deliverySequenceId ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/MessageDispatchNotification.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,13 @@
 #define MessageDispatchNotification_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
+    
 #include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/MessageId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +36,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,8 +53,8 @@
 {
 private:
     p<ConsumerId> consumerId ;
-    ActiveMQDestination destination ;
-    long deliverySequenceId ;
+    p<ActiveMQDestination> destination ;
+    long long deliverySequenceId ;
     p<MessageId> messageId ;
 
 public:
@@ -66,15 +64,16 @@
     MessageDispatchNotification() ;
     virtual ~MessageDispatchNotification() ;
 
+    virtual int getCommandType() ;
 
     virtual p<ConsumerId> getConsumerId() ;
     virtual void setConsumerId(p<ConsumerId> consumerId) ;
 
-    virtual ActiveMQDestination getDestination() ;
-    virtual void setDestination(ActiveMQDestination destination) ;
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
 
-    virtual long getDeliverySequenceId() ;
-    virtual void setDeliverySequenceId(long deliverySequenceId) ;
+    virtual long long getDeliverySequenceId() ;
+    virtual void setDeliverySequenceId(long long deliverySequenceId) ;
 
     virtual p<MessageId> getMessageId() ;
     virtual void setMessageId(p<MessageId> messageId) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/MessageId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/MessageId.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/MessageId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/MessageId.cpp Wed Mar  1 09:52:38 2006
@@ -30,9 +30,9 @@
  */
 MessageId::MessageId()
 {
-    this->producerId = NULL ;
-    this->producerSequenceId = NULL ;
-    this->brokerSequenceId = NULL ;
+    this->producerId = 0 ;
+    this->producerSequenceId = 0 ;
+    this->brokerSequenceId = 0 ;
 }
 
 MessageId::~MessageId()
@@ -51,23 +51,23 @@
 }
 
         
-long MessageId::getProducerSequenceId()
+long long MessageId::getProducerSequenceId()
 {
     return producerSequenceId ;
 }
 
-void MessageId::setProducerSequenceId(long producerSequenceId)
+void MessageId::setProducerSequenceId(long long producerSequenceId)
 {
     this->producerSequenceId = producerSequenceId ;
 }
 
         
-long MessageId::getBrokerSequenceId()
+long long MessageId::getBrokerSequenceId()
 {
     return brokerSequenceId ;
 }
 
-void MessageId::setBrokerSequenceId(long brokerSequenceId)
+void MessageId::setBrokerSequenceId(long long brokerSequenceId)
 {
     this->brokerSequenceId = brokerSequenceId ;
 }



Mime
View raw message