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, 7 insertions, 7 deletions

diff --git a/qpid/python/commands/qpid-config b/qpid/python/commands/qpid-config
index 8f2fb7ff1b..23a054f497 100755
--- a/qpid/python/commands/qpid-config
+++ b/qpid/python/commands/qpid-config
@@ -96,9 +96,9 @@ class BrokerManager:
             self.conn = Connection (connect (self.broker.host, self.broker.port), self.spec,
                                     username=self.broker.username, password=self.broker.password)
             self.conn.start ()
-            self.session = self.conn.session(str(uuid4()))
+            self.session  = self.conn.session (self.sessionId)
             self.mclient  = managementClient (self.spec)
-            self.mchannel = self.mclient.addChannel (self.conn.session(self.sessionId))
+            self.mchannel = self.mclient.addChannel (self.session)
         except socket.error, e:
             print "Socket Error:", e
             sys.exit (1)
@@ -141,11 +141,11 @@ class BrokerManager:
         mch = self.mchannel
         mc.syncWaitForStable (mch)
         exchanges = mc.syncGetObjects (mch, "exchange")
-        print "Type      Bindings  Exchange Name"
-        print "============================================="
+        print "Durable   Type      Bindings  Exchange Name"
+        print "======================================================="
         for ex in exchanges:
             if self.match (ex.name, filter):
-                print "%-10s%5d     %s" % (ex.type, ex.bindings, ex.name)
+                print "%4c      %-10s%5d     %s" % (YN (ex.durable), ex.type, ex.bindings, ex.name)
 
     def ExchangeListRecurse (self, filter):
         self.ConnectToBroker ()
@@ -278,7 +278,7 @@ class BrokerManager:
             key = args[2]
 
         try:
-            self.session.exchange_bind (queue=qname, exchange=ename, routing_key=key)
+            self.session.exchange_bind (queue=qname, exchange=ename, binding_key=key)
         except Closed, e:
             print "Failed:", e
 
@@ -293,7 +293,7 @@ class BrokerManager:
             key = args[2]
 
         try:
-            self.session.exchange_unbind (queue=qname, exchange=ename, routing_key=key)
+            self.session.exchange_unbind (queue=qname, exchange=ename, binding_key=key)
         except Closed, e:
             print "Failed:", e