Merged the changes from the qmf-devel0.7a branch back to the trunk.

This is a checkpoint along the QMFv2 development path.
This update introduces portions of QMFv2 into the code:
  - The C++ agent (qpid/agent) uses QMFv2 for data and method transfer
    o The APIs no longer use qpid::framing::*
    o Consequently, boost is no longer referenced from the API headers.
    o Agents and Objects are now referenced by strings, not numbers.
    o Schema transfer still uses the QMFv1 format.
  - The broker-resident agent can use QMFv1 or QMFv2 based on the command line options.
    It defaults to QMFv1 for compatibility.
  - The pure-python QMF console (qmf.console) can concurrently interact with both
    QMFv1 and QMFv2 agents.


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

3 files changed, 3 insertions, 3 deletions

diff --git a/tools/src/py/qpid-cluster b/tools/src/py/qpid-cluster
index 6d64765184..7e608e4f2b 100755
--- a/tools/src/py/qpid-cluster
+++ b/tools/src/py/qpid-cluster
@@ -94,7 +94,7 @@ class BrokerManager:
         self.broker = self.qmf.addBroker(brokerUrl, self.config._connTimeout)
         agents = self.qmf.getAgents()
         for a in agents:
-            if a.getAgentBank() == 0:
+            if a.getAgentBank() == '0':
                 self.brokerAgent = a
 
     def Disconnect(self):
diff --git a/tools/src/py/qpid-config b/tools/src/py/qpid-config
index 0db42bc6c7..24a20b0431 100755
--- a/tools/src/py/qpid-config
+++ b/tools/src/py/qpid-config
@@ -189,7 +189,7 @@ class BrokerManager:
         self.broker = self.qmf.addBroker(brokerUrl, _connTimeout)
         agents = self.qmf.getAgents()
         for a in agents:
-            if a.getAgentBank() == 0:
+            if a.getAgentBank() == '0':
                 self.brokerAgent = a
 
     def Disconnect(self):
diff --git a/tools/src/py/qpid-stat b/tools/src/py/qpid-stat
index 1541d6ec9f..e3bfe288dd 100755
--- a/tools/src/py/qpid-stat
+++ b/tools/src/py/qpid-stat
@@ -91,7 +91,7 @@ class Broker(object):
 
         agents = qmf.getAgents()
         for a in agents:
-            if a.getAgentBank() == 0:
+            if a.getAgentBank() == '0':
                 self.brokerAgent = a
 
         bobj = qmf.getObjects(_class="broker", _package="org.apache.qpid.broker", _agent=self.brokerAgent)[0]