diff options
| author | Ted Ross <tross@apache.org> | 2010-04-23 19:02:31 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2010-04-23 19:02:31 +0000 |
| commit | 313c8b1f67f7b9ddca911d6227e947aed6e01db6 (patch) | |
| tree | bc894733c63c6b0ef4713f12fad9b27a9547a67d | |
| parent | a2e3a01aec5de1efc9d6650d62b15b367f102e02 (diff) | |
| download | qpid-python-313c8b1f67f7b9ddca911d6227e947aed6e01db6.tar.gz | |
QPID-2517 - Broker schema changes to support cluster management.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@937470 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.cpp | 4 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java | 5 | ||||
| -rw-r--r-- | qpid/specs/management-schema.xml | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp index 82d38a2d0b..50ab543baf 100644 --- a/qpid/cpp/src/qpid/broker/Broker.cpp +++ b/qpid/cpp/src/qpid/broker/Broker.cpp @@ -172,7 +172,9 @@ Broker::Broker(const Broker::Options& conf) : System* system = new System (dataDir.isEnabled() ? dataDir.getPath() : string(), this); systemObject = System::shared_ptr(system); - mgmtObject = new _qmf::Broker(managementAgent.get(), this, system, conf.port); + mgmtObject = new _qmf::Broker(managementAgent.get(), this, system, "amqp-broker"); + mgmtObject->set_systemRef(system->GetManagementObject()->getObjectId()); + mgmtObject->set_port(conf.port); mgmtObject->set_workerThreads(conf.workerThreads); mgmtObject->set_maxConns(conf.maxConnections); mgmtObject->set_connBacklog(conf.connectionBacklog); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java index b3be6d77e3..ef7426c814 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java @@ -619,6 +619,11 @@ public class QMFService implements ConfigStore.ConfigEventListener return (BrokerSchema.SystemObject) adapt(_obj.getSystem()); } + public String getName() + { + return "amqp-broker"; + } + public Integer getPort() { return _obj.getPort(); diff --git a/qpid/specs/management-schema.xml b/qpid/specs/management-schema.xml index b9e895c4b4..d8786ea4e5 100644 --- a/qpid/specs/management-schema.xml +++ b/qpid/specs/management-schema.xml @@ -61,8 +61,9 @@ =============================================================== --> <class name="Broker"> - <property name="systemRef" type="objId" references="System" access="RC" index="y" desc="System ID" parentRef="y"/> - <property name="port" type="uint16" access="RC" index="y" desc="TCP Port for AMQP Service"/> + <property name="name" type="sstr" access="RC" index="y" desc="Index for the broker at this agent"/> + <property name="systemRef" type="objId" references="System" access="RO" desc="System ID" parentRef="y"/> + <property name="port" type="uint16" access="RO" desc="TCP Port for AMQP Service"/> <property name="workerThreads" type="uint16" access="RO" desc="Thread pool size"/> <property name="maxConns" type="uint16" access="RO" desc="Maximum allowed connections"/> <property name="connBacklog" type="uint16" access="RO" desc="Connection backlog limit for listening socket"/> |