QPID-3603: Rename WiringReplicator to BrokerReplicator.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-2@1233687 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 29 insertions, 29 deletions

diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index 2ed91d099a..6a0be11119 100644
--- a/qpid/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
@@ -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})
diff --git a/qpid/cpp/src/ha.mk b/qpid/cpp/src/ha.mk
index d367ba2101..272fdbf296 100644
--- a/qpid/cpp/src/ha.mk
+++ b/qpid/cpp/src/ha.mk
@@ -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)
diff --git a/qpid/cpp/src/qpid/broker/Bridge.cpp b/qpid/cpp/src/qpid/broker/Bridge.cpp
index 402b19c9a4..558507b3b7 100644
--- a/qpid/cpp/src/qpid/broker/Bridge.cpp
+++ b/qpid/cpp/src/qpid/broker/Bridge.cpp
@@ -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"
diff --git a/qpid/cpp/src/qpid/ha/Backup.cpp b/qpid/cpp/src/qpid/ha/Backup.cpp
index 48ece928b6..3476af3fe3 100644
--- a/qpid/cpp/src/qpid/ha/Backup.cpp
+++ b/qpid/cpp/src/qpid/ha/Backup.cpp
@@ -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 Settings& s) : broker(b), settings(s) {
         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);
 }
 
diff --git a/qpid/cpp/src/qpid/ha/WiringReplicator.cpp b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
index b86b7cec4a..7fd224d753 100644
--- a/qpid/cpp/src/qpid/ha/WiringReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
@@ -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, const string& queueName, SessionHandler&
 }
 } // 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 boost::shared_ptr<Link>& l)
         "",                 // 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(Bridge& bridge, SessionHandler& sessionH
 }
 
 // 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& msg, const string& /*key*/, const fram
     }
 }
 
-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::doEventQueueDeclare(Variant::Map& values) {
     }
 }
 
-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::doEventQueueDelete(Variant::Map& values) {
     }
 }
 
-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::doEventExchangeDeclare(Variant::Map& values) {
     }
 }
 
-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::doEventExchangeDelete(Variant::Map& values) {
     } 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(Variant::Map& values) {
     }
 }
 
-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(Variant::Map& values) {
     }
 }
 
-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(Variant::Map& values) {
     }
 }
 
-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::startQueueReplicator(const boost::shared_ptr<Queue>& queu
     }
 }
 
-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
diff --git a/qpid/cpp/src/qpid/ha/WiringReplicator.h b/qpid/cpp/src/qpid/ha/BrokerReplicator.h
index 32109d8368..154dd340ac 100644
--- a/qpid/cpp/src/qpid/ha/WiringReplicator.h
+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.h
@@ -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