summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/management
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/qpid/management')
-rw-r--r--cpp/src/qpid/management/ManagementBroker.cpp16
-rw-r--r--cpp/src/qpid/management/ManagementBroker.h32
2 files changed, 25 insertions, 23 deletions
diff --git a/cpp/src/qpid/management/ManagementBroker.cpp b/cpp/src/qpid/management/ManagementBroker.cpp
index bb36841965..3ae98e8264 100644
--- a/cpp/src/qpid/management/ManagementBroker.cpp
+++ b/cpp/src/qpid/management/ManagementBroker.cpp
@@ -39,6 +39,7 @@ using namespace qpid::management;
using namespace qpid::broker;
using namespace qpid::sys;
using namespace std;
+namespace _qmf = qmf::org::apache::qpid::broker;
Mutex ManagementAgent::Singleton::lock;
bool ManagementAgent::Singleton::disabled = false;
@@ -113,7 +114,8 @@ ManagementBroker::~ManagementBroker ()
}
}
-void ManagementBroker::configure(string _dataDir, uint16_t _interval, broker::Broker* _broker, int _threads)
+void ManagementBroker::configure(string _dataDir, uint16_t _interval,
+ qpid::broker::Broker* _broker, int _threads)
{
dataDir = _dataDir;
interval = _interval;
@@ -170,8 +172,8 @@ void ManagementBroker::writeData ()
}
}
-void ManagementBroker::setExchange (broker::Exchange::shared_ptr _mexchange,
- broker::Exchange::shared_ptr _dexchange)
+void ManagementBroker::setExchange (qpid::broker::Exchange::shared_ptr _mexchange,
+ qpid::broker::Exchange::shared_ptr _dexchange)
{
mExchange = _mexchange;
dExchange = _dexchange;
@@ -261,7 +263,7 @@ bool ManagementBroker::CheckHeader (Buffer& buf, uint8_t *opcode, uint32_t *seq)
void ManagementBroker::SendBuffer (Buffer& buf,
uint32_t length,
- broker::Exchange::shared_ptr exchange,
+ qpid::broker::Exchange::shared_ptr exchange,
string routingKey)
{
if (exchange.get() == 0)
@@ -448,7 +450,7 @@ void ManagementBroker::handleMethodRequestLH (Buffer& inBuffer, string replyToKe
EncodeHeader(outBuffer, 'm', sequence);
if (acl != 0) {
- string userId = ((const broker::ConnectionState*) connToken)->getUserId();
+ string userId = ((const qpid::broker::ConnectionState*) connToken)->getUserId();
std::map<acl::Property, string> params;
params[acl::SCHEMAPACKAGE] = packageName;
params[acl::SCHEMACLASS] = className;
@@ -748,7 +750,7 @@ void ManagementBroker::handleAttachRequestLH (Buffer& inBuffer, string replyToKe
agent->objIdBank = assignedBank;
agent->routingKey = replyToKey;
agent->connectionRef = connectionRef;
- agent->mgmtObject = new management::Agent (this, agent);
+ agent->mgmtObject = new _qmf::Agent (this, agent);
agent->mgmtObject->set_connectionRef(agent->connectionRef);
agent->mgmtObject->set_label (label);
agent->mgmtObject->set_registeredTo (broker->GetManagementObject()->getObjectId());
@@ -831,7 +833,7 @@ bool ManagementBroker::authorizeAgentMessageLH(Message& msg)
if (acl == 0)
return true;
- string userId = ((const broker::ConnectionState*) msg.getPublisher())->getUserId();
+ string userId = ((const qpid::broker::ConnectionState*) msg.getPublisher())->getUserId();
string packageName;
string className;
uint8_t hash[16];
diff --git a/cpp/src/qpid/management/ManagementBroker.h b/cpp/src/qpid/management/ManagementBroker.h
index e3b5504752..23fba74b83 100644
--- a/cpp/src/qpid/management/ManagementBroker.h
+++ b/cpp/src/qpid/management/ManagementBroker.h
@@ -30,7 +30,7 @@
#include "qpid/agent/ManagementAgent.h"
#include "ManagementObject.h"
#include "Manageable.h"
-#include "qpid/management/Agent.h"
+#include "qmf/org/apache/qpid/broker/Agent.h"
#include <qpid/framing/AMQFrame.h>
namespace qpid {
@@ -47,10 +47,10 @@ class ManagementBroker : public ManagementAgent
ManagementBroker ();
virtual ~ManagementBroker ();
- void configure (std::string dataDir, uint16_t interval, broker::Broker* broker, int threadPoolSize);
+ void configure (std::string dataDir, uint16_t interval, qpid::broker::Broker* broker, int threadPoolSize);
void setInterval (uint16_t _interval) { interval = _interval; }
- void setExchange (broker::Exchange::shared_ptr mgmtExchange,
- broker::Exchange::shared_ptr directExchange);
+ void setExchange (qpid::broker::Exchange::shared_ptr mgmtExchange,
+ qpid::broker::Exchange::shared_ptr directExchange);
int getMaxThreads () { return threadPoolSize; }
void RegisterClass (std::string packageName,
std::string className,
@@ -59,7 +59,7 @@ class ManagementBroker : public ManagementAgent
ObjectId addObject (ManagementObject* object,
uint64_t persistId = 0);
void clientAdded (void);
- bool dispatchCommand (broker::Deliverable& msg,
+ bool dispatchCommand (qpid::broker::Deliverable& msg,
const std::string& routingKey,
const framing::FieldTable* args);
@@ -71,7 +71,7 @@ class ManagementBroker : public ManagementAgent
private:
friend class ManagementAgent;
- struct Periodic : public broker::TimerTask
+ struct Periodic : public qpid::broker::TimerTask
{
ManagementBroker& broker;
@@ -88,7 +88,7 @@ class ManagementBroker : public ManagementAgent
uint32_t objIdBank;
std::string routingKey;
ObjectId connectionRef;
- Agent* mgmtObject;
+ qmf::org::apache::qpid::broker::Agent* mgmtObject;
ManagementObject* GetManagementObject (void) const { return mgmtObject; }
virtual ~RemoteAgent ();
};
@@ -154,12 +154,12 @@ class ManagementBroker : public ManagementAgent
framing::Uuid uuid;
sys::Mutex addLock;
sys::Mutex userLock;
- broker::Timer timer;
- broker::Exchange::shared_ptr mExchange;
- broker::Exchange::shared_ptr dExchange;
+ qpid::broker::Timer timer;
+ qpid::broker::Exchange::shared_ptr mExchange;
+ qpid::broker::Exchange::shared_ptr dExchange;
std::string dataDir;
uint16_t interval;
- broker::Broker* broker;
+ qpid::broker::Broker* broker;
uint16_t bootSequence;
uint32_t nextObjectId;
uint32_t brokerBank;
@@ -178,12 +178,12 @@ class ManagementBroker : public ManagementAgent
bool CheckHeader (framing::Buffer& buf, uint8_t *opcode, uint32_t *seq);
void SendBuffer (framing::Buffer& buf,
uint32_t length,
- broker::Exchange::shared_ptr exchange,
+ qpid::broker::Exchange::shared_ptr exchange,
std::string routingKey);
void moveNewObjectsLH();
- bool authorizeAgentMessageLH(broker::Message& msg);
- void dispatchAgentCommandLH(broker::Message& msg);
+ bool authorizeAgentMessageLH(qpid::broker::Message& msg);
+ void dispatchAgentCommandLH(qpid::broker::Message& msg);
PackageMap::iterator FindOrAddPackageLH(std::string name);
void AddClass(PackageMap::iterator pIter,
@@ -208,9 +208,9 @@ class ManagementBroker : public ManagementAgent
void handleClassIndLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence);
void handleSchemaRequestLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence);
void handleSchemaResponseLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence);
- void handleAttachRequestLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence, const broker::ConnectionToken* connToken);
+ void handleAttachRequestLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence, const qpid::broker::ConnectionToken* connToken);
void handleGetQueryLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence);
- void handleMethodRequestLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence, const broker::ConnectionToken* connToken);
+ void handleMethodRequestLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence, const qpid::broker::ConnectionToken* connToken);
size_t ValidateSchema(framing::Buffer&);
sys::Mutex& getMutex();
View Lorry Controller Status