Author: tabish Date: Mon Nov 13 15:54:35 2006 New Revision: 474588 URL: http://svn.apache.org/viewvc?view=rev&rev=474588 Log: Updates for planned Openwire Support
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BooleanExpression.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DataArrayResponse.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.h Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp Mon Nov 13 15:54:35 2006 @@ -71,7 +71,7 @@ } //////////////////////////////////////////////////////////////////////////////// -void ActiveMQDestination::setPhysicalName( const std::string& physicalName ) { - this->physicalName = physicalName; -} +//void ActiveMQDestination::setPhysicalName( const std::string& physicalName ) { +// this->physicalName = physicalName; +//} Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BooleanExpression.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BooleanExpression.h?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BooleanExpression.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BooleanExpression.h Mon Nov 13 15:54:35 2006 @@ -18,17 +18,33 @@ #ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_BOOLEANEXPRESSION_H_ #define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_BOOLEANEXPRESSION_H_ +#include <activemq/connector/openwire/commands/BaseDataStructure.h> + namespace activemq{ namespace connector{ namespace openwire{ namespace commands{ - class BooleanExpression + class BooleanExpression : public BaseDataStructure { public: BooleanExpression() {} virtual ~BooleanExpression() {} + + /** + * Clone this obbject and return a new instance that the + * caller now owns, this will be an exact copy of this one + * @returns new copy of this object. + */ + virtual DataStructure* cloneDataStructure() const { return NULL; } + + /** + * Copy the contents of the passed object into this objects + * members, overwriting any existing data. + * @return src - Source Object + */ + virtual void copyDataStructure( const DataStructure* src ) {} }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp Mon Nov 13 15:54:35 2006 @@ -87,14 +87,15 @@ this->setBrokerURL( srcPtr->getBrokerURL() ); for( size_t ipeerBrokerInfos = 0; ipeerBrokerInfos < srcPtr->getPeerBrokerInfos().size(); ++ipeerBrokerInfos ) { this->getPeerBrokerInfos().push_back( - srcPtr->getPeerBrokerInfos()[ipeerBrokerInfos]->cloneDataStructure() ); + dynamic_cast<BrokerInfo*>( + srcPtr->getPeerBrokerInfos()[ipeerBrokerInfos]->cloneDataStructure() ) ); } this->setBrokerName( srcPtr->getBrokerName() ); - this->setSlaveBroker( srcPtr->getSlaveBroker() ); - this->setMasterBroker( srcPtr->getMasterBroker() ); - this->setFaultTolerantConfiguration( srcPtr->getFaultTolerantConfiguration() ); - this->setDuplexConnection( srcPtr->getDuplexConnection() ); - this->setNetworkConnection( srcPtr->getNetworkConnection() ); + this->setSlaveBroker( srcPtr->isSlaveBroker() ); + this->setMasterBroker( srcPtr->isMasterBroker() ); + this->setFaultTolerantConfiguration( srcPtr->isFaultTolerantConfiguration() ); + this->setDuplexConnection( srcPtr->isDuplexConnection() ); + this->setNetworkConnection( srcPtr->isNetworkConnection() ); this->setConnectionId( srcPtr->getConnectionId() ); } @@ -164,12 +165,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool BrokerInfo::getSlaveBroker() const { +const bool BrokerInfo::isSlaveBroker() const { return slaveBroker; } //////////////////////////////////////////////////////////////////////////////// -bool BrokerInfo::getSlaveBroker() { +bool BrokerInfo::isSlaveBroker() { return slaveBroker; } @@ -179,12 +180,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool BrokerInfo::getMasterBroker() const { +const bool BrokerInfo::isMasterBroker() const { return masterBroker; } //////////////////////////////////////////////////////////////////////////////// -bool BrokerInfo::getMasterBroker() { +bool BrokerInfo::isMasterBroker() { return masterBroker; } @@ -194,12 +195,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool BrokerInfo::getFaultTolerantConfiguration() const { +const bool BrokerInfo::isFaultTolerantConfiguration() const { return faultTolerantConfiguration; } //////////////////////////////////////////////////////////////////////////////// -bool BrokerInfo::getFaultTolerantConfiguration() { +bool BrokerInfo::isFaultTolerantConfiguration() { return faultTolerantConfiguration; } @@ -209,12 +210,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool BrokerInfo::getDuplexConnection() const { +const bool BrokerInfo::isDuplexConnection() const { return duplexConnection; } //////////////////////////////////////////////////////////////////////////////// -bool BrokerInfo::getDuplexConnection() { +bool BrokerInfo::isDuplexConnection() { return duplexConnection; } @@ -224,12 +225,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool BrokerInfo::getNetworkConnection() const { +const bool BrokerInfo::isNetworkConnection() const { return networkConnection; } //////////////////////////////////////////////////////////////////////////////// -bool BrokerInfo::getNetworkConnection() { +bool BrokerInfo::isNetworkConnection() { return networkConnection; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.h?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BrokerInfo.h Mon Nov 13 15:54:35 2006 @@ -105,24 +105,24 @@ virtual std::string& getBrokerName(); virtual void setBrokerName( const std::string& brokerName ); - virtual const bool getSlaveBroker() const; - virtual bool getSlaveBroker(); + virtual const bool isSlaveBroker() const; + virtual bool isSlaveBroker(); virtual void setSlaveBroker( bool slaveBroker ); - virtual const bool getMasterBroker() const; - virtual bool getMasterBroker(); + virtual const bool isMasterBroker() const; + virtual bool isMasterBroker(); virtual void setMasterBroker( bool masterBroker ); - virtual const bool getFaultTolerantConfiguration() const; - virtual bool getFaultTolerantConfiguration(); + virtual const bool isFaultTolerantConfiguration() const; + virtual bool isFaultTolerantConfiguration(); virtual void setFaultTolerantConfiguration( bool faultTolerantConfiguration ); - virtual const bool getDuplexConnection() const; - virtual bool getDuplexConnection(); + virtual const bool isDuplexConnection() const; + virtual bool isDuplexConnection(); virtual void setDuplexConnection( bool duplexConnection ); - virtual const bool getNetworkConnection() const; - virtual bool getNetworkConnection(); + virtual const bool isNetworkConnection() const; + virtual bool isNetworkConnection(); virtual void setNetworkConnection( bool networkConnection ); virtual const long long getConnectionId() const; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp Mon Nov 13 15:54:35 2006 @@ -73,11 +73,11 @@ __FILE__, __LINE__, "ConnectionControl::copyDataStructure - src is NULL or invalid" ); } - this->setClose( srcPtr->getClose() ); - this->setExit( srcPtr->getExit() ); - this->setFaultTolerant( srcPtr->getFaultTolerant() ); - this->setResume( srcPtr->getResume() ); - this->setSuspend( srcPtr->getSuspend() ); + this->setClose( srcPtr->isClose() ); + this->setExit( srcPtr->isExit() ); + this->setFaultTolerant( srcPtr->isFaultTolerant() ); + this->setResume( srcPtr->isResume() ); + this->setSuspend( srcPtr->isSuspend() ); } //////////////////////////////////////////////////////////////////////////////// @@ -86,12 +86,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConnectionControl::getClose() const { +const bool ConnectionControl::isClose() const { return close; } //////////////////////////////////////////////////////////////////////////////// -bool ConnectionControl::getClose() { +bool ConnectionControl::isClose() { return close; } @@ -101,12 +101,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConnectionControl::getExit() const { +const bool ConnectionControl::isExit() const { return exit; } //////////////////////////////////////////////////////////////////////////////// -bool ConnectionControl::getExit() { +bool ConnectionControl::isExit() { return exit; } @@ -116,12 +116,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConnectionControl::getFaultTolerant() const { +const bool ConnectionControl::isFaultTolerant() const { return faultTolerant; } //////////////////////////////////////////////////////////////////////////////// -bool ConnectionControl::getFaultTolerant() { +bool ConnectionControl::isFaultTolerant() { return faultTolerant; } @@ -131,12 +131,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConnectionControl::getResume() const { +const bool ConnectionControl::isResume() const { return resume; } //////////////////////////////////////////////////////////////////////////////// -bool ConnectionControl::getResume() { +bool ConnectionControl::isResume() { return resume; } @@ -146,12 +146,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConnectionControl::getSuspend() const { +const bool ConnectionControl::isSuspend() const { return suspend; } //////////////////////////////////////////////////////////////////////////////// -bool ConnectionControl::getSuspend() { +bool ConnectionControl::isSuspend() { return suspend; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.h?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionControl.h Mon Nov 13 15:54:35 2006 @@ -82,24 +82,24 @@ */ virtual void copyDataStructure( const DataStructure* src ); - virtual const bool getClose() const; - virtual bool getClose(); + virtual const bool isClose() const; + virtual bool isClose(); virtual void setClose( bool close ); - virtual const bool getExit() const; - virtual bool getExit(); + virtual const bool isExit() const; + virtual bool isExit(); virtual void setExit( bool exit ); - virtual const bool getFaultTolerant() const; - virtual bool getFaultTolerant(); + virtual const bool isFaultTolerant() const; + virtual bool isFaultTolerant(); virtual void setFaultTolerant( bool faultTolerant ); - virtual const bool getResume() const; - virtual bool getResume(); + virtual const bool isResume() const; + virtual bool isResume(); virtual void setResume( bool resume ); - virtual const bool getSuspend() const; - virtual bool getSuspend(); + virtual const bool isSuspend() const; + virtual bool isSuspend(); virtual void setSuspend( bool suspend ); }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp Mon Nov 13 15:54:35 2006 @@ -87,11 +87,12 @@ this->setUserName( srcPtr->getUserName() ); for( size_t ibrokerPath = 0; ibrokerPath < srcPtr->getBrokerPath().size(); ++ibrokerPath ) { this->getBrokerPath().push_back( - srcPtr->getBrokerPath()[ibrokerPath]->cloneDataStructure() ); + dynamic_cast<BrokerId*>( + srcPtr->getBrokerPath()[ibrokerPath]->cloneDataStructure() ) ); } - this->setBrokerMasterConnector( srcPtr->getBrokerMasterConnector() ); - this->setManageable( srcPtr->getManageable() ); - this->setClientMaster( srcPtr->getClientMaster() ); + this->setBrokerMasterConnector( srcPtr->isBrokerMasterConnector() ); + this->setManageable( srcPtr->isManageable() ); + this->setClientMaster( srcPtr->isClientMaster() ); } //////////////////////////////////////////////////////////////////////////////// @@ -175,12 +176,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConnectionInfo::getBrokerMasterConnector() const { +const bool ConnectionInfo::isBrokerMasterConnector() const { return brokerMasterConnector; } //////////////////////////////////////////////////////////////////////////////// -bool ConnectionInfo::getBrokerMasterConnector() { +bool ConnectionInfo::isBrokerMasterConnector() { return brokerMasterConnector; } @@ -190,12 +191,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConnectionInfo::getManageable() const { +const bool ConnectionInfo::isManageable() const { return manageable; } //////////////////////////////////////////////////////////////////////////////// -bool ConnectionInfo::getManageable() { +bool ConnectionInfo::isManageable() { return manageable; } @@ -205,12 +206,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConnectionInfo::getClientMaster() const { +const bool ConnectionInfo::isClientMaster() const { return clientMaster; } //////////////////////////////////////////////////////////////////////////////// -bool ConnectionInfo::getClientMaster() { +bool ConnectionInfo::isClientMaster() { return clientMaster; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.h?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConnectionInfo.h Mon Nov 13 15:54:35 2006 @@ -107,16 +107,16 @@ virtual std::vector<BrokerId*> getBrokerPath(); virtual void setBrokerPath( std::vector<BrokerId*> brokerPath ); - virtual const bool getBrokerMasterConnector() const; - virtual bool getBrokerMasterConnector(); + virtual const bool isBrokerMasterConnector() const; + virtual bool isBrokerMasterConnector(); virtual void setBrokerMasterConnector( bool brokerMasterConnector ); - virtual const bool getManageable() const; - virtual bool getManageable(); + virtual const bool isManageable() const; + virtual bool isManageable(); virtual void setManageable( bool manageable ); - virtual const bool getClientMaster() const; - virtual bool getClientMaster(); + virtual const bool isClientMaster() const; + virtual bool isClientMaster(); virtual void setClientMaster( bool clientMaster ); }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp Mon Nov 13 15:54:35 2006 @@ -75,14 +75,14 @@ __FILE__, __LINE__, "ConsumerControl::copyDataStructure - src is NULL or invalid" ); } - this->setClose( srcPtr->getClose() ); + this->setClose( srcPtr->isClose() ); this->setConsumerId( dynamic_cast<ConsumerId*>( srcPtr->getConsumerId()->cloneDataStructure() ) ); this->setPrefetch( srcPtr->getPrefetch() ); - this->setFlush( srcPtr->getFlush() ); - this->setStart( srcPtr->getStart() ); - this->setStop( srcPtr->getStop() ); + this->setFlush( srcPtr->isFlush() ); + this->setStart( srcPtr->isStart() ); + this->setStop( srcPtr->isStop() ); } //////////////////////////////////////////////////////////////////////////////// @@ -91,12 +91,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerControl::getClose() const { +const bool ConsumerControl::isClose() const { return close; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerControl::getClose() { +bool ConsumerControl::isClose() { return close; } @@ -136,12 +136,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerControl::getFlush() const { +const bool ConsumerControl::isFlush() const { return flush; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerControl::getFlush() { +bool ConsumerControl::isFlush() { return flush; } @@ -151,12 +151,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerControl::getStart() const { +const bool ConsumerControl::isStart() const { return start; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerControl::getStart() { +bool ConsumerControl::isStart() { return start; } @@ -166,12 +166,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerControl::getStop() const { +const bool ConsumerControl::isStop() const { return stop; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerControl::getStop() { +bool ConsumerControl::isStop() { return stop; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.h?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerControl.h Mon Nov 13 15:54:35 2006 @@ -84,8 +84,8 @@ */ virtual void copyDataStructure( const DataStructure* src ); - virtual const bool getClose() const; - virtual bool getClose(); + virtual const bool isClose() const; + virtual bool isClose(); virtual void setClose( bool close ); virtual const ConsumerId* getConsumerId() const; @@ -96,16 +96,16 @@ virtual int getPrefetch(); virtual void setPrefetch( int prefetch ); - virtual const bool getFlush() const; - virtual bool getFlush(); + virtual const bool isFlush() const; + virtual bool isFlush(); virtual void setFlush( bool flush ); - virtual const bool getStart() const; - virtual bool getStart(); + virtual const bool isStart() const; + virtual bool isStart(); virtual void setStart( bool start ); - virtual const bool getStop() const; - virtual bool getStop(); + virtual const bool isStop() const; + virtual bool isStop(); virtual void setStop( bool stop ); }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp Mon Nov 13 15:54:35 2006 @@ -93,29 +93,30 @@ this->setConsumerId( dynamic_cast<ConsumerId*>( srcPtr->getConsumerId()->cloneDataStructure() ) ); - this->setBrowser( srcPtr->getBrowser() ); + this->setBrowser( srcPtr->isBrowser() ); this->setDestination( dynamic_cast<ActiveMQDestination*>( srcPtr->getDestination()->cloneDataStructure() ) ); this->setPrefetchSize( srcPtr->getPrefetchSize() ); this->setMaximumPendingMessageLimit( srcPtr->getMaximumPendingMessageLimit() ); - this->setDispatchAsync( srcPtr->getDispatchAsync() ); + this->setDispatchAsync( srcPtr->isDispatchAsync() ); this->setSelector( srcPtr->getSelector() ); this->setSubscriptionName( srcPtr->getSubscriptionName() ); - this->setNoLocal( srcPtr->getNoLocal() ); - this->setExclusive( srcPtr->getExclusive() ); - this->setRetroactive( srcPtr->getRetroactive() ); + this->setNoLocal( srcPtr->isNoLocal() ); + this->setExclusive( srcPtr->isExclusive() ); + this->setRetroactive( srcPtr->isRetroactive() ); this->setPriority( srcPtr->getPriority() ); for( size_t ibrokerPath = 0; ibrokerPath < srcPtr->getBrokerPath().size(); ++ibrokerPath ) { this->getBrokerPath().push_back( - srcPtr->getBrokerPath()[ibrokerPath]->cloneDataStructure() ); + dynamic_cast<BrokerId*>( + srcPtr->getBrokerPath()[ibrokerPath]->cloneDataStructure() ) ); } this->setAdditionalPredicate( dynamic_cast<BooleanExpression*>( srcPtr->getAdditionalPredicate()->cloneDataStructure() ) ); - this->setNetworkSubscription( srcPtr->getNetworkSubscription() ); - this->setOptimizedAcknowledge( srcPtr->getOptimizedAcknowledge() ); - this->setNoRangeAcks( srcPtr->getNoRangeAcks() ); + this->setNetworkSubscription( srcPtr->isNetworkSubscription() ); + this->setOptimizedAcknowledge( srcPtr->isOptimizedAcknowledge() ); + this->setNoRangeAcks( srcPtr->isNoRangeAcks() ); } //////////////////////////////////////////////////////////////////////////////// @@ -139,12 +140,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerInfo::getBrowser() const { +const bool ConsumerInfo::isBrowser() const { return browser; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerInfo::getBrowser() { +bool ConsumerInfo::isBrowser() { return browser; } @@ -199,12 +200,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerInfo::getDispatchAsync() const { +const bool ConsumerInfo::isDispatchAsync() const { return dispatchAsync; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerInfo::getDispatchAsync() { +bool ConsumerInfo::isDispatchAsync() { return dispatchAsync; } @@ -244,12 +245,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerInfo::getNoLocal() const { +const bool ConsumerInfo::isNoLocal() const { return noLocal; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerInfo::getNoLocal() { +bool ConsumerInfo::isNoLocal() { return noLocal; } @@ -259,12 +260,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerInfo::getExclusive() const { +const bool ConsumerInfo::isExclusive() const { return exclusive; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerInfo::getExclusive() { +bool ConsumerInfo::isExclusive() { return exclusive; } @@ -274,12 +275,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerInfo::getRetroactive() const { +const bool ConsumerInfo::isRetroactive() const { return retroactive; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerInfo::getRetroactive() { +bool ConsumerInfo::isRetroactive() { return retroactive; } @@ -334,12 +335,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerInfo::getNetworkSubscription() const { +const bool ConsumerInfo::isNetworkSubscription() const { return networkSubscription; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerInfo::getNetworkSubscription() { +bool ConsumerInfo::isNetworkSubscription() { return networkSubscription; } @@ -349,12 +350,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerInfo::getOptimizedAcknowledge() const { +const bool ConsumerInfo::isOptimizedAcknowledge() const { return optimizedAcknowledge; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerInfo::getOptimizedAcknowledge() { +bool ConsumerInfo::isOptimizedAcknowledge() { return optimizedAcknowledge; } @@ -364,12 +365,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ConsumerInfo::getNoRangeAcks() const { +const bool ConsumerInfo::isNoRangeAcks() const { return noRangeAcks; } //////////////////////////////////////////////////////////////////////////////// -bool ConsumerInfo::getNoRangeAcks() { +bool ConsumerInfo::isNoRangeAcks() { return noRangeAcks; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h Mon Nov 13 15:54:35 2006 @@ -102,8 +102,8 @@ virtual ConsumerId* getConsumerId(); virtual void setConsumerId( ConsumerId* consumerId ); - virtual const bool getBrowser() const; - virtual bool getBrowser(); + virtual const bool isBrowser() const; + virtual bool isBrowser(); virtual void setBrowser( bool browser ); virtual const ActiveMQDestination* getDestination() const; @@ -118,8 +118,8 @@ virtual int getMaximumPendingMessageLimit(); virtual void setMaximumPendingMessageLimit( int maximumPendingMessageLimit ); - virtual const bool getDispatchAsync() const; - virtual bool getDispatchAsync(); + virtual const bool isDispatchAsync() const; + virtual bool isDispatchAsync(); virtual void setDispatchAsync( bool dispatchAsync ); virtual const std::string& getSelector() const; @@ -130,16 +130,16 @@ virtual std::string& getSubscriptionName(); virtual void setSubscriptionName( const std::string& subscriptionName ); - virtual const bool getNoLocal() const; - virtual bool getNoLocal(); + virtual const bool isNoLocal() const; + virtual bool isNoLocal(); virtual void setNoLocal( bool noLocal ); - virtual const bool getExclusive() const; - virtual bool getExclusive(); + virtual const bool isExclusive() const; + virtual bool isExclusive(); virtual void setExclusive( bool exclusive ); - virtual const bool getRetroactive() const; - virtual bool getRetroactive(); + virtual const bool isRetroactive() const; + virtual bool isRetroactive(); virtual void setRetroactive( bool retroactive ); virtual const char getPriority() const; @@ -154,16 +154,16 @@ virtual BooleanExpression* getAdditionalPredicate(); virtual void setAdditionalPredicate( BooleanExpression* additionalPredicate ); - virtual const bool getNetworkSubscription() const; - virtual bool getNetworkSubscription(); + virtual const bool isNetworkSubscription() const; + virtual bool isNetworkSubscription(); virtual void setNetworkSubscription( bool networkSubscription ); - virtual const bool getOptimizedAcknowledge() const; - virtual bool getOptimizedAcknowledge(); + virtual const bool isOptimizedAcknowledge() const; + virtual bool isOptimizedAcknowledge(); virtual void setOptimizedAcknowledge( bool optimizedAcknowledge ); - virtual const bool getNoRangeAcks() const; - virtual bool getNoRangeAcks(); + virtual const bool isNoRangeAcks() const; + virtual bool isNoRangeAcks(); virtual void setNoRangeAcks( bool noRangeAcks ); }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DataArrayResponse.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DataArrayResponse.cpp?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DataArrayResponse.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DataArrayResponse.cpp Mon Nov 13 15:54:35 2006 @@ -73,7 +73,8 @@ } for( size_t idata = 0; idata < srcPtr->getData().size(); ++idata ) { this->getData().push_back( - srcPtr->getData()[idata]->cloneDataStructure() ); + dynamic_cast<DataStructure*>( + srcPtr->getData()[idata]->cloneDataStructure() ) ); } } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp Mon Nov 13 15:54:35 2006 @@ -87,7 +87,8 @@ this->setTimeout( srcPtr->getTimeout() ); for( size_t ibrokerPath = 0; ibrokerPath < srcPtr->getBrokerPath().size(); ++ibrokerPath ) { this->getBrokerPath().push_back( - srcPtr->getBrokerPath()[ibrokerPath]->cloneDataStructure() ); + dynamic_cast<BrokerId*>( + srcPtr->getBrokerPath()[ibrokerPath]->cloneDataStructure() ) ); } } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp Mon Nov 13 15:54:35 2006 @@ -124,7 +124,7 @@ this->setGroupID( srcPtr->getGroupID() ); this->setGroupSequence( srcPtr->getGroupSequence() ); this->setCorrelationId( srcPtr->getCorrelationId() ); - this->setPersistent( srcPtr->getPersistent() ); + this->setPersistent( srcPtr->isPersistent() ); this->setExpiration( srcPtr->getExpiration() ); this->setPriority( srcPtr->getPriority() ); this->setReplyTo( @@ -140,16 +140,17 @@ this->setTargetConsumerId( dynamic_cast<ConsumerId*>( srcPtr->getTargetConsumerId()->cloneDataStructure() ) ); - this->setCompressed( srcPtr->getCompressed() ); + this->setCompressed( srcPtr->isCompressed() ); this->setRedeliveryCounter( srcPtr->getRedeliveryCounter() ); for( size_t ibrokerPath = 0; ibrokerPath < srcPtr->getBrokerPath().size(); ++ibrokerPath ) { this->getBrokerPath().push_back( - srcPtr->getBrokerPath()[ibrokerPath]->cloneDataStructure() ); + dynamic_cast<BrokerId*>( + srcPtr->getBrokerPath()[ibrokerPath]->cloneDataStructure() ) ); } this->setArrival( srcPtr->getArrival() ); this->setUserID( srcPtr->getUserID() ); - this->setRecievedByDFBridge( srcPtr->getRecievedByDFBridge() ); - this->setDroppable( srcPtr->getDroppable() ); + this->setRecievedByDFBridge( srcPtr->isRecievedByDFBridge() ); + this->setDroppable( srcPtr->isDroppable() ); } //////////////////////////////////////////////////////////////////////////////// @@ -293,12 +294,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool Message::getPersistent() const { +const bool Message::isPersistent() const { return persistent; } //////////////////////////////////////////////////////////////////////////////// -bool Message::getPersistent() { +bool Message::isPersistent() { return persistent; } @@ -443,12 +444,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool Message::getCompressed() const { +const bool Message::isCompressed() const { return compressed; } //////////////////////////////////////////////////////////////////////////////// -bool Message::getCompressed() { +bool Message::isCompressed() { return compressed; } @@ -518,12 +519,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool Message::getRecievedByDFBridge() const { +const bool Message::isRecievedByDFBridge() const { return recievedByDFBridge; } //////////////////////////////////////////////////////////////////////////////// -bool Message::getRecievedByDFBridge() { +bool Message::isRecievedByDFBridge() { return recievedByDFBridge; } @@ -533,12 +534,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool Message::getDroppable() const { +const bool Message::isDroppable() const { return droppable; } //////////////////////////////////////////////////////////////////////////////// -bool Message::getDroppable() { +bool Message::isDroppable() { return droppable; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h Mon Nov 13 15:54:35 2006 @@ -149,8 +149,8 @@ virtual std::string& getCorrelationId(); virtual void setCorrelationId( const std::string& correlationId ); - virtual const bool getPersistent() const; - virtual bool getPersistent(); + virtual const bool isPersistent() const; + virtual bool isPersistent(); virtual void setPersistent( bool persistent ); virtual const long long getExpiration() const; @@ -189,8 +189,8 @@ virtual ConsumerId* getTargetConsumerId(); virtual void setTargetConsumerId( ConsumerId* targetConsumerId ); - virtual const bool getCompressed() const; - virtual bool getCompressed(); + virtual const bool isCompressed() const; + virtual bool isCompressed(); virtual void setCompressed( bool compressed ); virtual const int getRedeliveryCounter() const; @@ -209,12 +209,12 @@ virtual std::string& getUserID(); virtual void setUserID( const std::string& userID ); - virtual const bool getRecievedByDFBridge() const; - virtual bool getRecievedByDFBridge(); + virtual const bool isRecievedByDFBridge() const; + virtual bool isRecievedByDFBridge(); virtual void setRecievedByDFBridge( bool recievedByDFBridge ); - virtual const bool getDroppable() const; - virtual bool getDroppable(); + virtual const bool isDroppable() const; + virtual bool isDroppable(); virtual void setDroppable( bool droppable ); }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp Mon Nov 13 15:54:35 2006 @@ -84,9 +84,10 @@ srcPtr->getDestination()->cloneDataStructure() ) ); for( size_t ibrokerPath = 0; ibrokerPath < srcPtr->getBrokerPath().size(); ++ibrokerPath ) { this->getBrokerPath().push_back( - srcPtr->getBrokerPath()[ibrokerPath]->cloneDataStructure() ); + dynamic_cast<BrokerId*>( + srcPtr->getBrokerPath()[ibrokerPath]->cloneDataStructure() ) ); } - this->setDispatchAsync( srcPtr->getDispatchAsync() ); + this->setDispatchAsync( srcPtr->isDispatchAsync() ); } //////////////////////////////////////////////////////////////////////////////// @@ -140,12 +141,12 @@ } //////////////////////////////////////////////////////////////////////////////// -const bool ProducerInfo::getDispatchAsync() const { +const bool ProducerInfo::isDispatchAsync() const { return dispatchAsync; } //////////////////////////////////////////////////////////////////////////////// -bool ProducerInfo::getDispatchAsync() { +bool ProducerInfo::isDispatchAsync() { return dispatchAsync; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.h?view=diff&rev=474588&r1=474587&r2=474588 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ProducerInfo.h Mon Nov 13 15:54:35 2006 @@ -96,8 +96,8 @@ virtual std::vector<BrokerId*> getBrokerPath(); virtual void setBrokerPath( std::vector<BrokerId*> brokerPath ); - virtual const bool getDispatchAsync() const; - virtual bool getDispatchAsync(); + virtual const bool isDispatchAsync() const; + virtual bool isDispatchAsync(); virtual void setDispatchAsync( bool dispatchAsync ); };