Author: aconway
Date: Thu Jan 19 23:09:11 2012
New Revision: 1233687
URL: http://svn.apache.org/viewvc?rev=1233687&view=rev
Log:
QPID-3603: Rename WiringReplicator to BrokerReplicator.
Added:
qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
(contents, props changed)
- copied, changed from r1233685,
qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/WiringReplicator.cpp
qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.h
(contents, props changed)
- copied, changed from r1233685,
qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/WiringReplicator.h
Removed:
qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/WiringReplicator.cpp
qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/WiringReplicator.h
Modified:
qpid/branches/qpid-3603-2/qpid/cpp/src/CMakeLists.txt
qpid/branches/qpid-3603-2/qpid/cpp/src/ha.mk
qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/broker/Bridge.cpp
qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/Backup.cpp
Modified: qpid/branches/qpid-3603-2/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-2/qpid/cpp/src/CMakeLists.txt?rev=1233687&r1=1233686&r2=1233687&view=diff
==============================================================================
--- qpid/branches/qpid-3603-2/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/qpid-3603-2/qpid/cpp/src/CMakeLists.txt Thu Jan 19 23:09:11
2012
@@ -605,8 +605,8 @@ if (BUILD_HA)
qpid/ha/QueueReplicator.cpp
qpid/ha/ReplicatingSubscription.h
qpid/ha/ReplicatingSubscription.cpp
- qpid/ha/WiringReplicator.cpp
- qpid/ha/WiringReplicator.h
+ qpid/ha/BrokerReplicator.cpp
+ qpid/ha/BrokerReplicator.h
)
add_library (ha MODULE ${ha_SOURCES})
Modified: qpid/branches/qpid-3603-2/qpid/cpp/src/ha.mk
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-2/qpid/cpp/src/ha.mk?rev=1233687&r1=1233686&r2=1233687&view=diff
==============================================================================
--- qpid/branches/qpid-3603-2/qpid/cpp/src/ha.mk (original)
+++ qpid/branches/qpid-3603-2/qpid/cpp/src/ha.mk Thu Jan 19 23:09:11 2012
@@ -33,8 +33,8 @@ ha_la_SOURCES = \
qpid/ha/QueueReplicator.cpp \
qpid/ha/ReplicatingSubscription.h \
qpid/ha/ReplicatingSubscription.cpp \
- qpid/ha/WiringReplicator.cpp \
- qpid/ha/WiringReplicator.h
+ qpid/ha/BrokerReplicator.cpp \
+ qpid/ha/BrokerReplicator.h
ha_la_LIBADD = libqpidbroker.la
ha_la_LDFLAGS = $(PLUGINLDFLAGS)
Modified: qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/broker/Bridge.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/broker/Bridge.cpp?rev=1233687&r1=1233686&r2=1233687&view=diff
==============================================================================
--- qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/broker/Bridge.cpp (original)
+++ qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/broker/Bridge.cpp Thu Jan 19
23:09:11 2012
@@ -24,7 +24,7 @@
#include "qpid/broker/Connection.h"
#include "qpid/broker/Link.h"
#include "qpid/broker/LinkRegistry.h"
-#include "qpid/ha/WiringReplicator.h"
+#include "qpid/ha/BrokerReplicator.h"
#include "qpid/broker/SessionState.h"
#include "qpid/management/ManagementAgent.h"
Modified: qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/Backup.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/Backup.cpp?rev=1233687&r1=1233686&r2=1233687&view=diff
==============================================================================
--- qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/Backup.cpp (original)
+++ qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/Backup.cpp Thu Jan 19
23:09:11 2012
@@ -20,7 +20,7 @@
*/
#include "Backup.h"
#include "Settings.h"
-#include "WiringReplicator.h"
+#include "BrokerReplicator.h"
#include "ReplicatingSubscription.h"
#include "qpid/Url.h"
#include "qpid/amqp_0_10/Codecs.h"
@@ -54,7 +54,7 @@ Backup::Backup(broker::Broker& b, const
s.mechanism, s.username, s.password);
assert(result.second); // FIXME aconway 2011-11-23: error handling
link = result.first;
- boost::shared_ptr<WiringReplicator> wr(new WiringReplicator(link));
+ boost::shared_ptr<BrokerReplicator> wr(new BrokerReplicator(link));
broker.getExchanges().registerExchange(wr);
}
Copied: qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
(from r1233685,
qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/WiringReplicator.cpp)
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp?p2=qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp&p1=qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/WiringReplicator.cpp&r1=1233685&r2=1233687&rev=1233687&view=diff
==============================================================================
--- qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/WiringReplicator.cpp
(original)
+++ qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp Thu Jan
19 23:09:11 2012
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include "WiringReplicator.h"
+#include "BrokerReplicator.h"
#include "QueueReplicator.h"
#include "qpid/broker/Broker.h"
#include "qpid/broker/Queue.h"
@@ -170,9 +170,9 @@ void sendQuery(const string className, c
}
} // namespace
-WiringReplicator::~WiringReplicator() {}
+BrokerReplicator::~BrokerReplicator() {}
-WiringReplicator::WiringReplicator(const boost::shared_ptr<Link>& l)
+BrokerReplicator::BrokerReplicator(const boost::shared_ptr<Link>& l)
: Exchange(QPID_WIRING_REPLICATOR), broker(*l->getBroker()), link(l)
{
QPID_LOG(info, "HA: Backup replicating from " <<
@@ -189,12 +189,12 @@ WiringReplicator::WiringReplicator(const
"", // excludes
false, // dynamic
0, // sync?
- boost::bind(&WiringReplicator::initializeBridge, this, _1, _2)
+ boost::bind(&BrokerReplicator::initializeBridge, this, _1, _2)
);
}
// This is called in the connection IO thread when the bridge is started.
-void WiringReplicator::initializeBridge(Bridge& bridge, SessionHandler&
sessionHandler) {
+void BrokerReplicator::initializeBridge(Bridge& bridge, SessionHandler&
sessionHandler) {
framing::AMQP_ServerProxy peer(sessionHandler.out);
string queueName = bridge.getQueueName();
const qmf::org::apache::qpid::broker::ArgsLinkBridge&
args(bridge.getArgs());
@@ -215,7 +215,7 @@ void WiringReplicator::initializeBridge(
}
// FIXME aconway 2011-12-02: error handling in route.
-void WiringReplicator::route(Deliverable& msg, const string& /*key*/, const
framing::FieldTable* headers) {
+void BrokerReplicator::route(Deliverable& msg, const string& /*key*/, const
framing::FieldTable* headers) {
Variant::List list;
try {
if (!isQMFv2(msg.getMessage()) || !headers)
@@ -256,7 +256,7 @@ void WiringReplicator::route(Deliverable
}
}
-void WiringReplicator::doEventQueueDeclare(Variant::Map& values) {
+void BrokerReplicator::doEventQueueDeclare(Variant::Map& values) {
string name = values[QNAME].asString();
Variant::Map argsMap = values[ARGS].asMap();
if (values[DISP] == CREATED && replicateLevel(argsMap)) {
@@ -286,7 +286,7 @@ void WiringReplicator::doEventQueueDecla
}
}
-void WiringReplicator::doEventQueueDelete(Variant::Map& values) {
+void BrokerReplicator::doEventQueueDelete(Variant::Map& values) {
// The remote queue has already been deleted so replicator
// sessions may be closed by a "queue deleted" exception.
string name = values[QNAME].asString();
@@ -304,7 +304,7 @@ void WiringReplicator::doEventQueueDelet
}
}
-void WiringReplicator::doEventExchangeDeclare(Variant::Map& values) {
+void BrokerReplicator::doEventExchangeDeclare(Variant::Map& values) {
Variant::Map argsMap(values[ARGS].asMap());
if (values[DISP] == CREATED && replicateLevel(argsMap)) {
string name = values[EXNAME].asString();
@@ -328,7 +328,7 @@ void WiringReplicator::doEventExchangeDe
}
}
-void WiringReplicator::doEventExchangeDelete(Variant::Map& values) {
+void BrokerReplicator::doEventExchangeDelete(Variant::Map& values) {
string name = values[EXNAME].asString();
try {
boost::shared_ptr<Exchange> exchange =
broker.getExchanges().find(name);
@@ -342,7 +342,7 @@ void WiringReplicator::doEventExchangeDe
} catch (const framing::NotFoundException&) {}
}
-void WiringReplicator::doEventBind(Variant::Map& values) {
+void BrokerReplicator::doEventBind(Variant::Map& values) {
boost::shared_ptr<Exchange> exchange =
broker.getExchanges().find(values[EXNAME].asString());
boost::shared_ptr<Queue> queue =
@@ -362,7 +362,7 @@ void WiringReplicator::doEventBind(Varia
}
}
-void WiringReplicator::doResponseQueue(Variant::Map& values) {
+void BrokerReplicator::doResponseQueue(Variant::Map& values) {
// FIXME aconway 2011-11-22: more flexible ways & defaults to indicate
replication
Variant::Map argsMap(values[ARGUMENTS].asMap());
if (!replicateLevel(argsMap)) return;
@@ -389,7 +389,7 @@ void WiringReplicator::doResponseQueue(V
}
}
-void WiringReplicator::doResponseExchange(Variant::Map& values) {
+void BrokerReplicator::doResponseExchange(Variant::Map& values) {
Variant::Map argsMap(values[ARGUMENTS].asMap());
if (!replicateLevel(argsMap)) return;
framing::FieldTable args;
@@ -430,7 +430,7 @@ const std::string QUEUE_REF("queueRef");
} // namespace
-void WiringReplicator::doResponseBind(Variant::Map& values) {
+void BrokerReplicator::doResponseBind(Variant::Map& values) {
std::string exName = getRefName(EXCHANGE_REF_PREFIX, values[EXCHANGE_REF]);
std::string qName = getRefName(QUEUE_REF_PREFIX, values[QUEUE_REF]);
boost::shared_ptr<Exchange> exchange = broker.getExchanges().find(exName);
@@ -451,7 +451,7 @@ void WiringReplicator::doResponseBind(Va
}
}
-void WiringReplicator::startQueueReplicator(const boost::shared_ptr<Queue>&
queue) {
+void BrokerReplicator::startQueueReplicator(const boost::shared_ptr<Queue>&
queue) {
if (replicateLevel(queue->getSettings()) == RL_ALL) {
boost::shared_ptr<QueueReplicator> qr(new QueueReplicator(queue,
link));
broker.getExchanges().registerExchange(qr);
@@ -459,10 +459,10 @@ void WiringReplicator::startQueueReplica
}
}
-bool WiringReplicator::bind(boost::shared_ptr<Queue>, const string&, const
framing::FieldTable*) { return false; }
-bool WiringReplicator::unbind(boost::shared_ptr<Queue>, const string&, const
framing::FieldTable*) { return false; }
-bool WiringReplicator::isBound(boost::shared_ptr<Queue>, const string* const,
const framing::FieldTable* const) { return false; }
+bool BrokerReplicator::bind(boost::shared_ptr<Queue>, const string&, const
framing::FieldTable*) { return false; }
+bool BrokerReplicator::unbind(boost::shared_ptr<Queue>, const string&, const
framing::FieldTable*) { return false; }
+bool BrokerReplicator::isBound(boost::shared_ptr<Queue>, const string* const,
const framing::FieldTable* const) { return false; }
-string WiringReplicator::getType() const { return QPID_WIRING_REPLICATOR; }
+string BrokerReplicator::getType() const { return QPID_WIRING_REPLICATOR; }
}} // namespace broker
Propchange: qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.h (from
r1233685, qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/WiringReplicator.h)
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.h?p2=qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.h&p1=qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/WiringReplicator.h&r1=1233685&r2=1233687&rev=1233687&view=diff
==============================================================================
--- qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/WiringReplicator.h (original)
+++ qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.h Thu Jan
19 23:09:11 2012
@@ -48,11 +48,11 @@ namespace ha {
* THREAD SAFE: Has no mutable state.
*
*/
-class WiringReplicator : public broker::Exchange
+class BrokerReplicator : public broker::Exchange
{
public:
- WiringReplicator(const boost::shared_ptr<broker::Link>&);
- ~WiringReplicator();
+ BrokerReplicator(const boost::shared_ptr<broker::Link>&);
+ ~BrokerReplicator();
std::string getType() const;
// Exchange methods
Propchange: qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: qpid/branches/qpid-3603-2/qpid/cpp/src/qpid/ha/BrokerReplicator.h
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
