You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2006/04/13 22:20:38 UTC
svn commit: r393918 - in /incubator/activemq/trunk/openwire-cpp/src:
command/ marshal/
Author: rajdavies
Date: Thu Apr 13 13:20:35 2006
New Revision: 393918
URL: http://svn.apache.org/viewcvs?rev=393918&view=rev
Log:
Added client control commands
Modified:
incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp
incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp
incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp
incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp
incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp
incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp
incubator/activemq/trunk/openwire-cpp/src/marshal/BrokerInfoMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/ConnectionInfoMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/ConsumerInfoMarshaller.cpp
incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.cpp
Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp?rev=393918&r1=393917&r2=393918&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.cpp Thu Apr 13 13:20:35 2006
@@ -35,6 +35,8 @@
this->peerBrokerInfos = 0 ;
this->brokerName = 0 ;
this->slaveBroker = 0 ;
+ this->masterBroker = 0 ;
+ this->faultTolerantConfiguration = 0 ;
}
BrokerInfo::~BrokerInfo()
@@ -94,4 +96,26 @@
void BrokerInfo::setSlaveBroker(bool slaveBroker)
{
this->slaveBroker = slaveBroker ;
+}
+
+
+bool BrokerInfo::getMasterBroker()
+{
+ return masterBroker ;
+}
+
+void BrokerInfo::setMasterBroker(bool masterBroker)
+{
+ this->masterBroker = masterBroker ;
+}
+
+
+bool BrokerInfo::getFaultTolerantConfiguration()
+{
+ return faultTolerantConfiguration ;
+}
+
+void BrokerInfo::setFaultTolerantConfiguration(bool faultTolerantConfiguration)
+{
+ this->faultTolerantConfiguration = faultTolerantConfiguration ;
}
Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp?rev=393918&r1=393917&r2=393918&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerInfo.hpp Thu Apr 13 13:20:35 2006
@@ -56,6 +56,8 @@
ap<BrokerInfo> peerBrokerInfos ;
p<string> brokerName ;
bool slaveBroker ;
+ bool masterBroker ;
+ bool faultTolerantConfiguration ;
public:
const static int TYPE = 2;
@@ -80,6 +82,12 @@
virtual bool getSlaveBroker() ;
virtual void setSlaveBroker(bool slaveBroker) ;
+
+ virtual bool getMasterBroker() ;
+ virtual void setMasterBroker(bool masterBroker) ;
+
+ virtual bool getFaultTolerantConfiguration() ;
+ virtual void setFaultTolerantConfiguration(bool faultTolerantConfiguration) ;
} ;
Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp?rev=393918&r1=393917&r2=393918&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.cpp Thu Apr 13 13:20:35 2006
@@ -35,6 +35,8 @@
this->password = 0 ;
this->userName = 0 ;
this->brokerPath = 0 ;
+ this->brokerMasterConnector = 0 ;
+ this->manageable = 0 ;
}
ConnectionInfo::~ConnectionInfo()
@@ -94,4 +96,26 @@
void ConnectionInfo::setBrokerPath(ap<BrokerId> brokerPath)
{
this->brokerPath = brokerPath ;
+}
+
+
+bool ConnectionInfo::getBrokerMasterConnector()
+{
+ return brokerMasterConnector ;
+}
+
+void ConnectionInfo::setBrokerMasterConnector(bool brokerMasterConnector)
+{
+ this->brokerMasterConnector = brokerMasterConnector ;
+}
+
+
+bool ConnectionInfo::getManageable()
+{
+ return manageable ;
+}
+
+void ConnectionInfo::setManageable(bool manageable)
+{
+ this->manageable = manageable ;
}
Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp?rev=393918&r1=393917&r2=393918&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionInfo.hpp Thu Apr 13 13:20:35 2006
@@ -56,6 +56,8 @@
p<string> password ;
p<string> userName ;
ap<BrokerId> brokerPath ;
+ bool brokerMasterConnector ;
+ bool manageable ;
public:
const static int TYPE = 3;
@@ -80,6 +82,12 @@
virtual ap<BrokerId> getBrokerPath() ;
virtual void setBrokerPath(ap<BrokerId> brokerPath) ;
+
+ virtual bool getBrokerMasterConnector() ;
+ virtual void setBrokerMasterConnector(bool brokerMasterConnector) ;
+
+ virtual bool getManageable() ;
+ virtual void setManageable(bool manageable) ;
} ;
Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp?rev=393918&r1=393917&r2=393918&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.cpp Thu Apr 13 13:20:35 2006
@@ -45,6 +45,7 @@
this->brokerPath = 0 ;
this->additionalPredicate = 0 ;
this->networkSubscription = 0 ;
+ this->optimizedAcknowledge = 0 ;
}
ConsumerInfo::~ConsumerInfo()
@@ -214,4 +215,15 @@
void ConsumerInfo::setNetworkSubscription(bool networkSubscription)
{
this->networkSubscription = networkSubscription ;
+}
+
+
+bool ConsumerInfo::getOptimizedAcknowledge()
+{
+ return optimizedAcknowledge ;
+}
+
+void ConsumerInfo::setOptimizedAcknowledge(bool optimizedAcknowledge)
+{
+ this->optimizedAcknowledge = optimizedAcknowledge ;
}
Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp?rev=393918&r1=393917&r2=393918&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerInfo.hpp Thu Apr 13 13:20:35 2006
@@ -68,6 +68,7 @@
ap<BrokerId> brokerPath ;
p<BooleanExpression> additionalPredicate ;
bool networkSubscription ;
+ bool optimizedAcknowledge ;
public:
const static int TYPE = 5;
@@ -122,6 +123,9 @@
virtual bool getNetworkSubscription() ;
virtual void setNetworkSubscription(bool networkSubscription) ;
+
+ virtual bool getOptimizedAcknowledge() ;
+ virtual void setOptimizedAcknowledge(bool optimizedAcknowledge) ;
} ;
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/BrokerInfoMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/BrokerInfoMarshaller.cpp?rev=393918&r1=393917&r2=393918&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/BrokerInfoMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/BrokerInfoMarshaller.cpp Thu Apr 13 13:20:35 2006
@@ -72,6 +72,8 @@
}
info.setBrokerName(tightUnmarshalString(dataIn, bs));
info.setSlaveBroker(bs.readBoolean());
+ info.setMasterBroker(bs.readBoolean());
+ info.setFaultTolerantConfiguration(bs.readBoolean());
}
@@ -88,6 +90,8 @@
rc += marshalObjectArray(wireFormat, info.getPeerBrokerInfos(), bs);
rc += writeString(info.getBrokerName(), bs);
bs.writeBoolean(info.isSlaveBroker());
+ bs.writeBoolean(info.isMasterBroker());
+ bs.writeBoolean(info.isFaultTolerantConfiguration());
return rc + 0;
}
@@ -103,6 +107,8 @@
writeString(info.getBrokerURL(), dataOut, bs);
marshalObjectArray(wireFormat, info.getPeerBrokerInfos(), dataOut, bs);
writeString(info.getBrokerName(), dataOut, bs);
+ bs.readBoolean();
+ bs.readBoolean();
bs.readBoolean();
}
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ConnectionInfoMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ConnectionInfoMarshaller.cpp?rev=393918&r1=393917&r2=393918&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ConnectionInfoMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ConnectionInfoMarshaller.cpp Thu Apr 13 13:20:35 2006
@@ -72,6 +72,8 @@
else {
info.setBrokerPath(null);
}
+ info.setBrokerMasterConnector(bs.readBoolean());
+ info.setManageable(bs.readBoolean());
}
@@ -88,6 +90,8 @@
rc += writeString(info.getPassword(), bs);
rc += writeString(info.getUserName(), bs);
rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
+ bs.writeBoolean(info.isBrokerMasterConnector());
+ bs.writeBoolean(info.isManageable());
return rc + 0;
}
@@ -104,5 +108,7 @@
writeString(info.getPassword(), dataOut, bs);
writeString(info.getUserName(), dataOut, bs);
marshalObjectArray(wireFormat, info.getBrokerPath(), dataOut, bs);
+ bs.readBoolean();
+ bs.readBoolean();
}
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ConsumerInfoMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ConsumerInfoMarshaller.cpp?rev=393918&r1=393917&r2=393918&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ConsumerInfoMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ConsumerInfoMarshaller.cpp Thu Apr 13 13:20:35 2006
@@ -82,6 +82,7 @@
}
info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
info.setNetworkSubscription(bs.readBoolean());
+ info.setOptimizedAcknowledge(bs.readBoolean());
}
@@ -105,6 +106,7 @@
rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
rc += marshal1NestedObject(wireFormat, info.getAdditionalPredicate(), bs);
bs.writeBoolean(info.isNetworkSubscription());
+ bs.writeBoolean(info.isOptimizedAcknowledge());
return rc + 3;
}
@@ -130,6 +132,7 @@
DataStreamMarshaller.writeByte(info.getPriority(), dataOut);
marshalObjectArray(wireFormat, info.getBrokerPath(), dataOut, bs);
marshal2NestedObject(wireFormat, info.getAdditionalPredicate(), dataOut, bs);
+ bs.readBoolean();
bs.readBoolean();
}
Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.cpp?rev=393918&r1=393917&r2=393918&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/MarshallerFactory.cpp Thu Apr 13 13:20:35 2006
@@ -67,8 +67,10 @@
#include "marshal/DestinationInfoMarshaller.hpp"
#include "marshal/ShutdownInfoMarshaller.hpp"
#include "marshal/DataResponseMarshaller.hpp"
+#include "marshal/ConnectionControlMarshaller.hpp"
#include "marshal/KeepAliveInfoMarshaller.hpp"
#include "marshal/FlushCommandMarshaller.hpp"
+#include "marshal/ConsumerControlMarshaller.hpp"
#include "marshal/JournalTopicAckMarshaller.hpp"
#include "marshal/BrokerIdMarshaller.hpp"
#include "marshal/MessageDispatchMarshaller.hpp"
@@ -126,8 +128,10 @@
format.addMarshaller(new DestinationInfoMarshaller());
format.addMarshaller(new ShutdownInfoMarshaller());
format.addMarshaller(new DataResponseMarshaller());
+ format.addMarshaller(new ConnectionControlMarshaller());
format.addMarshaller(new KeepAliveInfoMarshaller());
format.addMarshaller(new FlushCommandMarshaller());
+ format.addMarshaller(new ConsumerControlMarshaller());
format.addMarshaller(new JournalTopicAckMarshaller());
format.addMarshaller(new BrokerIdMarshaller());
format.addMarshaller(new MessageDispatchMarshaller());