From 9efa4e6e68c571fcef07bf5cb9bc32923b211028 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Wed, 1 Mar 2006 17:52:38 +0000 Subject: [PATCH] Applied modified generated code using Mats latest patch for the generator git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@382103 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/command/ActiveMQObjectMessage.hpp | 14 +-- openwire-cpp/src/command/BrokerId.cpp | 2 +- openwire-cpp/src/command/BrokerId.hpp | 14 +-- openwire-cpp/src/command/BrokerInfo.cpp | 14 +-- openwire-cpp/src/command/BrokerInfo.hpp | 18 ++-- openwire-cpp/src/command/ConnectionError.cpp | 8 +- openwire-cpp/src/command/ConnectionError.hpp | 18 ++-- openwire-cpp/src/command/ConnectionId.cpp | 2 +- openwire-cpp/src/command/ConnectionId.hpp | 14 +-- openwire-cpp/src/command/ConnectionInfo.cpp | 14 +-- openwire-cpp/src/command/ConnectionInfo.hpp | 18 ++-- openwire-cpp/src/command/ConsumerId.cpp | 14 +-- openwire-cpp/src/command/ConsumerId.hpp | 26 +++-- openwire-cpp/src/command/ConsumerInfo.cpp | 38 ++++---- openwire-cpp/src/command/ConsumerInfo.hpp | 31 +++--- openwire-cpp/src/command/ControlCommand.cpp | 2 +- openwire-cpp/src/command/ControlCommand.hpp | 12 +-- .../src/command/DataArrayResponse.cpp | 6 +- .../src/command/DataArrayResponse.hpp | 21 ++--- openwire-cpp/src/command/DataResponse.cpp | 6 +- openwire-cpp/src/command/DataResponse.hpp | 21 ++--- openwire-cpp/src/command/DestinationInfo.cpp | 26 ++--- openwire-cpp/src/command/DestinationInfo.hpp | 37 ++++---- openwire-cpp/src/command/DiscoveryEvent.cpp | 4 +- openwire-cpp/src/command/DiscoveryEvent.hpp | 14 +-- .../src/command/ExceptionResponse.cpp | 6 +- .../src/command/ExceptionResponse.hpp | 21 ++--- openwire-cpp/src/command/FlushCommand.hpp | 12 +-- openwire-cpp/src/command/IntegerResponse.cpp | 2 +- openwire-cpp/src/command/IntegerResponse.hpp | 14 +-- openwire-cpp/src/command/JournalQueueAck.cpp | 12 +-- openwire-cpp/src/command/JournalQueueAck.hpp | 28 +++--- openwire-cpp/src/command/JournalTopicAck.cpp | 20 ++-- openwire-cpp/src/command/JournalTopicAck.hpp | 29 +++--- openwire-cpp/src/command/JournalTrace.cpp | 2 +- openwire-cpp/src/command/JournalTrace.hpp | 14 +-- .../src/command/JournalTransaction.cpp | 10 +- .../src/command/JournalTransaction.hpp | 21 ++--- openwire-cpp/src/command/KeepAliveInfo.hpp | 14 +-- .../src/command/LocalTransactionId.cpp | 8 +- .../src/command/LocalTransactionId.hpp | 21 ++--- openwire-cpp/src/command/Message.cpp | 94 +++++++++---------- openwire-cpp/src/command/Message.hpp | 86 +++++++++-------- openwire-cpp/src/command/MessageAck.cpp | 22 ++--- openwire-cpp/src/command/MessageAck.hpp | 27 +++--- openwire-cpp/src/command/MessageDispatch.cpp | 16 ++-- openwire-cpp/src/command/MessageDispatch.hpp | 25 +++-- .../command/MessageDispatchNotification.cpp | 16 ++-- .../command/MessageDispatchNotification.hpp | 25 +++-- openwire-cpp/src/command/MessageId.cpp | 14 +-- openwire-cpp/src/command/MessageId.hpp | 27 +++--- openwire-cpp/src/command/ProducerId.cpp | 14 +-- openwire-cpp/src/command/ProducerId.hpp | 26 +++-- openwire-cpp/src/command/ProducerInfo.cpp | 14 +-- openwire-cpp/src/command/ProducerInfo.hpp | 25 +++-- openwire-cpp/src/command/RemoveInfo.cpp | 6 +- openwire-cpp/src/command/RemoveInfo.hpp | 19 ++-- .../src/command/RemoveSubscriptionInfo.cpp | 6 +- .../src/command/RemoveSubscriptionInfo.hpp | 11 +-- openwire-cpp/src/command/Response.cpp | 2 +- openwire-cpp/src/command/Response.hpp | 12 +-- openwire-cpp/src/command/SessionId.cpp | 8 +- openwire-cpp/src/command/SessionId.hpp | 20 ++-- openwire-cpp/src/command/SessionInfo.cpp | 2 +- openwire-cpp/src/command/SessionInfo.hpp | 11 +-- openwire-cpp/src/command/ShutdownInfo.hpp | 12 +-- openwire-cpp/src/command/SubscriptionInfo.cpp | 12 +-- openwire-cpp/src/command/SubscriptionInfo.hpp | 21 ++--- openwire-cpp/src/command/TransactionId.hpp | 14 +-- openwire-cpp/src/command/TransactionInfo.cpp | 10 +- openwire-cpp/src/command/TransactionInfo.hpp | 18 ++-- openwire-cpp/src/command/WireFormatInfo.cpp | 18 ++-- openwire-cpp/src/command/WireFormatInfo.hpp | 20 ++-- openwire-cpp/src/command/XATransactionId.cpp | 14 +-- openwire-cpp/src/command/XATransactionId.hpp | 26 +++-- 75 files changed, 607 insertions(+), 714 deletions(-) diff --git a/openwire-cpp/src/command/ActiveMQObjectMessage.hpp b/openwire-cpp/src/command/ActiveMQObjectMessage.hpp index 95336484ad..d5094a3872 100644 --- a/openwire-cpp/src/command/ActiveMQObjectMessage.hpp +++ b/openwire-cpp/src/command/ActiveMQObjectMessage.hpp @@ -18,16 +18,10 @@ #define ActiveMQObjectMessage_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -62,6 +57,7 @@ public: ActiveMQObjectMessage() ; virtual ~ActiveMQObjectMessage() ; + virtual int getCommandType() ; } ; diff --git a/openwire-cpp/src/command/BrokerId.cpp b/openwire-cpp/src/command/BrokerId.cpp index 31f6081588..c11cebe522 100755 --- a/openwire-cpp/src/command/BrokerId.cpp +++ b/openwire-cpp/src/command/BrokerId.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ BrokerId::BrokerId() { - this->value = NULL ; + this->value = 0 ; } BrokerId::~BrokerId() diff --git a/openwire-cpp/src/command/BrokerId.hpp b/openwire-cpp/src/command/BrokerId.hpp index 8e578467b5..a3a9a27f62 100755 --- a/openwire-cpp/src/command/BrokerId.hpp +++ b/openwire-cpp/src/command/BrokerId.hpp @@ -18,16 +18,10 @@ #define BrokerId_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -63,6 +58,7 @@ public: BrokerId() ; virtual ~BrokerId() ; + virtual int getCommandType() ; virtual p getValue() ; virtual void setValue(p value) ; diff --git a/openwire-cpp/src/command/BrokerInfo.cpp b/openwire-cpp/src/command/BrokerInfo.cpp index 23b5ed697d..5cc884766e 100755 --- a/openwire-cpp/src/command/BrokerInfo.cpp +++ b/openwire-cpp/src/command/BrokerInfo.cpp @@ -30,11 +30,11 @@ using namespace apache::activemq::client::command; */ 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 @@ void BrokerInfo::setBrokerURL(p brokerURL) } -BrokerInfo[] BrokerInfo::getPeerBrokerInfos() +ap BrokerInfo::getPeerBrokerInfos() { return peerBrokerInfos ; } -void BrokerInfo::setPeerBrokerInfos(BrokerInfo[] peerBrokerInfos) +void BrokerInfo::setPeerBrokerInfos(ap peerBrokerInfos) { this->peerBrokerInfos = peerBrokerInfos ; } diff --git a/openwire-cpp/src/command/BrokerInfo.hpp b/openwire-cpp/src/command/BrokerInfo.hpp index 519647804b..21cc5255e9 100755 --- a/openwire-cpp/src/command/BrokerInfo.hpp +++ b/openwire-cpp/src/command/BrokerInfo.hpp @@ -18,16 +18,12 @@ #define BrokerInfo_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -56,7 +53,7 @@ class BrokerInfo : public BaseCommand private: p brokerId ; p brokerURL ; - BrokerInfo[] peerBrokerInfos ; + ap peerBrokerInfos ; p brokerName ; bool slaveBroker ; @@ -67,6 +64,7 @@ public: BrokerInfo() ; virtual ~BrokerInfo() ; + virtual int getCommandType() ; virtual p getBrokerId() ; virtual void setBrokerId(p brokerId) ; @@ -74,8 +72,8 @@ public: virtual p getBrokerURL() ; virtual void setBrokerURL(p brokerURL) ; - virtual BrokerInfo[] getPeerBrokerInfos() ; - virtual void setPeerBrokerInfos(BrokerInfo[] peerBrokerInfos) ; + virtual ap getPeerBrokerInfos() ; + virtual void setPeerBrokerInfos(ap peerBrokerInfos) ; virtual p getBrokerName() ; virtual void setBrokerName(p brokerName) ; diff --git a/openwire-cpp/src/command/ConnectionError.cpp b/openwire-cpp/src/command/ConnectionError.cpp index 215276b4fd..7b35f6ffd3 100644 --- a/openwire-cpp/src/command/ConnectionError.cpp +++ b/openwire-cpp/src/command/ConnectionError.cpp @@ -30,8 +30,8 @@ using namespace apache::activemq::client::command; */ ConnectionError::ConnectionError() { - this->exception = NULL ; - this->connectionId = NULL ; + this->exception = 0 ; + this->connectionId = 0 ; } ConnectionError::~ConnectionError() @@ -39,12 +39,12 @@ ConnectionError::~ConnectionError() } -BrokerError ConnectionError::getException() +p ConnectionError::getException() { return exception ; } -void ConnectionError::setException(BrokerError exception) +void ConnectionError::setException(p exception) { this->exception = exception ; } diff --git a/openwire-cpp/src/command/ConnectionError.hpp b/openwire-cpp/src/command/ConnectionError.hpp index e7b2a43c87..a7bf49c933 100644 --- a/openwire-cpp/src/command/ConnectionError.hpp +++ b/openwire-cpp/src/command/ConnectionError.hpp @@ -18,16 +18,12 @@ #define ConnectionError_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -54,7 +51,7 @@ namespace apache class ConnectionError : public BaseCommand { private: - BrokerError exception ; + p exception ; p connectionId ; public: @@ -64,9 +61,10 @@ public: ConnectionError() ; virtual ~ConnectionError() ; + virtual int getCommandType() ; - virtual BrokerError getException() ; - virtual void setException(BrokerError exception) ; + virtual p getException() ; + virtual void setException(p exception) ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; diff --git a/openwire-cpp/src/command/ConnectionId.cpp b/openwire-cpp/src/command/ConnectionId.cpp index 379e8eb4bb..2029cbb9fd 100755 --- a/openwire-cpp/src/command/ConnectionId.cpp +++ b/openwire-cpp/src/command/ConnectionId.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ ConnectionId::ConnectionId() { - this->value = NULL ; + this->value = 0 ; } ConnectionId::~ConnectionId() diff --git a/openwire-cpp/src/command/ConnectionId.hpp b/openwire-cpp/src/command/ConnectionId.hpp index 37409a3f5c..33d4a6a2d2 100755 --- a/openwire-cpp/src/command/ConnectionId.hpp +++ b/openwire-cpp/src/command/ConnectionId.hpp @@ -18,16 +18,10 @@ #define ConnectionId_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -63,6 +58,7 @@ public: ConnectionId() ; virtual ~ConnectionId() ; + virtual int getCommandType() ; virtual p getValue() ; virtual void setValue(p value) ; diff --git a/openwire-cpp/src/command/ConnectionInfo.cpp b/openwire-cpp/src/command/ConnectionInfo.cpp index 542a19a466..102f1e01e5 100755 --- a/openwire-cpp/src/command/ConnectionInfo.cpp +++ b/openwire-cpp/src/command/ConnectionInfo.cpp @@ -30,11 +30,11 @@ using namespace apache::activemq::client::command; */ 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 @@ void ConnectionInfo::setUserName(p userName) } -BrokerId[] ConnectionInfo::getBrokerPath() +ap ConnectionInfo::getBrokerPath() { return brokerPath ; } -void ConnectionInfo::setBrokerPath(BrokerId[] brokerPath) +void ConnectionInfo::setBrokerPath(ap brokerPath) { this->brokerPath = brokerPath ; } diff --git a/openwire-cpp/src/command/ConnectionInfo.hpp b/openwire-cpp/src/command/ConnectionInfo.hpp index c098511373..41e960f9ad 100755 --- a/openwire-cpp/src/command/ConnectionInfo.hpp +++ b/openwire-cpp/src/command/ConnectionInfo.hpp @@ -18,16 +18,12 @@ #define ConnectionInfo_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -58,7 +55,7 @@ private: p clientId ; p password ; p userName ; - BrokerId[] brokerPath ; + ap brokerPath ; public: const static int TYPE = 3; @@ -67,6 +64,7 @@ public: ConnectionInfo() ; virtual ~ConnectionInfo() ; + virtual int getCommandType() ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; @@ -80,8 +78,8 @@ public: virtual p getUserName() ; virtual void setUserName(p userName) ; - virtual BrokerId[] getBrokerPath() ; - virtual void setBrokerPath(BrokerId[] brokerPath) ; + virtual ap getBrokerPath() ; + virtual void setBrokerPath(ap brokerPath) ; } ; diff --git a/openwire-cpp/src/command/ConsumerId.cpp b/openwire-cpp/src/command/ConsumerId.cpp index 9090d09167..ee4cabdfa6 100755 --- a/openwire-cpp/src/command/ConsumerId.cpp +++ b/openwire-cpp/src/command/ConsumerId.cpp @@ -30,9 +30,9 @@ using namespace apache::activemq::client::command; */ 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 @@ void ConsumerId::setConnectionId(p connectionId) } -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 ; } diff --git a/openwire-cpp/src/command/ConsumerId.hpp b/openwire-cpp/src/command/ConsumerId.hpp index 3cf92e25d6..9a589e05da 100755 --- a/openwire-cpp/src/command/ConsumerId.hpp +++ b/openwire-cpp/src/command/ConsumerId.hpp @@ -18,16 +18,10 @@ #define ConsumerId_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,8 +50,8 @@ class ConsumerId : public AbstractCommand { private: p connectionId ; - long sessionId ; - long value ; + long long sessionId ; + long long value ; public: const static int TYPE = 122; @@ -65,15 +60,16 @@ public: ConsumerId() ; virtual ~ConsumerId() ; + virtual int getCommandType() ; virtual p getConnectionId() ; virtual void setConnectionId(p 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) ; } ; diff --git a/openwire-cpp/src/command/ConsumerInfo.cpp b/openwire-cpp/src/command/ConsumerInfo.cpp index dd1002fc67..2fe07e2c5b 100755 --- a/openwire-cpp/src/command/ConsumerInfo.cpp +++ b/openwire-cpp/src/command/ConsumerInfo.cpp @@ -30,19 +30,19 @@ using namespace apache::activemq::client::command; */ 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 @@ void ConsumerInfo::setBrowser(bool browser) } -ActiveMQDestination ConsumerInfo::getDestination() +p ConsumerInfo::getDestination() { return destination ; } -void ConsumerInfo::setDestination(ActiveMQDestination destination) +void ConsumerInfo::setDestination(p destination) { this->destination = destination ; } @@ -160,23 +160,23 @@ void ConsumerInfo::setRetroactive(bool retroactive) } -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 ConsumerInfo::getBrokerPath() { return brokerPath ; } -void ConsumerInfo::setBrokerPath(BrokerId[] brokerPath) +void ConsumerInfo::setBrokerPath(ap brokerPath) { this->brokerPath = brokerPath ; } diff --git a/openwire-cpp/src/command/ConsumerInfo.hpp b/openwire-cpp/src/command/ConsumerInfo.hpp index f52f786456..1fb2ec6fe7 100755 --- a/openwire-cpp/src/command/ConsumerInfo.hpp +++ b/openwire-cpp/src/command/ConsumerInfo.hpp @@ -18,16 +18,13 @@ #define ConsumerInfo_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -56,7 +54,7 @@ class ConsumerInfo : public BaseCommand private: p consumerId ; bool browser ; - ActiveMQDestination destination ; + p destination ; int prefetchSize ; bool dispatchAsync ; p selector ; @@ -64,8 +62,8 @@ private: bool noLocal ; bool exclusive ; bool retroactive ; - byte priority ; - BrokerId[] brokerPath ; + char priority ; + ap brokerPath ; bool networkSubscription ; public: @@ -75,6 +73,7 @@ public: ConsumerInfo() ; virtual ~ConsumerInfo() ; + virtual int getCommandType() ; virtual p getConsumerId() ; virtual void setConsumerId(p consumerId) ; @@ -82,8 +81,8 @@ public: virtual bool getBrowser() ; virtual void setBrowser(bool browser) ; - virtual ActiveMQDestination getDestination() ; - virtual void setDestination(ActiveMQDestination destination) ; + virtual p getDestination() ; + virtual void setDestination(p destination) ; virtual int getPrefetchSize() ; virtual void setPrefetchSize(int prefetchSize) ; @@ -106,11 +105,11 @@ public: 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 getBrokerPath() ; + virtual void setBrokerPath(ap brokerPath) ; virtual bool getNetworkSubscription() ; virtual void setNetworkSubscription(bool networkSubscription) ; diff --git a/openwire-cpp/src/command/ControlCommand.cpp b/openwire-cpp/src/command/ControlCommand.cpp index f730282d62..c2f82ce444 100644 --- a/openwire-cpp/src/command/ControlCommand.cpp +++ b/openwire-cpp/src/command/ControlCommand.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ ControlCommand::ControlCommand() { - this->command = NULL ; + this->command = 0 ; } ControlCommand::~ControlCommand() diff --git a/openwire-cpp/src/command/ControlCommand.hpp b/openwire-cpp/src/command/ControlCommand.hpp index 749b57887e..f2c9068f1a 100644 --- a/openwire-cpp/src/command/ControlCommand.hpp +++ b/openwire-cpp/src/command/ControlCommand.hpp @@ -18,16 +18,10 @@ #define ControlCommand_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -63,6 +58,7 @@ public: ControlCommand() ; virtual ~ControlCommand() ; + virtual int getCommandType() ; virtual p getCommand() ; virtual void setCommand(p command) ; diff --git a/openwire-cpp/src/command/DataArrayResponse.cpp b/openwire-cpp/src/command/DataArrayResponse.cpp index 784b0a1d24..5d9dbd8899 100644 --- a/openwire-cpp/src/command/DataArrayResponse.cpp +++ b/openwire-cpp/src/command/DataArrayResponse.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ DataArrayResponse::DataArrayResponse() { - this->data = NULL ; + this->data = 0 ; } DataArrayResponse::~DataArrayResponse() @@ -38,12 +38,12 @@ DataArrayResponse::~DataArrayResponse() } -DataStructure[] DataArrayResponse::getData() +ap DataArrayResponse::getData() { return data ; } -void DataArrayResponse::setData(DataStructure[] data) +void DataArrayResponse::setData(ap data) { this->data = data ; } diff --git a/openwire-cpp/src/command/DataArrayResponse.hpp b/openwire-cpp/src/command/DataArrayResponse.hpp index 36268606d3..658d06b0bd 100644 --- a/openwire-cpp/src/command/DataArrayResponse.hpp +++ b/openwire-cpp/src/command/DataArrayResponse.hpp @@ -18,16 +18,11 @@ #define DataArrayResponse_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -54,7 +50,7 @@ namespace apache class DataArrayResponse : public Response { private: - DataStructure[] data ; + ap data ; public: const static int TYPE = 33; @@ -63,9 +59,10 @@ public: DataArrayResponse() ; virtual ~DataArrayResponse() ; + virtual int getCommandType() ; - virtual DataStructure[] getData() ; - virtual void setData(DataStructure[] data) ; + virtual ap getData() ; + virtual void setData(ap data) ; } ; diff --git a/openwire-cpp/src/command/DataResponse.cpp b/openwire-cpp/src/command/DataResponse.cpp index f033ef26c5..ca14f7a804 100644 --- a/openwire-cpp/src/command/DataResponse.cpp +++ b/openwire-cpp/src/command/DataResponse.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ DataResponse::DataResponse() { - this->data = NULL ; + this->data = 0 ; } DataResponse::~DataResponse() @@ -38,12 +38,12 @@ DataResponse::~DataResponse() } -DataStructure DataResponse::getData() +p DataResponse::getData() { return data ; } -void DataResponse::setData(DataStructure data) +void DataResponse::setData(p data) { this->data = data ; } diff --git a/openwire-cpp/src/command/DataResponse.hpp b/openwire-cpp/src/command/DataResponse.hpp index a04bfeadbe..d7d7a1e7f5 100644 --- a/openwire-cpp/src/command/DataResponse.hpp +++ b/openwire-cpp/src/command/DataResponse.hpp @@ -18,16 +18,11 @@ #define DataResponse_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -54,7 +50,7 @@ namespace apache class DataResponse : public Response { private: - DataStructure data ; + p data ; public: const static int TYPE = 32; @@ -63,9 +59,10 @@ public: DataResponse() ; virtual ~DataResponse() ; + virtual int getCommandType() ; - virtual DataStructure getData() ; - virtual void setData(DataStructure data) ; + virtual p getData() ; + virtual void setData(p data) ; } ; diff --git a/openwire-cpp/src/command/DestinationInfo.cpp b/openwire-cpp/src/command/DestinationInfo.cpp index 32138e249e..1a93ec29b8 100644 --- a/openwire-cpp/src/command/DestinationInfo.cpp +++ b/openwire-cpp/src/command/DestinationInfo.cpp @@ -30,11 +30,11 @@ using namespace apache::activemq::client::command; */ 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 @@ void DestinationInfo::setConnectionId(p connectionId) } -ActiveMQDestination DestinationInfo::getDestination() +p DestinationInfo::getDestination() { return destination ; } -void DestinationInfo::setDestination(ActiveMQDestination destination) +void DestinationInfo::setDestination(p 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 DestinationInfo::getBrokerPath() { return brokerPath ; } -void DestinationInfo::setBrokerPath(BrokerId[] brokerPath) +void DestinationInfo::setBrokerPath(ap brokerPath) { this->brokerPath = brokerPath ; } diff --git a/openwire-cpp/src/command/DestinationInfo.hpp b/openwire-cpp/src/command/DestinationInfo.hpp index 9cbf8660c9..a53f9e91e8 100644 --- a/openwire-cpp/src/command/DestinationInfo.hpp +++ b/openwire-cpp/src/command/DestinationInfo.hpp @@ -18,16 +18,13 @@ #define DestinationInfo_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,10 +53,10 @@ class DestinationInfo : public BaseCommand { private: p connectionId ; - ActiveMQDestination destination ; - byte operationType ; - long timeout ; - BrokerId[] brokerPath ; + p destination ; + char operationType ; + long long timeout ; + ap brokerPath ; public: const static int TYPE = 8; @@ -67,21 +65,22 @@ public: DestinationInfo() ; virtual ~DestinationInfo() ; + virtual int getCommandType() ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; - virtual ActiveMQDestination getDestination() ; - virtual void setDestination(ActiveMQDestination destination) ; + virtual p getDestination() ; + virtual void setDestination(p 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 getBrokerPath() ; + virtual void setBrokerPath(ap brokerPath) ; } ; diff --git a/openwire-cpp/src/command/DiscoveryEvent.cpp b/openwire-cpp/src/command/DiscoveryEvent.cpp index 27e5f7199d..df3a779838 100644 --- a/openwire-cpp/src/command/DiscoveryEvent.cpp +++ b/openwire-cpp/src/command/DiscoveryEvent.cpp @@ -30,8 +30,8 @@ using namespace apache::activemq::client::command; */ DiscoveryEvent::DiscoveryEvent() { - this->serviceName = NULL ; - this->brokerName = NULL ; + this->serviceName = 0 ; + this->brokerName = 0 ; } DiscoveryEvent::~DiscoveryEvent() diff --git a/openwire-cpp/src/command/DiscoveryEvent.hpp b/openwire-cpp/src/command/DiscoveryEvent.hpp index af6a01c173..70d1084c5b 100644 --- a/openwire-cpp/src/command/DiscoveryEvent.hpp +++ b/openwire-cpp/src/command/DiscoveryEvent.hpp @@ -18,16 +18,10 @@ #define DiscoveryEvent_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -64,6 +59,7 @@ public: DiscoveryEvent() ; virtual ~DiscoveryEvent() ; + virtual int getCommandType() ; virtual p getServiceName() ; virtual void setServiceName(p serviceName) ; diff --git a/openwire-cpp/src/command/ExceptionResponse.cpp b/openwire-cpp/src/command/ExceptionResponse.cpp index 57e10ee4f5..e71c60b9da 100755 --- a/openwire-cpp/src/command/ExceptionResponse.cpp +++ b/openwire-cpp/src/command/ExceptionResponse.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ ExceptionResponse::ExceptionResponse() { - this->exception = NULL ; + this->exception = 0 ; } ExceptionResponse::~ExceptionResponse() @@ -38,12 +38,12 @@ ExceptionResponse::~ExceptionResponse() } -BrokerError ExceptionResponse::getException() +p ExceptionResponse::getException() { return exception ; } -void ExceptionResponse::setException(BrokerError exception) +void ExceptionResponse::setException(p exception) { this->exception = exception ; } diff --git a/openwire-cpp/src/command/ExceptionResponse.hpp b/openwire-cpp/src/command/ExceptionResponse.hpp index b54024df44..c2d864eee4 100755 --- a/openwire-cpp/src/command/ExceptionResponse.hpp +++ b/openwire-cpp/src/command/ExceptionResponse.hpp @@ -18,16 +18,11 @@ #define ExceptionResponse_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -54,7 +50,7 @@ namespace apache class ExceptionResponse : public Response { private: - BrokerError exception ; + p exception ; public: const static int TYPE = 31; @@ -63,9 +59,10 @@ public: ExceptionResponse() ; virtual ~ExceptionResponse() ; + virtual int getCommandType() ; - virtual BrokerError getException() ; - virtual void setException(BrokerError exception) ; + virtual p getException() ; + virtual void setException(p exception) ; } ; diff --git a/openwire-cpp/src/command/FlushCommand.hpp b/openwire-cpp/src/command/FlushCommand.hpp index 7486979c32..a0385f2d59 100644 --- a/openwire-cpp/src/command/FlushCommand.hpp +++ b/openwire-cpp/src/command/FlushCommand.hpp @@ -18,16 +18,10 @@ #define FlushCommand_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -62,6 +57,7 @@ public: FlushCommand() ; virtual ~FlushCommand() ; + virtual int getCommandType() ; } ; diff --git a/openwire-cpp/src/command/IntegerResponse.cpp b/openwire-cpp/src/command/IntegerResponse.cpp index 184a3793d8..97124e1cb7 100644 --- a/openwire-cpp/src/command/IntegerResponse.cpp +++ b/openwire-cpp/src/command/IntegerResponse.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ IntegerResponse::IntegerResponse() { - this->result = NULL ; + this->result = 0 ; } IntegerResponse::~IntegerResponse() diff --git a/openwire-cpp/src/command/IntegerResponse.hpp b/openwire-cpp/src/command/IntegerResponse.hpp index f6d64dab64..6b6d2e5daf 100644 --- a/openwire-cpp/src/command/IntegerResponse.hpp +++ b/openwire-cpp/src/command/IntegerResponse.hpp @@ -18,16 +18,10 @@ #define IntegerResponse_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -63,6 +58,7 @@ public: IntegerResponse() ; virtual ~IntegerResponse() ; + virtual int getCommandType() ; virtual int getResult() ; virtual void setResult(int result) ; diff --git a/openwire-cpp/src/command/JournalQueueAck.cpp b/openwire-cpp/src/command/JournalQueueAck.cpp index 7b4d9c0b3e..05de923643 100644 --- a/openwire-cpp/src/command/JournalQueueAck.cpp +++ b/openwire-cpp/src/command/JournalQueueAck.cpp @@ -30,8 +30,8 @@ using namespace apache::activemq::client::command; */ JournalQueueAck::JournalQueueAck() { - this->destination = NULL ; - this->messageAck = NULL ; + this->destination = 0 ; + this->messageAck = 0 ; } JournalQueueAck::~JournalQueueAck() @@ -39,23 +39,23 @@ JournalQueueAck::~JournalQueueAck() } -ActiveMQDestination JournalQueueAck::getDestination() +p JournalQueueAck::getDestination() { return destination ; } -void JournalQueueAck::setDestination(ActiveMQDestination destination) +void JournalQueueAck::setDestination(p destination) { this->destination = destination ; } -MessageAck JournalQueueAck::getMessageAck() +p JournalQueueAck::getMessageAck() { return messageAck ; } -void JournalQueueAck::setMessageAck(MessageAck messageAck) +void JournalQueueAck::setMessageAck(p messageAck) { this->messageAck = messageAck ; } diff --git a/openwire-cpp/src/command/JournalQueueAck.hpp b/openwire-cpp/src/command/JournalQueueAck.hpp index 99de590696..0f76aeeb2c 100644 --- a/openwire-cpp/src/command/JournalQueueAck.hpp +++ b/openwire-cpp/src/command/JournalQueueAck.hpp @@ -18,16 +18,12 @@ #define JournalQueueAck_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -54,8 +51,8 @@ namespace apache class JournalQueueAck : public AbstractCommand { private: - ActiveMQDestination destination ; - MessageAck messageAck ; + p destination ; + p messageAck ; public: const static int TYPE = 52; @@ -64,12 +61,13 @@ public: JournalQueueAck() ; virtual ~JournalQueueAck() ; + virtual int getCommandType() ; - virtual ActiveMQDestination getDestination() ; - virtual void setDestination(ActiveMQDestination destination) ; + virtual p getDestination() ; + virtual void setDestination(p destination) ; - virtual MessageAck getMessageAck() ; - virtual void setMessageAck(MessageAck messageAck) ; + virtual p getMessageAck() ; + virtual void setMessageAck(p messageAck) ; } ; diff --git a/openwire-cpp/src/command/JournalTopicAck.cpp b/openwire-cpp/src/command/JournalTopicAck.cpp index e02c0d4819..c76dd8be39 100644 --- a/openwire-cpp/src/command/JournalTopicAck.cpp +++ b/openwire-cpp/src/command/JournalTopicAck.cpp @@ -30,12 +30,12 @@ using namespace apache::activemq::client::command; */ 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 @@ JournalTopicAck::~JournalTopicAck() } -ActiveMQDestination JournalTopicAck::getDestination() +p JournalTopicAck::getDestination() { return destination ; } -void JournalTopicAck::setDestination(ActiveMQDestination destination) +void JournalTopicAck::setDestination(p destination) { this->destination = destination ; } @@ -65,12 +65,12 @@ void JournalTopicAck::setMessageId(p messageId) } -long JournalTopicAck::getMessageSequenceId() +long long JournalTopicAck::getMessageSequenceId() { return messageSequenceId ; } -void JournalTopicAck::setMessageSequenceId(long messageSequenceId) +void JournalTopicAck::setMessageSequenceId(long long messageSequenceId) { this->messageSequenceId = messageSequenceId ; } diff --git a/openwire-cpp/src/command/JournalTopicAck.hpp b/openwire-cpp/src/command/JournalTopicAck.hpp index adeefde936..e8cf61bf78 100644 --- a/openwire-cpp/src/command/JournalTopicAck.hpp +++ b/openwire-cpp/src/command/JournalTopicAck.hpp @@ -18,16 +18,13 @@ #define JournalTopicAck_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -54,9 +52,9 @@ namespace apache class JournalTopicAck : public AbstractCommand { private: - ActiveMQDestination destination ; + p destination ; p messageId ; - long messageSequenceId ; + long long messageSequenceId ; p subscritionName ; p clientId ; p transactionId ; @@ -68,15 +66,16 @@ public: JournalTopicAck() ; virtual ~JournalTopicAck() ; + virtual int getCommandType() ; - virtual ActiveMQDestination getDestination() ; - virtual void setDestination(ActiveMQDestination destination) ; + virtual p getDestination() ; + virtual void setDestination(p destination) ; virtual p getMessageId() ; virtual void setMessageId(p messageId) ; - virtual long getMessageSequenceId() ; - virtual void setMessageSequenceId(long messageSequenceId) ; + virtual long long getMessageSequenceId() ; + virtual void setMessageSequenceId(long long messageSequenceId) ; virtual p getSubscritionName() ; virtual void setSubscritionName(p subscritionName) ; diff --git a/openwire-cpp/src/command/JournalTrace.cpp b/openwire-cpp/src/command/JournalTrace.cpp index 3221d9b173..c6f9a9890a 100644 --- a/openwire-cpp/src/command/JournalTrace.cpp +++ b/openwire-cpp/src/command/JournalTrace.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ JournalTrace::JournalTrace() { - this->message = NULL ; + this->message = 0 ; } JournalTrace::~JournalTrace() diff --git a/openwire-cpp/src/command/JournalTrace.hpp b/openwire-cpp/src/command/JournalTrace.hpp index 2b4b1a1aa6..89c8edaed7 100644 --- a/openwire-cpp/src/command/JournalTrace.hpp +++ b/openwire-cpp/src/command/JournalTrace.hpp @@ -18,16 +18,10 @@ #define JournalTrace_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -63,6 +58,7 @@ public: JournalTrace() ; virtual ~JournalTrace() ; + virtual int getCommandType() ; virtual p getMessage() ; virtual void setMessage(p message) ; diff --git a/openwire-cpp/src/command/JournalTransaction.cpp b/openwire-cpp/src/command/JournalTransaction.cpp index 9bd922efe8..a8dabba130 100644 --- a/openwire-cpp/src/command/JournalTransaction.cpp +++ b/openwire-cpp/src/command/JournalTransaction.cpp @@ -30,9 +30,9 @@ using namespace apache::activemq::client::command; */ 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 @@ void JournalTransaction::setTransactionId(p transactionId) } -byte JournalTransaction::getType() +char JournalTransaction::getType() { return type ; } -void JournalTransaction::setType(byte type) +void JournalTransaction::setType(char type) { this->type = type ; } diff --git a/openwire-cpp/src/command/JournalTransaction.hpp b/openwire-cpp/src/command/JournalTransaction.hpp index 470cda64a0..93bc622a32 100644 --- a/openwire-cpp/src/command/JournalTransaction.hpp +++ b/openwire-cpp/src/command/JournalTransaction.hpp @@ -18,16 +18,11 @@ #define JournalTransaction_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,7 +51,7 @@ class JournalTransaction : public AbstractCommand { private: p transactionId ; - byte type ; + char type ; bool wasPrepared ; public: @@ -65,12 +61,13 @@ public: JournalTransaction() ; virtual ~JournalTransaction() ; + virtual int getCommandType() ; virtual p getTransactionId() ; virtual void setTransactionId(p 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) ; diff --git a/openwire-cpp/src/command/KeepAliveInfo.hpp b/openwire-cpp/src/command/KeepAliveInfo.hpp index 883dbc5b2a..bdbceb6e27 100644 --- a/openwire-cpp/src/command/KeepAliveInfo.hpp +++ b/openwire-cpp/src/command/KeepAliveInfo.hpp @@ -18,16 +18,10 @@ #define KeepAliveInfo_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -62,6 +57,7 @@ public: KeepAliveInfo() ; virtual ~KeepAliveInfo() ; + virtual int getCommandType() ; } ; diff --git a/openwire-cpp/src/command/LocalTransactionId.cpp b/openwire-cpp/src/command/LocalTransactionId.cpp index a8fb1e3c7d..0bec3e45d6 100644 --- a/openwire-cpp/src/command/LocalTransactionId.cpp +++ b/openwire-cpp/src/command/LocalTransactionId.cpp @@ -30,8 +30,8 @@ using namespace apache::activemq::client::command; */ LocalTransactionId::LocalTransactionId() { - this->value = NULL ; - this->connectionId = NULL ; + this->value = 0 ; + this->connectionId = 0 ; } LocalTransactionId::~LocalTransactionId() @@ -39,12 +39,12 @@ LocalTransactionId::~LocalTransactionId() } -long LocalTransactionId::getValue() +long long LocalTransactionId::getValue() { return value ; } -void LocalTransactionId::setValue(long value) +void LocalTransactionId::setValue(long long value) { this->value = value ; } diff --git a/openwire-cpp/src/command/LocalTransactionId.hpp b/openwire-cpp/src/command/LocalTransactionId.hpp index eddd259f47..5c4dbd36d6 100644 --- a/openwire-cpp/src/command/LocalTransactionId.hpp +++ b/openwire-cpp/src/command/LocalTransactionId.hpp @@ -18,16 +18,11 @@ #define LocalTransactionId_hpp_ #include - -/* 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/TransactionId.hpp" + +#include "command/ConnectionId.hpp" + +#include "util/ifr/ap" #include "util/ifr/p" namespace apache @@ -39,6 +34,7 @@ namespace apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -54,7 +50,7 @@ namespace apache class LocalTransactionId : public TransactionId { private: - long value ; + long long value ; p connectionId ; public: @@ -64,9 +60,10 @@ public: 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 getConnectionId() ; virtual void setConnectionId(p connectionId) ; diff --git a/openwire-cpp/src/command/Message.cpp b/openwire-cpp/src/command/Message.cpp index e46fb858f7..4d4ae6f443 100755 --- a/openwire-cpp/src/command/Message.cpp +++ b/openwire-cpp/src/command/Message.cpp @@ -30,31 +30,31 @@ using namespace apache::activemq::client::command; */ 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 @@ void Message::setProducerId(p producerId) } -ActiveMQDestination Message::getDestination() +p Message::getDestination() { return destination ; } -void Message::setDestination(ActiveMQDestination destination) +void Message::setDestination(p destination) { this->destination = destination ; } @@ -95,12 +95,12 @@ void Message::setTransactionId(p transactionId) } -ActiveMQDestination Message::getOriginalDestination() +p Message::getOriginalDestination() { return originalDestination ; } -void Message::setOriginalDestination(ActiveMQDestination originalDestination) +void Message::setOriginalDestination(p originalDestination) { this->originalDestination = originalDestination ; } @@ -172,45 +172,45 @@ void Message::setPersistent(bool persistent) } -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 Message::getReplyTo() { return replyTo ; } -void Message::setReplyTo(ActiveMQDestination replyTo) +void Message::setReplyTo(p 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::setType(p type) } -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 Message::getDataStructure() { return dataStructure ; } -void Message::setDataStructure(DataStructure dataStructure) +void Message::setDataStructure(p dataStructure) { this->dataStructure = dataStructure ; } @@ -293,23 +293,23 @@ void Message::setRedeliveryCounter(int redeliveryCounter) } -BrokerId[] Message::getBrokerPath() +ap Message::getBrokerPath() { return brokerPath ; } -void Message::setBrokerPath(BrokerId[] brokerPath) +void Message::setBrokerPath(ap 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 ; } diff --git a/openwire-cpp/src/command/Message.hpp b/openwire-cpp/src/command/Message.hpp index 2e26289d30..0d95f452c4 100755 --- a/openwire-cpp/src/command/Message.hpp +++ b/openwire-cpp/src/command/Message.hpp @@ -18,16 +18,20 @@ #define Message_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,28 +60,28 @@ class Message : public BaseCommand { private: p producerId ; - ActiveMQDestination destination ; + p destination ; p transactionId ; - ActiveMQDestination originalDestination ; + p originalDestination ; p messageId ; p originalTransactionId ; p groupID ; int groupSequence ; p correlationId ; bool persistent ; - long expiration ; - byte priority ; - ActiveMQDestination replyTo ; - long timestamp ; + long long expiration ; + char priority ; + p replyTo ; + long long timestamp ; p type ; - void* content ; - void* marshalledProperties ; - DataStructure dataStructure ; + char* content ; + char* marshalledProperties ; + p dataStructure ; p targetConsumerId ; bool compressed ; int redeliveryCounter ; - BrokerId[] brokerPath ; - long arrival ; + ap brokerPath ; + long long arrival ; p userID ; bool recievedByDFBridge ; @@ -87,18 +92,19 @@ public: Message() ; virtual ~Message() ; + virtual int getCommandType() ; virtual p getProducerId() ; virtual void setProducerId(p producerId) ; - virtual ActiveMQDestination getDestination() ; - virtual void setDestination(ActiveMQDestination destination) ; + virtual p getDestination() ; + virtual void setDestination(p destination) ; virtual p getTransactionId() ; virtual void setTransactionId(p transactionId) ; - virtual ActiveMQDestination getOriginalDestination() ; - virtual void setOriginalDestination(ActiveMQDestination originalDestination) ; + virtual p getOriginalDestination() ; + virtual void setOriginalDestination(p originalDestination) ; virtual p getMessageId() ; virtual void setMessageId(p messageId) ; @@ -118,29 +124,29 @@ public: 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 getReplyTo() ; + virtual void setReplyTo(p replyTo) ; - virtual long getTimestamp() ; - virtual void setTimestamp(long timestamp) ; + virtual long long getTimestamp() ; + virtual void setTimestamp(long long timestamp) ; virtual p getType() ; virtual void setType(p 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 getDataStructure() ; + virtual void setDataStructure(p dataStructure) ; virtual p getTargetConsumerId() ; virtual void setTargetConsumerId(p targetConsumerId) ; @@ -151,11 +157,11 @@ public: virtual int getRedeliveryCounter() ; virtual void setRedeliveryCounter(int redeliveryCounter) ; - virtual BrokerId[] getBrokerPath() ; - virtual void setBrokerPath(BrokerId[] brokerPath) ; + virtual ap getBrokerPath() ; + virtual void setBrokerPath(ap brokerPath) ; - virtual long getArrival() ; - virtual void setArrival(long arrival) ; + virtual long long getArrival() ; + virtual void setArrival(long long arrival) ; virtual p getUserID() ; virtual void setUserID(p userID) ; diff --git a/openwire-cpp/src/command/MessageAck.cpp b/openwire-cpp/src/command/MessageAck.cpp index c261025ed8..2ad0e9489f 100755 --- a/openwire-cpp/src/command/MessageAck.cpp +++ b/openwire-cpp/src/command/MessageAck.cpp @@ -30,13 +30,13 @@ using namespace apache::activemq::client::command; */ 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 @@ MessageAck::~MessageAck() } -ActiveMQDestination MessageAck::getDestination() +p MessageAck::getDestination() { return destination ; } -void MessageAck::setDestination(ActiveMQDestination destination) +void MessageAck::setDestination(p destination) { this->destination = destination ; } @@ -77,12 +77,12 @@ void MessageAck::setConsumerId(p consumerId) } -byte MessageAck::getAckType() +char MessageAck::getAckType() { return ackType ; } -void MessageAck::setAckType(byte ackType) +void MessageAck::setAckType(char ackType) { this->ackType = ackType ; } diff --git a/openwire-cpp/src/command/MessageAck.hpp b/openwire-cpp/src/command/MessageAck.hpp index 4a9b6620d0..7f9d1763a8 100755 --- a/openwire-cpp/src/command/MessageAck.hpp +++ b/openwire-cpp/src/command/MessageAck.hpp @@ -18,16 +18,15 @@ #define MessageAck_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -54,10 +54,10 @@ namespace apache class MessageAck : public BaseCommand { private: - ActiveMQDestination destination ; + p destination ; p transactionId ; p consumerId ; - byte ackType ; + char ackType ; p firstMessageId ; p lastMessageId ; int messageCount ; @@ -69,9 +69,10 @@ public: MessageAck() ; virtual ~MessageAck() ; + virtual int getCommandType() ; - virtual ActiveMQDestination getDestination() ; - virtual void setDestination(ActiveMQDestination destination) ; + virtual p getDestination() ; + virtual void setDestination(p destination) ; virtual p getTransactionId() ; virtual void setTransactionId(p transactionId) ; @@ -79,8 +80,8 @@ public: virtual p getConsumerId() ; virtual void setConsumerId(p consumerId) ; - virtual byte getAckType() ; - virtual void setAckType(byte ackType) ; + virtual char getAckType() ; + virtual void setAckType(char ackType) ; virtual p getFirstMessageId() ; virtual void setFirstMessageId(p firstMessageId) ; diff --git a/openwire-cpp/src/command/MessageDispatch.cpp b/openwire-cpp/src/command/MessageDispatch.cpp index 332f76e56b..857184fc4d 100644 --- a/openwire-cpp/src/command/MessageDispatch.cpp +++ b/openwire-cpp/src/command/MessageDispatch.cpp @@ -30,10 +30,10 @@ using namespace apache::activemq::client::command; */ 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 @@ void MessageDispatch::setConsumerId(p consumerId) } -ActiveMQDestination MessageDispatch::getDestination() +p MessageDispatch::getDestination() { return destination ; } -void MessageDispatch::setDestination(ActiveMQDestination destination) +void MessageDispatch::setDestination(p destination) { this->destination = destination ; } -Message MessageDispatch::getMessage() +p MessageDispatch::getMessage() { return message ; } -void MessageDispatch::setMessage(Message message) +void MessageDispatch::setMessage(p message) { this->message = message ; } diff --git a/openwire-cpp/src/command/MessageDispatch.hpp b/openwire-cpp/src/command/MessageDispatch.hpp index 4ab200a546..12b2ae2fe4 100644 --- a/openwire-cpp/src/command/MessageDispatch.hpp +++ b/openwire-cpp/src/command/MessageDispatch.hpp @@ -18,16 +18,13 @@ #define MessageDispatch_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,8 +53,8 @@ class MessageDispatch : public BaseCommand { private: p consumerId ; - ActiveMQDestination destination ; - Message message ; + p destination ; + p message ; int redeliveryCounter ; public: @@ -66,15 +64,16 @@ public: MessageDispatch() ; virtual ~MessageDispatch() ; + virtual int getCommandType() ; virtual p getConsumerId() ; virtual void setConsumerId(p consumerId) ; - virtual ActiveMQDestination getDestination() ; - virtual void setDestination(ActiveMQDestination destination) ; + virtual p getDestination() ; + virtual void setDestination(p destination) ; - virtual Message getMessage() ; - virtual void setMessage(Message message) ; + virtual p getMessage() ; + virtual void setMessage(p message) ; virtual int getRedeliveryCounter() ; virtual void setRedeliveryCounter(int redeliveryCounter) ; diff --git a/openwire-cpp/src/command/MessageDispatchNotification.cpp b/openwire-cpp/src/command/MessageDispatchNotification.cpp index 727157b85b..509c17b18d 100644 --- a/openwire-cpp/src/command/MessageDispatchNotification.cpp +++ b/openwire-cpp/src/command/MessageDispatchNotification.cpp @@ -30,10 +30,10 @@ using namespace apache::activemq::client::command; */ 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 @@ void MessageDispatchNotification::setConsumerId(p consumerId) } -ActiveMQDestination MessageDispatchNotification::getDestination() +p MessageDispatchNotification::getDestination() { return destination ; } -void MessageDispatchNotification::setDestination(ActiveMQDestination destination) +void MessageDispatchNotification::setDestination(p 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 ; } diff --git a/openwire-cpp/src/command/MessageDispatchNotification.hpp b/openwire-cpp/src/command/MessageDispatchNotification.hpp index d74d151520..68d3fd66bb 100644 --- a/openwire-cpp/src/command/MessageDispatchNotification.hpp +++ b/openwire-cpp/src/command/MessageDispatchNotification.hpp @@ -18,16 +18,13 @@ #define MessageDispatchNotification_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,8 +53,8 @@ class MessageDispatchNotification : public BaseCommand { private: p consumerId ; - ActiveMQDestination destination ; - long deliverySequenceId ; + p destination ; + long long deliverySequenceId ; p messageId ; public: @@ -66,15 +64,16 @@ public: MessageDispatchNotification() ; virtual ~MessageDispatchNotification() ; + virtual int getCommandType() ; virtual p getConsumerId() ; virtual void setConsumerId(p consumerId) ; - virtual ActiveMQDestination getDestination() ; - virtual void setDestination(ActiveMQDestination destination) ; + virtual p getDestination() ; + virtual void setDestination(p destination) ; - virtual long getDeliverySequenceId() ; - virtual void setDeliverySequenceId(long deliverySequenceId) ; + virtual long long getDeliverySequenceId() ; + virtual void setDeliverySequenceId(long long deliverySequenceId) ; virtual p getMessageId() ; virtual void setMessageId(p messageId) ; diff --git a/openwire-cpp/src/command/MessageId.cpp b/openwire-cpp/src/command/MessageId.cpp index f3ee9e342e..5f347b23d9 100644 --- a/openwire-cpp/src/command/MessageId.cpp +++ b/openwire-cpp/src/command/MessageId.cpp @@ -30,9 +30,9 @@ using namespace apache::activemq::client::command; */ 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 @@ void MessageId::setProducerId(p producerId) } -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 ; } diff --git a/openwire-cpp/src/command/MessageId.hpp b/openwire-cpp/src/command/MessageId.hpp index 98613e427d..9bc119d8a9 100644 --- a/openwire-cpp/src/command/MessageId.hpp +++ b/openwire-cpp/src/command/MessageId.hpp @@ -18,16 +18,11 @@ #define MessageId_hpp_ #include - -/* 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/ProducerId.hpp" + +#include "util/ifr/ap" #include "util/ifr/p" namespace apache @@ -39,6 +34,7 @@ namespace apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,8 +51,8 @@ class MessageId : public AbstractCommand { private: p producerId ; - long producerSequenceId ; - long brokerSequenceId ; + long long producerSequenceId ; + long long brokerSequenceId ; public: const static int TYPE = 110; @@ -65,15 +61,16 @@ public: MessageId() ; virtual ~MessageId() ; + virtual int getCommandType() ; virtual p getProducerId() ; virtual void setProducerId(p producerId) ; - virtual long getProducerSequenceId() ; - virtual void setProducerSequenceId(long producerSequenceId) ; + virtual long long getProducerSequenceId() ; + virtual void setProducerSequenceId(long long producerSequenceId) ; - virtual long getBrokerSequenceId() ; - virtual void setBrokerSequenceId(long brokerSequenceId) ; + virtual long long getBrokerSequenceId() ; + virtual void setBrokerSequenceId(long long brokerSequenceId) ; } ; diff --git a/openwire-cpp/src/command/ProducerId.cpp b/openwire-cpp/src/command/ProducerId.cpp index 5e09d2b91f..aa41198f3f 100755 --- a/openwire-cpp/src/command/ProducerId.cpp +++ b/openwire-cpp/src/command/ProducerId.cpp @@ -30,9 +30,9 @@ using namespace apache::activemq::client::command; */ ProducerId::ProducerId() { - this->connectionId = NULL ; - this->value = NULL ; - this->sessionId = NULL ; + this->connectionId = 0 ; + this->value = 0 ; + this->sessionId = 0 ; } ProducerId::~ProducerId() @@ -51,23 +51,23 @@ void ProducerId::setConnectionId(p connectionId) } -long ProducerId::getValue() +long long ProducerId::getValue() { return value ; } -void ProducerId::setValue(long value) +void ProducerId::setValue(long long value) { this->value = value ; } -long ProducerId::getSessionId() +long long ProducerId::getSessionId() { return sessionId ; } -void ProducerId::setSessionId(long sessionId) +void ProducerId::setSessionId(long long sessionId) { this->sessionId = sessionId ; } diff --git a/openwire-cpp/src/command/ProducerId.hpp b/openwire-cpp/src/command/ProducerId.hpp index 5959abefd1..d8ba70237e 100755 --- a/openwire-cpp/src/command/ProducerId.hpp +++ b/openwire-cpp/src/command/ProducerId.hpp @@ -18,16 +18,10 @@ #define ProducerId_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,8 +50,8 @@ class ProducerId : public AbstractCommand { private: p connectionId ; - long value ; - long sessionId ; + long long value ; + long long sessionId ; public: const static int TYPE = 123; @@ -65,15 +60,16 @@ public: ProducerId() ; virtual ~ProducerId() ; + virtual int getCommandType() ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; - virtual long getValue() ; - virtual void setValue(long value) ; + virtual long long getValue() ; + virtual void setValue(long long value) ; - virtual long getSessionId() ; - virtual void setSessionId(long sessionId) ; + virtual long long getSessionId() ; + virtual void setSessionId(long long sessionId) ; } ; diff --git a/openwire-cpp/src/command/ProducerInfo.cpp b/openwire-cpp/src/command/ProducerInfo.cpp index 4eb40904a8..4af05f04b2 100755 --- a/openwire-cpp/src/command/ProducerInfo.cpp +++ b/openwire-cpp/src/command/ProducerInfo.cpp @@ -30,9 +30,9 @@ using namespace apache::activemq::client::command; */ ProducerInfo::ProducerInfo() { - this->producerId = NULL ; - this->destination = NULL ; - this->brokerPath = NULL ; + this->producerId = 0 ; + this->destination = 0 ; + this->brokerPath = 0 ; } ProducerInfo::~ProducerInfo() @@ -51,23 +51,23 @@ void ProducerInfo::setProducerId(p producerId) } -ActiveMQDestination ProducerInfo::getDestination() +p ProducerInfo::getDestination() { return destination ; } -void ProducerInfo::setDestination(ActiveMQDestination destination) +void ProducerInfo::setDestination(p destination) { this->destination = destination ; } -BrokerId[] ProducerInfo::getBrokerPath() +ap ProducerInfo::getBrokerPath() { return brokerPath ; } -void ProducerInfo::setBrokerPath(BrokerId[] brokerPath) +void ProducerInfo::setBrokerPath(ap brokerPath) { this->brokerPath = brokerPath ; } diff --git a/openwire-cpp/src/command/ProducerInfo.hpp b/openwire-cpp/src/command/ProducerInfo.hpp index f79429f6f1..b40ea34cd4 100755 --- a/openwire-cpp/src/command/ProducerInfo.hpp +++ b/openwire-cpp/src/command/ProducerInfo.hpp @@ -18,16 +18,13 @@ #define ProducerInfo_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,8 +53,8 @@ class ProducerInfo : public BaseCommand { private: p producerId ; - ActiveMQDestination destination ; - BrokerId[] brokerPath ; + p destination ; + ap brokerPath ; public: const static int TYPE = 6; @@ -65,15 +63,16 @@ public: ProducerInfo() ; virtual ~ProducerInfo() ; + virtual int getCommandType() ; virtual p getProducerId() ; virtual void setProducerId(p producerId) ; - virtual ActiveMQDestination getDestination() ; - virtual void setDestination(ActiveMQDestination destination) ; + virtual p getDestination() ; + virtual void setDestination(p destination) ; - virtual BrokerId[] getBrokerPath() ; - virtual void setBrokerPath(BrokerId[] brokerPath) ; + virtual ap getBrokerPath() ; + virtual void setBrokerPath(ap brokerPath) ; } ; diff --git a/openwire-cpp/src/command/RemoveInfo.cpp b/openwire-cpp/src/command/RemoveInfo.cpp index 1c3d6a96b5..bef9162e56 100755 --- a/openwire-cpp/src/command/RemoveInfo.cpp +++ b/openwire-cpp/src/command/RemoveInfo.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ RemoveInfo::RemoveInfo() { - this->objectId = NULL ; + this->objectId = 0 ; } RemoveInfo::~RemoveInfo() @@ -38,12 +38,12 @@ RemoveInfo::~RemoveInfo() } -DataStructure RemoveInfo::getObjectId() +p RemoveInfo::getObjectId() { return objectId ; } -void RemoveInfo::setObjectId(DataStructure objectId) +void RemoveInfo::setObjectId(p objectId) { this->objectId = objectId ; } diff --git a/openwire-cpp/src/command/RemoveInfo.hpp b/openwire-cpp/src/command/RemoveInfo.hpp index 2e72135e2d..ef33798d02 100755 --- a/openwire-cpp/src/command/RemoveInfo.hpp +++ b/openwire-cpp/src/command/RemoveInfo.hpp @@ -18,16 +18,11 @@ #define RemoveInfo_hpp_ #include - -/* 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/IDataStructure.hpp" -#include "command/BaseCommand.hpp" +#include "util/ifr/ap" #include "util/ifr/p" namespace apache @@ -39,6 +34,7 @@ namespace apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -54,7 +50,7 @@ namespace apache class RemoveInfo : public BaseCommand { private: - DataStructure objectId ; + p objectId ; public: const static int TYPE = 12; @@ -63,9 +59,10 @@ public: RemoveInfo() ; virtual ~RemoveInfo() ; + virtual int getCommandType() ; - virtual DataStructure getObjectId() ; - virtual void setObjectId(DataStructure objectId) ; + virtual p getObjectId() ; + virtual void setObjectId(p objectId) ; } ; diff --git a/openwire-cpp/src/command/RemoveSubscriptionInfo.cpp b/openwire-cpp/src/command/RemoveSubscriptionInfo.cpp index 496cfa0de6..5a37a1a871 100644 --- a/openwire-cpp/src/command/RemoveSubscriptionInfo.cpp +++ b/openwire-cpp/src/command/RemoveSubscriptionInfo.cpp @@ -30,9 +30,9 @@ using namespace apache::activemq::client::command; */ RemoveSubscriptionInfo::RemoveSubscriptionInfo() { - this->connectionId = NULL ; - this->subcriptionName = NULL ; - this->clientId = NULL ; + this->connectionId = 0 ; + this->subcriptionName = 0 ; + this->clientId = 0 ; } RemoveSubscriptionInfo::~RemoveSubscriptionInfo() diff --git a/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp b/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp index d88d1bccef..69b37c8b73 100644 --- a/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp +++ b/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp @@ -18,16 +18,11 @@ #define RemoveSubscriptionInfo_hpp_ #include - -/* 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 +34,7 @@ namespace apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -65,6 +61,7 @@ public: RemoveSubscriptionInfo() ; virtual ~RemoveSubscriptionInfo() ; + virtual int getCommandType() ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; diff --git a/openwire-cpp/src/command/Response.cpp b/openwire-cpp/src/command/Response.cpp index e57967a388..eaad033af5 100755 --- a/openwire-cpp/src/command/Response.cpp +++ b/openwire-cpp/src/command/Response.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ Response::Response() { - this->correlationId = NULL ; + this->correlationId = 0 ; } Response::~Response() diff --git a/openwire-cpp/src/command/Response.hpp b/openwire-cpp/src/command/Response.hpp index 3eb3211927..671ea51c66 100755 --- a/openwire-cpp/src/command/Response.hpp +++ b/openwire-cpp/src/command/Response.hpp @@ -18,16 +18,10 @@ #define Response_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -63,6 +58,7 @@ public: Response() ; virtual ~Response() ; + virtual int getCommandType() ; virtual short getCorrelationId() ; virtual void setCorrelationId(short correlationId) ; diff --git a/openwire-cpp/src/command/SessionId.cpp b/openwire-cpp/src/command/SessionId.cpp index df71561c27..f5b0b18b79 100755 --- a/openwire-cpp/src/command/SessionId.cpp +++ b/openwire-cpp/src/command/SessionId.cpp @@ -30,8 +30,8 @@ using namespace apache::activemq::client::command; */ SessionId::SessionId() { - this->connectionId = NULL ; - this->value = NULL ; + this->connectionId = 0 ; + this->value = 0 ; } SessionId::~SessionId() @@ -50,12 +50,12 @@ void SessionId::setConnectionId(p connectionId) } -long SessionId::getValue() +long long SessionId::getValue() { return value ; } -void SessionId::setValue(long value) +void SessionId::setValue(long long value) { this->value = value ; } diff --git a/openwire-cpp/src/command/SessionId.hpp b/openwire-cpp/src/command/SessionId.hpp index 3737c53f5f..b61f5ad8f2 100755 --- a/openwire-cpp/src/command/SessionId.hpp +++ b/openwire-cpp/src/command/SessionId.hpp @@ -18,16 +18,10 @@ #define SessionId_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,7 +50,7 @@ class SessionId : public AbstractCommand { private: p connectionId ; - long value ; + long long value ; public: const static int TYPE = 121; @@ -64,12 +59,13 @@ public: SessionId() ; virtual ~SessionId() ; + virtual int getCommandType() ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; - virtual long getValue() ; - virtual void setValue(long value) ; + virtual long long getValue() ; + virtual void setValue(long long value) ; } ; diff --git a/openwire-cpp/src/command/SessionInfo.cpp b/openwire-cpp/src/command/SessionInfo.cpp index 84fca0dd4a..31d23d90cc 100755 --- a/openwire-cpp/src/command/SessionInfo.cpp +++ b/openwire-cpp/src/command/SessionInfo.cpp @@ -30,7 +30,7 @@ using namespace apache::activemq::client::command; */ SessionInfo::SessionInfo() { - this->sessionId = NULL ; + this->sessionId = 0 ; } SessionInfo::~SessionInfo() diff --git a/openwire-cpp/src/command/SessionInfo.hpp b/openwire-cpp/src/command/SessionInfo.hpp index 5a891ea994..47814af4ed 100755 --- a/openwire-cpp/src/command/SessionInfo.hpp +++ b/openwire-cpp/src/command/SessionInfo.hpp @@ -18,16 +18,11 @@ #define SessionInfo_hpp_ #include - -/* 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 +34,7 @@ namespace apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -63,6 +59,7 @@ public: SessionInfo() ; virtual ~SessionInfo() ; + virtual int getCommandType() ; virtual p getSessionId() ; virtual void setSessionId(p sessionId) ; diff --git a/openwire-cpp/src/command/ShutdownInfo.hpp b/openwire-cpp/src/command/ShutdownInfo.hpp index be9a388672..c71d5ba3a6 100644 --- a/openwire-cpp/src/command/ShutdownInfo.hpp +++ b/openwire-cpp/src/command/ShutdownInfo.hpp @@ -18,16 +18,10 @@ #define ShutdownInfo_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -62,6 +57,7 @@ public: ShutdownInfo() ; virtual ~ShutdownInfo() ; + virtual int getCommandType() ; } ; diff --git a/openwire-cpp/src/command/SubscriptionInfo.cpp b/openwire-cpp/src/command/SubscriptionInfo.cpp index e4a739588b..da33feceb6 100644 --- a/openwire-cpp/src/command/SubscriptionInfo.cpp +++ b/openwire-cpp/src/command/SubscriptionInfo.cpp @@ -30,10 +30,10 @@ using namespace apache::activemq::client::command; */ SubscriptionInfo::SubscriptionInfo() { - this->clientId = NULL ; - this->destination = NULL ; - this->selector = NULL ; - this->subcriptionName = NULL ; + this->clientId = 0 ; + this->destination = 0 ; + this->selector = 0 ; + this->subcriptionName = 0 ; } SubscriptionInfo::~SubscriptionInfo() @@ -52,12 +52,12 @@ void SubscriptionInfo::setClientId(p clientId) } -ActiveMQDestination SubscriptionInfo::getDestination() +p SubscriptionInfo::getDestination() { return destination ; } -void SubscriptionInfo::setDestination(ActiveMQDestination destination) +void SubscriptionInfo::setDestination(p destination) { this->destination = destination ; } diff --git a/openwire-cpp/src/command/SubscriptionInfo.hpp b/openwire-cpp/src/command/SubscriptionInfo.hpp index 626e2dd729..f93e3542cd 100644 --- a/openwire-cpp/src/command/SubscriptionInfo.hpp +++ b/openwire-cpp/src/command/SubscriptionInfo.hpp @@ -18,16 +18,11 @@ #define SubscriptionInfo_hpp_ #include - -/* 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 "util/ifr/ap" #include "util/ifr/p" namespace apache @@ -39,6 +34,7 @@ namespace apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,7 +51,7 @@ class SubscriptionInfo : public AbstractCommand { private: p clientId ; - ActiveMQDestination destination ; + p destination ; p selector ; p subcriptionName ; @@ -66,12 +62,13 @@ public: SubscriptionInfo() ; virtual ~SubscriptionInfo() ; + virtual int getCommandType() ; virtual p getClientId() ; virtual void setClientId(p clientId) ; - virtual ActiveMQDestination getDestination() ; - virtual void setDestination(ActiveMQDestination destination) ; + virtual p getDestination() ; + virtual void setDestination(p destination) ; virtual p getSelector() ; virtual void setSelector(p selector) ; diff --git a/openwire-cpp/src/command/TransactionId.hpp b/openwire-cpp/src/command/TransactionId.hpp index 2c84ea50f2..520c6b044a 100644 --- a/openwire-cpp/src/command/TransactionId.hpp +++ b/openwire-cpp/src/command/TransactionId.hpp @@ -18,16 +18,10 @@ #define TransactionId_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -62,6 +57,7 @@ public: TransactionId() ; virtual ~TransactionId() ; + virtual int getCommandType() ; } ; diff --git a/openwire-cpp/src/command/TransactionInfo.cpp b/openwire-cpp/src/command/TransactionInfo.cpp index 80dc60736d..98cba0af72 100644 --- a/openwire-cpp/src/command/TransactionInfo.cpp +++ b/openwire-cpp/src/command/TransactionInfo.cpp @@ -30,9 +30,9 @@ using namespace apache::activemq::client::command; */ TransactionInfo::TransactionInfo() { - this->connectionId = NULL ; - this->transactionId = NULL ; - this->type = NULL ; + this->connectionId = 0 ; + this->transactionId = 0 ; + this->type = 0 ; } TransactionInfo::~TransactionInfo() @@ -62,12 +62,12 @@ void TransactionInfo::setTransactionId(p transactionId) } -byte TransactionInfo::getType() +char TransactionInfo::getType() { return type ; } -void TransactionInfo::setType(byte type) +void TransactionInfo::setType(char type) { this->type = type ; } diff --git a/openwire-cpp/src/command/TransactionInfo.hpp b/openwire-cpp/src/command/TransactionInfo.hpp index 4314c106ff..d59f3f45a8 100644 --- a/openwire-cpp/src/command/TransactionInfo.hpp +++ b/openwire-cpp/src/command/TransactionInfo.hpp @@ -18,16 +18,12 @@ #define TransactionInfo_hpp_ #include - -/* 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/TransactionId.hpp" -#include "command/BaseCommand.hpp" +#include "util/ifr/ap" #include "util/ifr/p" namespace apache @@ -39,6 +35,7 @@ namespace apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -56,7 +53,7 @@ class TransactionInfo : public BaseCommand private: p connectionId ; p transactionId ; - byte type ; + char type ; public: const static int TYPE = 7; @@ -65,6 +62,7 @@ public: TransactionInfo() ; virtual ~TransactionInfo() ; + virtual int getCommandType() ; virtual p getConnectionId() ; virtual void setConnectionId(p connectionId) ; @@ -72,8 +70,8 @@ public: virtual p getTransactionId() ; virtual void setTransactionId(p transactionId) ; - virtual byte getType() ; - virtual void setType(byte type) ; + virtual char getType() ; + virtual void setType(char type) ; } ; diff --git a/openwire-cpp/src/command/WireFormatInfo.cpp b/openwire-cpp/src/command/WireFormatInfo.cpp index 0835796ff8..db240b2400 100644 --- a/openwire-cpp/src/command/WireFormatInfo.cpp +++ b/openwire-cpp/src/command/WireFormatInfo.cpp @@ -30,13 +30,13 @@ using namespace apache::activemq::client::command; */ WireFormatInfo::WireFormatInfo() { - this->magic = NULL ; - this->version = NULL ; - this->cacheEnabled = NULL ; - this->stackTraceEnabled = NULL ; - this->tcpNoDelayEnabled = NULL ; - this->prefixPacketSize = NULL ; - this->tightEncodingEnabled = NULL ; + this->magic = 0 ; + this->version = 0 ; + this->cacheEnabled = 0 ; + this->stackTraceEnabled = 0 ; + this->tcpNoDelayEnabled = 0 ; + this->prefixPacketSize = 0 ; + this->tightEncodingEnabled = 0 ; } WireFormatInfo::~WireFormatInfo() @@ -44,12 +44,12 @@ WireFormatInfo::~WireFormatInfo() } -byte[] WireFormatInfo::getMagic() +ap WireFormatInfo::getMagic() { return magic ; } -void WireFormatInfo::setMagic(byte[] magic) +void WireFormatInfo::setMagic(ap magic) { this->magic = magic ; } diff --git a/openwire-cpp/src/command/WireFormatInfo.hpp b/openwire-cpp/src/command/WireFormatInfo.hpp index 07486fe88b..aad68eb333 100644 --- a/openwire-cpp/src/command/WireFormatInfo.hpp +++ b/openwire-cpp/src/command/WireFormatInfo.hpp @@ -18,16 +18,10 @@ #define WireFormatInfo_hpp_ #include - -/* 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 apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -54,7 +49,7 @@ namespace apache class WireFormatInfo : public AbstractCommand { private: - byte[] magic ; + ap magic ; int version ; bool cacheEnabled ; bool stackTraceEnabled ; @@ -69,9 +64,10 @@ public: WireFormatInfo() ; virtual ~WireFormatInfo() ; + virtual int getCommandType() ; - virtual byte[] getMagic() ; - virtual void setMagic(byte[] magic) ; + virtual ap getMagic() ; + virtual void setMagic(ap magic) ; virtual int getVersion() ; virtual void setVersion(int version) ; diff --git a/openwire-cpp/src/command/XATransactionId.cpp b/openwire-cpp/src/command/XATransactionId.cpp index 3039af3400..c596731cb3 100644 --- a/openwire-cpp/src/command/XATransactionId.cpp +++ b/openwire-cpp/src/command/XATransactionId.cpp @@ -30,9 +30,9 @@ using namespace apache::activemq::client::command; */ XATransactionId::XATransactionId() { - this->formatId = NULL ; - this->globalTransactionId = NULL ; - this->branchQualifier = NULL ; + this->formatId = 0 ; + this->globalTransactionId = 0 ; + this->branchQualifier = 0 ; } XATransactionId::~XATransactionId() @@ -51,23 +51,23 @@ void XATransactionId::setFormatId(int formatId) } -byte[] XATransactionId::getGlobalTransactionId() +ap XATransactionId::getGlobalTransactionId() { return globalTransactionId ; } -void XATransactionId::setGlobalTransactionId(byte[] globalTransactionId) +void XATransactionId::setGlobalTransactionId(ap globalTransactionId) { this->globalTransactionId = globalTransactionId ; } -byte[] XATransactionId::getBranchQualifier() +ap XATransactionId::getBranchQualifier() { return branchQualifier ; } -void XATransactionId::setBranchQualifier(byte[] branchQualifier) +void XATransactionId::setBranchQualifier(ap branchQualifier) { this->branchQualifier = branchQualifier ; } diff --git a/openwire-cpp/src/command/XATransactionId.hpp b/openwire-cpp/src/command/XATransactionId.hpp index 2d3e34fb1d..2b30f6ac98 100644 --- a/openwire-cpp/src/command/XATransactionId.hpp +++ b/openwire-cpp/src/command/XATransactionId.hpp @@ -18,16 +18,10 @@ #define XATransactionId_hpp_ #include - -/* 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/TransactionId.hpp" + + +#include "util/ifr/ap" #include "util/ifr/p" namespace apache @@ -39,6 +33,7 @@ namespace apache namespace command { using namespace ifr; + using namespace std; using namespace apache::activemq::client; /* @@ -55,8 +50,8 @@ class XATransactionId : public TransactionId { private: int formatId ; - byte[] globalTransactionId ; - byte[] branchQualifier ; + ap globalTransactionId ; + ap branchQualifier ; public: const static int TYPE = 112; @@ -65,15 +60,16 @@ public: XATransactionId() ; virtual ~XATransactionId() ; + virtual int getCommandType() ; virtual int getFormatId() ; virtual void setFormatId(int formatId) ; - virtual byte[] getGlobalTransactionId() ; - virtual void setGlobalTransactionId(byte[] globalTransactionId) ; + virtual ap getGlobalTransactionId() ; + virtual void setGlobalTransactionId(ap globalTransactionId) ; - virtual byte[] getBranchQualifier() ; - virtual void setBranchQualifier(byte[] branchQualifier) ; + virtual ap getBranchQualifier() ; + virtual void setBranchQualifier(ap branchQualifier) ; } ;