From 4d8b7a47d1c774ccd4899c2f40acff744cf79a75 Mon Sep 17 00:00:00 2001
From: Ted Ross <tross@apache.org>
Date: Fri, 23 Apr 2010 19:02:31 +0000
Subject: QPID-2517 - Broker schema changes to support cluster management.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@937470 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/Broker.cpp                                | 4 +++-
 java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java | 5 +++++
 specs/management-schema.xml                                   | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 82d38a2d0b..50ab543baf 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/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/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java b/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
index b3be6d77e3..ef7426c814 100644
--- a/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
+++ b/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/specs/management-schema.xml b/specs/management-schema.xml
index b9e895c4b4..d8786ea4e5 100644
--- a/specs/management-schema.xml
+++ b/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"/>
-- 
cgit v1.2.1