From e2a3e196965d37b997b87675ce694bde784d00ad Mon Sep 17 00:00:00 2001 From: Jonathan Robie Date: Wed, 20 Oct 2010 22:15:24 +0000 Subject: Adds support for federation in the XML exchange. Resolves QPID-2348 for the XML Exchange. Also made some changes to the file structure for fedop constants. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1025780 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/DirectExchange.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'cpp/src/qpid/broker/DirectExchange.cpp') diff --git a/cpp/src/qpid/broker/DirectExchange.cpp b/cpp/src/qpid/broker/DirectExchange.cpp index 0db941f93b..fc52ab3711 100644 --- a/cpp/src/qpid/broker/DirectExchange.cpp +++ b/cpp/src/qpid/broker/DirectExchange.cpp @@ -20,6 +20,7 @@ */ #include "qpid/log/Statement.h" +#include "qpid/broker/FedOps.h" #include "qpid/broker/Queue.h" #include "qpid/broker/DirectExchange.h" #include @@ -32,15 +33,7 @@ namespace _qmf = qmf::org::apache::qpid::broker; namespace { -const std::string qpidFedOp("qpid.fed.op"); -const std::string qpidFedTags("qpid.fed.tags"); -const std::string qpidFedOrigin("qpid.fed.origin"); -const std::string qpidExclusiveBinding("qpid.exclusive-binding"); - -const std::string fedOpBind("B"); -const std::string fedOpUnbind("U"); -const std::string fedOpReorigin("R"); -const std::string fedOpHello("H"); + const std::string qpidExclusiveBinding("qpid.exclusive-binding"); } DirectExchange::DirectExchange(const string& _name, Manageable* _parent, Broker* b) : Exchange(_name, _parent, b) @@ -67,7 +60,7 @@ bool DirectExchange::bind(Queue::shared_ptr queue, const string& routingKey, con fedOp = args->getAsString(qpidFedOp); fedTags = args->getAsString(qpidFedTags); fedOrigin = args->getAsString(qpidFedOrigin); - exclusiveBinding = args->get(qpidExclusiveBinding); + exclusiveBinding = args->get(qpidExclusiveBinding); // only direct exchanges take exclusive bindings } bool propagate = false; -- cgit v1.2.1