activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r473146 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire: commands/ marshal/v2/
Date Fri, 10 Nov 2006 00:20:11 GMT
Author: tabish
Date: Thu Nov  9 16:20:10 2006
New Revision: 473146

URL: http://svn.apache.org/viewvc?view=rev&rev=473146
Log:
Updates for planned Openwire Support

Modified:
    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/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/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
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp

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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -41,6 +41,9 @@
     this->slaveBroker = false;
     this->masterBroker = false;
     this->faultTolerantConfiguration = false;
+    this->duplexConnection = false;
+    this->networkConnection = false;
+    this->connectionId = 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -69,6 +72,9 @@
     brokerInfo->slaveBroker = this->getSlaveBroker()->clone();
     brokerInfo->masterBroker = this->getMasterBroker()->clone();
     brokerInfo->faultTolerantConfiguration = this->getFaultTolerantConfiguration()->clone();
+    brokerInfo->duplexConnection = this->getDuplexConnection()->clone();
+    brokerInfo->networkConnection = this->getNetworkConnection()->clone();
+    brokerInfo->connectionId = this->getConnectionId()->clone();
 
     return brokerInfo
 }
@@ -89,6 +95,9 @@
     dest->setSlaveBroker( this->getSlaveBroker()->clone() );
     dest->setMasterBroker( this->getMasterBroker()->clone() );
     dest->setFaultTolerantConfiguration( this->getFaultTolerantConfiguration()->clone()
);
+    dest->setDuplexConnection( this->getDuplexConnection()->clone() );
+    dest->setNetworkConnection( this->getNetworkConnection()->clone() );
+    dest->setConnectionId( this->getConnectionId()->clone() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -199,5 +208,50 @@
 ////////////////////////////////////////////////////////////////////////////////
 void BrokerInfo::setFaultTolerantConfiguration(bool faultTolerantConfiguration ) {
     this->faultTolerantConfiguration = faultTolerantConfiguration;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const bool BrokerInfo::getDuplexConnection() const {
+    return duplexConnection;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool BrokerInfo::getDuplexConnection() {
+    return duplexConnection;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void BrokerInfo::setDuplexConnection(bool duplexConnection ) {
+    this->duplexConnection = duplexConnection;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const bool BrokerInfo::getNetworkConnection() const {
+    return networkConnection;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool BrokerInfo::getNetworkConnection() {
+    return networkConnection;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void BrokerInfo::setNetworkConnection(bool networkConnection ) {
+    this->networkConnection = networkConnection;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const long long BrokerInfo::getConnectionId() const {
+    return connectionId;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+long long BrokerInfo::getConnectionId() {
+    return connectionId;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void BrokerInfo::setConnectionId(long long connectionId ) {
+    this->connectionId = connectionId;
 }
 

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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -55,6 +55,9 @@
         bool slaveBroker;
         bool masterBroker;
         bool faultTolerantConfiguration;
+        bool duplexConnection;
+        bool networkConnection;
+        long long connectionId;
 
     public:
 
@@ -113,6 +116,18 @@
         virtual const bool getFaultTolerantConfiguration() const;
         virtual bool getFaultTolerantConfiguration();
         virtual void setFaultTolerantConfiguration( bool faultTolerantConfiguration );
+
+        virtual const bool getDuplexConnection() const;
+        virtual bool getDuplexConnection();
+        virtual void setDuplexConnection( bool duplexConnection );
+
+        virtual const bool getNetworkConnection() const;
+        virtual bool getNetworkConnection();
+        virtual void setNetworkConnection( bool networkConnection );
+
+        virtual const long long getConnectionId() const;
+        virtual long long getConnectionId();
+        virtual void setConnectionId( long long connectionId );
 
     };
 

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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -41,6 +41,7 @@
     this->userName = "";
     this->brokerMasterConnector = false;
     this->manageable = false;
+    this->clientMaster = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -69,6 +70,7 @@
     }
     connectionInfo->brokerMasterConnector = this->getBrokerMasterConnector()->clone();
     connectionInfo->manageable = this->getManageable()->clone();
+    connectionInfo->clientMaster = this->getClientMaster()->clone();
 
     return connectionInfo
 }
@@ -89,6 +91,7 @@
     }
     dest->setBrokerMasterConnector( this->getBrokerMasterConnector()->clone() );
     dest->setManageable( this->getManageable()->clone() );
+    dest->setClientMaster( this->getClientMaster()->clone() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -199,5 +202,20 @@
 ////////////////////////////////////////////////////////////////////////////////
 void ConnectionInfo::setManageable(bool manageable ) {
     this->manageable = manageable;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const bool ConnectionInfo::getClientMaster() const {
+    return clientMaster;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool ConnectionInfo::getClientMaster() {
+    return clientMaster;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ConnectionInfo::setClientMaster(bool clientMaster ) {
+    this->clientMaster = 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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -55,6 +55,7 @@
         std::vector<BrokerId*> brokerPath;
         bool brokerMasterConnector;
         bool manageable;
+        bool clientMaster;
 
     public:
 
@@ -113,6 +114,10 @@
         virtual const bool getManageable() const;
         virtual bool getManageable();
         virtual void setManageable( bool manageable );
+
+        virtual const bool getClientMaster() const;
+        virtual bool getClientMaster();
+        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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -38,6 +38,9 @@
     this->close = false;
     this->consumerId = NULL;
     this->prefetch = 0;
+    this->flush = false;
+    this->start = false;
+    this->stop = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -56,6 +59,9 @@
     consumerControl->close = this->getClose()->clone();
     consumerControl->consumerId = this->getConsumerId();
     consumerControl->prefetch = this->getPrefetch()->clone();
+    consumerControl->flush = this->getFlush()->clone();
+    consumerControl->start = this->getStart()->clone();
+    consumerControl->stop = this->getStop()->clone();
 
     return consumerControl
 }
@@ -69,6 +75,9 @@
     dest->setClose( this->getClose()->clone() );
     dest->setConsumerId( this->getConsumerId() );
     dest->setPrefetch( this->getPrefetch()->clone() );
+    dest->setFlush( this->getFlush()->clone() );
+    dest->setStart( this->getStart()->clone() );
+    dest->setStop( this->getStop()->clone() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -119,5 +128,50 @@
 ////////////////////////////////////////////////////////////////////////////////
 void ConsumerControl::setPrefetch(int prefetch ) {
     this->prefetch = prefetch;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const bool ConsumerControl::getFlush() const {
+    return flush;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool ConsumerControl::getFlush() {
+    return flush;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ConsumerControl::setFlush(bool flush ) {
+    this->flush = flush;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const bool ConsumerControl::getStart() const {
+    return start;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool ConsumerControl::getStart() {
+    return start;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ConsumerControl::setStart(bool start ) {
+    this->start = start;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const bool ConsumerControl::getStop() const {
+    return stop;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool ConsumerControl::getStop() {
+    return stop;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ConsumerControl::setStop(bool stop ) {
+    this->stop = 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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -50,6 +50,9 @@
         bool close;
         ConsumerId* consumerId;
         int prefetch;
+        bool flush;
+        bool start;
+        bool stop;
 
     public:
 
@@ -92,6 +95,18 @@
         virtual const int getPrefetch() const;
         virtual int getPrefetch();
         virtual void setPrefetch( int prefetch );
+
+        virtual const bool getFlush() const;
+        virtual bool getFlush();
+        virtual void setFlush( bool flush );
+
+        virtual const bool getStart() const;
+        virtual bool getStart();
+        virtual void setStart( bool start );
+
+        virtual const bool getStop() const;
+        virtual bool getStop();
+        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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -42,7 +42,7 @@
     this->maximumPendingMessageLimit = 0;
     this->dispatchAsync = false;
     this->selector = "";
-    this->subcriptionName = "";
+    this->subscriptionName = "";
     this->noLocal = false;
     this->exclusive = false;
     this->retroactive = false;
@@ -78,7 +78,7 @@
     consumerInfo->maximumPendingMessageLimit = this->getMaximumPendingMessageLimit()->clone();
     consumerInfo->dispatchAsync = this->getDispatchAsync()->clone();
     consumerInfo->selector = this->getSelector();
-    consumerInfo->subcriptionName = this->getSubcriptionName();
+    consumerInfo->subscriptionName = this->getSubscriptionName();
     consumerInfo->noLocal = this->getNoLocal()->clone();
     consumerInfo->exclusive = this->getExclusive()->clone();
     consumerInfo->retroactive = this->getRetroactive()->clone();
@@ -108,7 +108,7 @@
     dest->setMaximumPendingMessageLimit( this->getMaximumPendingMessageLimit()->clone()
);
     dest->setDispatchAsync( this->getDispatchAsync()->clone() );
     dest->setSelector( this->getSelector() );
-    dest->setSubcriptionName( this->getSubcriptionName() );
+    dest->setSubscriptionName( this->getSubscriptionName() );
     dest->setNoLocal( this->getNoLocal()->clone() );
     dest->setExclusive( this->getExclusive()->clone() );
     dest->setRetroactive( this->getRetroactive()->clone() );
@@ -234,18 +234,18 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const std::string& ConsumerInfo::getSubcriptionName() const {
-    return subcriptionName;
+const std::string& ConsumerInfo::getSubscriptionName() const {
+    return subscriptionName;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string& ConsumerInfo::getSubcriptionName() {
-    return subcriptionName;
+std::string& ConsumerInfo::getSubscriptionName() {
+    return subscriptionName;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setSubcriptionName(const std::string& subcriptionName ) {
-    this->subcriptionName = subcriptionName;
+void ConsumerInfo::setSubscriptionName(const std::string& subscriptionName ) {
+    this->subscriptionName = subscriptionName;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -57,7 +57,7 @@
         int maximumPendingMessageLimit;
         bool dispatchAsync;
         std::string selector;
-        std::string subcriptionName;
+        std::string subscriptionName;
         bool noLocal;
         bool exclusive;
         bool retroactive;
@@ -126,9 +126,9 @@
         virtual std::string& getSelector();
         virtual void setSelector( const std::string& selector );
 
-        virtual const std::string& getSubcriptionName() const;
-        virtual std::string& getSubcriptionName();
-        virtual void setSubcriptionName( const std::string& subcriptionName );
+        virtual const std::string& getSubscriptionName() const;
+        virtual std::string& getSubscriptionName();
+        virtual void setSubscriptionName( const std::string& subscriptionName );
 
         virtual const bool getNoLocal() const;
         virtual bool getNoLocal();

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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -57,6 +57,7 @@
     this->arrival = 0;
     this->userID = "";
     this->recievedByDFBridge = false;
+    this->droppable = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -111,6 +112,7 @@
     message->arrival = this->getArrival()->clone();
     message->userID = this->getUserID();
     message->recievedByDFBridge = this->getRecievedByDFBridge()->clone();
+    message->droppable = this->getDroppable()->clone();
 
     return message
 }
@@ -149,6 +151,7 @@
     dest->setArrival( this->getArrival()->clone() );
     dest->setUserID( this->getUserID() );
     dest->setRecievedByDFBridge( this->getRecievedByDFBridge()->clone() );
+    dest->setDroppable( this->getDroppable()->clone() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -529,5 +532,20 @@
 ////////////////////////////////////////////////////////////////////////////////
 void Message::setRecievedByDFBridge(bool recievedByDFBridge ) {
     this->recievedByDFBridge = recievedByDFBridge;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const bool Message::getDroppable() const {
+    return droppable;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool Message::getDroppable() {
+    return droppable;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void Message::setDroppable(bool droppable ) {
+    this->droppable = 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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -81,6 +81,7 @@
         long long arrival;
         std::string userID;
         bool recievedByDFBridge;
+        bool droppable;
 
     public:
 
@@ -211,6 +212,10 @@
         virtual const bool getRecievedByDFBridge() const;
         virtual bool getRecievedByDFBridge();
         virtual void setRecievedByDFBridge( bool recievedByDFBridge );
+
+        virtual const bool getDroppable() const;
+        virtual bool getDroppable();
+        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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -37,6 +37,7 @@
 {
     this->producerId = NULL;
     this->destination = NULL;
+    this->dispatchAsync = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -62,6 +63,7 @@
         producerInfo->getBrokerPath().push_back( 
             this->brokerPath[ibrokerPath]->clone();
     }
+    producerInfo->dispatchAsync = this->getDispatchAsync()->clone();
 
     return producerInfo
 }
@@ -78,6 +80,7 @@
         dest->getBrokerPath().push_back( 
             this->brokerPath[ibrokerPath]->clone() );
     }
+    dest->setDispatchAsync( this->getDispatchAsync()->clone() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -128,5 +131,20 @@
 ////////////////////////////////////////////////////////////////////////////////
 void ProducerInfo::setBrokerPath(std::vector<BrokerId*> brokerPath ) {
     this->brokerPath = brokerPath;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+const bool ProducerInfo::getDispatchAsync() const {
+    return dispatchAsync;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool ProducerInfo::getDispatchAsync() {
+    return dispatchAsync;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ProducerInfo::setDispatchAsync(bool dispatchAsync ) {
+    this->dispatchAsync = 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=473146&r1=473145&r2=473146
==============================================================================
--- 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
Thu Nov  9 16:20:10 2006
@@ -52,6 +52,7 @@
         ProducerId* producerId;
         ActiveMQDestination* destination;
         std::vector<BrokerId*> brokerPath;
+        bool dispatchAsync;
 
     public:
 
@@ -94,6 +95,10 @@
         virtual const std::vector<BrokerId*> getBrokerPath() const;
         virtual std::vector<BrokerId*> getBrokerPath();
         virtual void setBrokerPath( std::vector<BrokerId*> brokerPath );
+
+        virtual const bool getDispatchAsync() const;
+        virtual bool getDispatchAsync();
+        virtual void setDispatchAsync( bool dispatchAsync );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp?view=diff&rev=473146&r1=473145&r2=473146
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
Thu Nov  9 16:20:10 2006
@@ -71,6 +71,9 @@
     info->setSlaveBroker( bs->readBoolean() );
     info->setMasterBroker( bs->readBoolean() );
     info->setFaultTolerantConfiguration( bs->readBoolean() );
+    info->setDuplexConnection( bs->readBoolean() );
+    info->setNetworkConnection( bs->readBoolean() );
+    info->setConnectionId( TightUnmarshalLong( wireFormat, dataIn, bs ) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -90,6 +93,9 @@
     bs->writeBoolean( info->isSlaveBroker() );
     bs->writeBoolean( info->isMasterBroker() );
     bs->writeBoolean( info->isFaultTolerantConfiguration() );
+    bs->writeBoolean( info->isDuplexConnection() );
+    bs->writeBoolean( info->isNetworkConnection() );
+    rc += tightMarshalLong1( wireFormat, info->getConnectionId(), bs );
 
     return rc + 0;
 }
@@ -111,6 +117,9 @@
     bs->readBoolean();
     bs->readBoolean();
     bs->readBoolean();
+    bs->readBoolean();
+    bs->readBoolean();
+    tightMarshalLong2( wireFormat, info->getConnectionId(), dataOut, bs );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -138,6 +147,9 @@
     info->setSlaveBroker( dataIn->readBoolean() );
     info->setMasterBroker( dataIn->readBoolean() );
     info->setFaultTolerantConfiguration( dataIn->readBoolean() );
+    info->setDuplexConnection( dataIn->readBoolean() );
+    info->setNetworkConnection( dataIn->readBoolean() );
+    info->setConnectionId( looseUnmarshalLong( wireFormat, dataIn ) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -156,5 +168,8 @@
     dataOut->write( info->isSlaveBroker() );
     dataOut->write( info->isMasterBroker() );
     dataOut->write( info->isFaultTolerantConfiguration() );
+    dataOut->write( info->isDuplexConnection() );
+    dataOut->write( info->isNetworkConnection() );
+    looseMarshalLong( wireFormat, info->getConnectionId(), dataOut );
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp?view=diff&rev=473146&r1=473145&r2=473146
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
Thu Nov  9 16:20:10 2006
@@ -71,6 +71,7 @@
     }
     info->setBrokerMasterConnector( bs->readBoolean() );
     info->setManageable( bs->readBoolean() );
+    info->setClientMaster( bs->readBoolean() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -90,6 +91,7 @@
     rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
     bs->writeBoolean( info->isBrokerMasterConnector() );
     bs->writeBoolean( info->isManageable() );
+    bs->writeBoolean( info->isClientMaster() );
 
     return rc + 0;
 }
@@ -111,6 +113,7 @@
     tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
     bs->readBoolean();
     bs->readBoolean();
+    bs->readBoolean();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -138,6 +141,7 @@
     }
     info->setBrokerMasterConnector( dataIn->readBoolean() );
     info->setManageable( dataIn->readBoolean() );
+    info->setClientMaster( dataIn->readBoolean() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -156,5 +160,6 @@
     looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
     dataOut->write( info->isBrokerMasterConnector() );
     dataOut->write( info->isManageable() );
+    dataOut->write( info->isClientMaster() );
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp?view=diff&rev=473146&r1=473145&r2=473146
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
Thu Nov  9 16:20:10 2006
@@ -55,6 +55,9 @@
     info->setConsumerId( dynamic_cast< ConsumerId* >(
         tightUnmarsalNestedObject( wireFormat, dataIn, bs ) );
     info->setPrefetch( dataIn->readInt() );
+    info->setFlush( bs->readBoolean() );
+    info->setStart( bs->readBoolean() );
+    info->setStop( bs->readBoolean() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -69,6 +72,9 @@
         dynamic_cast< DataStructure* >( info->getConsumerId() );
 
     rc += tightMarshalNestedObject1( wireFormat, data, bs );
+    bs->writeBoolean( info->isFlush() );
+    bs->writeBoolean( info->isStart() );
+    bs->writeBoolean( info->isStop() );
 
     return rc + 4;
 }
@@ -86,6 +92,9 @@
 
     tightMarshalNestedObject2( wireFormat, data, dataOut, bs );
     dataOut->write( info->getPrefetch() );
+    bs->readBoolean();
+    bs->readBoolean();
+    bs->readBoolean();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -97,6 +106,9 @@
    info->setConsumerId( dynamic_cast<ConsumerId* >( 
        looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
     info->setPrefetch( dataIn->readInt() );
+    info->setFlush( dataIn->readBoolean() );
+    info->setStart( dataIn->readBoolean() );
+    info->setStop( dataIn->readBoolean() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -111,5 +123,8 @@
 
     looseMarshalNestedObject( wireFormat, data, dataOut );
     dataOut->write( info->getPrefetch() );
+    dataOut->write( info->isFlush() );
+    dataOut->write( info->isStart() );
+    dataOut->write( info->isStop() );
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp?view=diff&rev=473146&r1=473145&r2=473146
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
Thu Nov  9 16:20:10 2006
@@ -60,7 +60,7 @@
     info->setMaximumPendingMessageLimit( dataIn->readInt() );
     info->setDispatchAsync( bs->readBoolean() );
     info->setSelector( TightUnmarshalString( dataIn, bs ) );
-    info->setSubcriptionName( TightUnmarshalString( dataIn, bs ) );
+    info->setSubscriptionName( TightUnmarshalString( dataIn, bs ) );
     info->setNoLocal( bs->readBoolean() );
     info->setExclusive( bs->readBoolean() );
     info->setRetroactive( bs->readBoolean() );
@@ -103,7 +103,7 @@
     rc += tightMarshalCachedObject1( wireFormat, data, bs );
     bs->writeBoolean( info->isDispatchAsync() );
     rc += tightMarshalString1( info->getSelector(), bs );
-    rc += tightMarshalString1( info->getSubcriptionName(), bs );
+    rc += tightMarshalString1( info->getSubscriptionName(), bs );
     bs->writeBoolean( info->isNoLocal() );
     bs->writeBoolean( info->isExclusive() );
     bs->writeBoolean( info->isRetroactive() );
@@ -139,7 +139,7 @@
     dataOut->write( info->getMaximumPendingMessageLimit() );
     bs->readBoolean();
     tightMarshalString2( info->getSelector(), dataOut, bs );
-    tightMarshalString2( info->getSubcriptionName(), dataOut, bs );
+    tightMarshalString2( info->getSubscriptionName(), dataOut, bs );
     bs->readBoolean();
     bs->readBoolean();
     bs->readBoolean();
@@ -168,7 +168,7 @@
     info->setMaximumPendingMessageLimit( dataIn->readInt() );
     info->setDispatchAsync( dataIn->readBoolean() );
     info->setSelector( looseUnmarshalString( dataIn ) );
-    info->setSubcriptionName( looseUnmarshalString( dataIn ) );
+    info->setSubscriptionName( looseUnmarshalString( dataIn ) );
     info->setNoLocal( dataIn->readBoolean() );
     info->setExclusive( dataIn->readBoolean() );
     info->setRetroactive( dataIn->readBoolean() );
@@ -212,7 +212,7 @@
     dataOut->write( info->getMaximumPendingMessageLimit() );
     dataOut->write( info->isDispatchAsync() );
     looseMarshalString( info->getSelector(), dataOut );
-    looseMarshalString( info->getSubcriptionName(), dataOut );
+    looseMarshalString( info->getSubscriptionName(), dataOut );
     dataOut->write( info->isNoLocal() );
     dataOut->write( info->isExclusive() );
     dataOut->write( info->isRetroactive() );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp?view=diff&rev=473146&r1=473145&r2=473146
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
Thu Nov  9 16:20:10 2006
@@ -87,6 +87,7 @@
     info->setArrival( TightUnmarshalLong( wireFormat, dataIn, bs ) );
     info->setUserID( TightUnmarshalString( dataIn, bs ) );
     info->setRecievedByDFBridge( bs->readBoolean() );
+    info->setDroppable( bs->readBoolean() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -147,6 +148,7 @@
     rc += tightMarshalLong1( wireFormat, info->getArrival(), bs );
     rc += tightMarshalString1( info->getUserID(), bs );
     bs->writeBoolean( info->isRecievedByDFBridge() );
+    bs->writeBoolean( info->isDroppable() );
 
     return rc + 9;
 }
@@ -216,6 +218,7 @@
     tightMarshalLong2( wireFormat, info->getArrival(), dataOut, bs );
     tightMarshalString2( info->getUserID(), dataOut, bs );
     bs->readBoolean();
+    bs->readBoolean();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -269,6 +272,7 @@
     info->setArrival( looseUnmarshalLong( wireFormat, dataIn ) );
     info->setUserID( looseUnmarshalString( dataIn ) );
     info->setRecievedByDFBridge( dataIn->readBoolean() );
+    info->setDroppable( dataIn->readBoolean() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -337,5 +341,6 @@
     looseMarshalLong( wireFormat, info->getArrival(), dataOut );
     looseMarshalString( info->getUserID(), dataOut );
     dataOut->write( info->isRecievedByDFBridge() );
+    dataOut->write( info->isDroppable() );
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp?view=diff&rev=473146&r1=473145&r2=473146
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp
Thu Nov  9 16:20:10 2006
@@ -68,6 +68,7 @@
     else {
         info->setBrokerPath( NULL );
     }
+    info->setDispatchAsync( bs->readBoolean() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -86,6 +87,7 @@
 
     rc += tightMarshalCachedObject1( wireFormat, data, bs );
     rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
+    bs->writeBoolean( info->isDispatchAsync() );
 
     return rc + 0;
 }
@@ -106,6 +108,7 @@
 
     tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
     tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
+    bs->readBoolean();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -130,6 +133,7 @@
     else {
         info->setBrokerPath( NULL );
     }
+    info->setDispatchAsync( dataIn->readBoolean() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -147,5 +151,6 @@
 
     looseMarshalCachedObject( wireFormat, data, dataOut );
     looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
+    dataOut->write( info->isDispatchAsync() );
 }
 



Mime
View raw message