QPID-1050: Patch from Ted Ross:

1) Durability for federation links (broker-to-broker connections)
2) Improved handling of federation links:
    a) Links can be created even if the remote broker is not reachable
    b) If links are lost, re-establishment will occur using an exponential back-off algorithm
3) Durability of exchanges is now viewable through management
4) ManagementAgent API has been moved to an interface class to reduce coupling between the broker and manageable plug-ins.
5) General configuration storage capability has been added to the store/recover interface. This is used for federation links.
6) Management object-ids for durable objects are now themselves durable. 

(Note: some refactoring needed around ProtocolAccess needed to try and reduce dependencies)



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@655563 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 28 insertions, 18 deletions

diff --git a/qpid/specs/management-schema.xml b/qpid/specs/management-schema.xml
index 52b7cc0274..1583968b01 100644
--- a/qpid/specs/management-schema.xml
+++ b/qpid/specs/management-schema.xml
@@ -86,8 +86,13 @@
     </method>
 
     <method name="connect" desc="Establish a connection to another broker">
-      <arg name="host"     dir="I" type="sstr"   default=""/>
-      <arg name="port" dir="I" type="uint32" default="0"/>
+      <arg name="host"          dir="I" type="sstr"/>
+      <arg name="port"          dir="I" type="uint32"/>
+      <arg name="useSsl"        dir="I" type="bool"/>
+      <arg name="durable"       dir="I" type="bool"/>
+      <arg name="authMechanism" dir="I" type="sstr"/>
+      <arg name="username"      dir="I" type="sstr"/>
+      <arg name="password"      dir="I" type="sstr"/>
     </method>
   </class>
 
@@ -97,7 +102,10 @@
   ===============================================================
   -->
   <class name="agent">
-    <configElement name="id" type="uuid" access="RO" index="y" desc="Agent ID"/>
+    <configElement name="sessionId"    type="uuid"  access="RO" index="y" desc="Session ID for Agent"/>
+    <configElement name="label"        type="sstr"  access="RO"           desc="Label for agent"/>
+    <configElement name="registeredTo" type="objId" access="RO"           desc="Broker agent is registered to"/>
+    <configElement name="sysId"        type="uuid"  access="RO"           desc="Identifier of system where agent resides"/>
   </class>
 
   <!--
@@ -164,6 +172,7 @@
     <configElement name="vhostRef"   type="objId" access="RC" index="y" parentRef="y"/>
     <configElement name="name"       type="sstr"  access="RC" index="y"/>
     <configElement name="type"       type="sstr"  access="RO"/>
+    <configElement name="durable"    type="bool"  access="RC"/>
 
     <instElement name="producers"    type="hilo32"  desc="Current producers on exchange"/>
     <instElement name="bindings"     type="hilo32"  desc="Current bindings"/>
@@ -197,6 +206,7 @@
   <class name="client">
     <configElement name="vhostRef" type="objId"  access="RC" index="y" parentRef="y"/>
     <configElement name="address"  type="sstr"   access="RC" index="y"/>
+    <configElement name="incoming" type="bool"   access="RC"/>
 
     <instElement name="closing"          type="bool" desc="This client is closing by management request"/>
     <instElement name="authIdentity"     type="sstr"/>
@@ -217,19 +227,19 @@
 
     This class represents an inter-broker connection.
 
-    <configElement name="vhostRef"     type="objId" access="RC" index="y" parentRef="y"/>
-    <configElement name="address"      type="sstr"  access="RC" index="y"/>
-    <configElement name="authIdentity" type="sstr"  access="RO"/>
+    <configElement name="vhostRef"  type="objId"  access="RC" index="y" parentRef="y"/>
+    <configElement name="host"      type="sstr"   access="RC" index="y"/>
+    <configElement name="port"      type="uint16" access="RC" index="y"/>
+    <configElement name="useSsl"    type="bool"   access="RC"/>
+    <configElement name="durable"   type="bool"   access="RC"/>
 
-    <instElement name="closing"          type="bool" desc="This link is closing by management request"/>
-    <instElement name="framesFromPeer"   type="count64"/>
-    <instElement name="framesToPeer"     type="count64"/>
-    <instElement name="bytesFromPeer"    type="count64"/>
-    <instElement name="bytesToPeer"      type="count64"/>
+    <instElement name="state"       type="sstr" desc="Operational state of the link"/>
+    <instElement name="lastError"   type="sstr" desc="Reason link is not operational"/>
 
     <method name="close"/> 
 
     <method name="bridge" desc="Bridge messages over the link">
+      <arg name="durable"       dir="I" type="bool"/>
       <arg name="src"           dir="I" type="sstr"/>
       <arg name="dest"          dir="I" type="sstr"/>
       <arg name="key"           dir="I" type="sstr" default=""/>
@@ -247,13 +257,13 @@
   ===============================================================
   -->
   <class name="bridge">
-    <configElement name="linkRef" type="objId"  access="RC" index="y" parentRef="y"/>
-    <configElement name="channelId"        type="uint16" access="RC"  index="y"/>
-    <configElement name="src"             type="sstr"   access="RC"/>
-    <configElement name="dest"             type="sstr"   access="RC"/>
-    <configElement name="key"             type="sstr"   access="RC"/>
-    <configElement name="src_is_queue"     type="bool"   access="RC"/>
-    <configElement name="src_is_local"     type="bool"   access="RC"/>
+    <configElement name="linkRef"       type="objId"  access="RC" index="y" parentRef="y"/>
+    <configElement name="channelId"     type="uint16" access="RC" index="y"/>
+    <configElement name="src"           type="sstr"   access="RC"/>
+    <configElement name="dest"          type="sstr"   access="RC"/>
+    <configElement name="key"           type="sstr"   access="RC"/>
+    <configElement name="src_is_queue"  type="bool"   access="RC"/>
+    <configElement name="src_is_local"  type="bool"   access="RC"/>
     <method name="close"/> 
   </class>