summaryrefslogtreecommitdiff
path: root/qpid/specs
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2008-09-03 18:01:44 +0000
committerTed Ross <tross@apache.org>2008-09-03 18:01:44 +0000
commitbf45f1241b9f801b55ede16d77c3dbbe505f0f89 (patch)
tree419d953ae460ce8e3a7607c9e749baf3c2829e6c /qpid/specs
parent0da3229c29d5948c3a48631b83a2484dc349a974 (diff)
downloadqpid-python-bf45f1241b9f801b55ede16d77c3dbbe505f0f89.tar.gz
QPID-1174 Updates to the management framework
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@691700 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/specs')
-rw-r--r--qpid/specs/management-schema.xml33
-rw-r--r--qpid/specs/management-types.xml2
2 files changed, 22 insertions, 13 deletions
diff --git a/qpid/specs/management-schema.xml b/qpid/specs/management-schema.xml
index 850f9c62e6..5952595997 100644
--- a/qpid/specs/management-schema.xml
+++ b/qpid/specs/management-schema.xml
@@ -61,18 +61,16 @@
===============================================================
-->
<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="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"/>
- <property name="stagingThreshold" type="uint32" access="RO" desc="Broker stages messages over this size to disk"/>
- <property name="mgmtPubInterval" type="uint16" access="RW" unit="second" min="1" desc="Interval for management broadcasts"/>
- <property name="clusterName" type="sstr" access="RO"
- desc="Name of cluster this server is a member of"/>
- <property name="version" type="sstr" access="RO" desc="Running software version"/>
- <property name="dataDirEnabled" type="bool" access="RO" desc="Persistent configuration storage enabled"/>
- <property name="dataDir" type="sstr" access="RO" desc="Persistent configuration storage location"/>
+ <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="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"/>
+ <property name="stagingThreshold" type="uint32" access="RO" desc="Broker stages messages over this size to disk"/>
+ <property name="mgmtPubInterval" type="uint16" access="RW" unit="second" min="1" desc="Interval for management broadcasts"/>
+ <property name="clusterName" type="sstr" access="RO" desc="Name of cluster this server is a member of"/>
+ <property name="version" type="sstr" access="RO" desc="Running software version"/>
+ <property name="dataDir" type="sstr" access="RO" optional="y" desc="Persistent configuration storage location"/>
<method name="joinCluster">
<arg name="clusterName" dir="I" type="sstr"/>
@@ -94,6 +92,17 @@
<arg name="username" dir="I" type="sstr"/>
<arg name="password" dir="I" type="sstr"/>
</method>
+
+ <event name="agentConnect" desc="QMF Management Agent has connected to the broker">
+ <arg name="remoteAddress" type="sstr"/>
+ <arg name="label" type="sstr"/>
+ <arg name="brokerBank" type="uint32"/>
+ <arg name="agentBank" type="uint32"/>
+ </event>
+
+ <event name="agentDisconnect" desc="QMF Management Agent has disconnected from the broker">
+ <arg name="remoteAddress" type="sstr"/>
+ </event>
</class>
<!--
diff --git a/qpid/specs/management-types.xml b/qpid/specs/management-types.xml
index 309c94c98b..1d3e9f900b 100644
--- a/qpid/specs/management-types.xml
+++ b/qpid/specs/management-types.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<type name="objId" base="REF" cpp="uint64_t" encode="@.putLongLong(#)" decode="# = @.getLongLong()" accessor="direct" init="0"/>
+<type name="objId" base="REF" cpp="ObjectId" encode="#.encode(@)" decode="#.decode(@)" accessor="direct" init="0"/>
<type name="uint8" base="U8" cpp="uint8_t" encode="@.putOctet(#)" decode="# = @.getOctet()" accessor="direct" init="0"/>
<type name="uint16" base="U16" cpp="uint16_t" encode="@.putShort(#)" decode="# = @.getShort()" accessor="direct" init="0"/>
<type name="uint32" base="U32" cpp="uint32_t" encode="@.putLong(#)" decode="# = @.getLong()" accessor="direct" init="0"/>