You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2013/10/15 15:10:38 UTC
svn commit: r1532323 - in /qpid/trunk/qpid:
cpp/bindings/qmf2/examples/python/agent.py
cpp/bindings/qmf2/examples/python/find_agents.py
cpp/bindings/qmf2/python/qmf2.py tools/src/py/qmf-tool
Author: mcpierce
Date: Tue Oct 15 13:10:38 2013
New Revision: 1532323
URL: http://svn.apache.org/r1532323
Log:
Revert "QPID-5213: Fix QMF code to use qpid_messaging rather than cqpid."
This reverts commit 067e9aa1656b9f92e5910bbb6d530f9df6d0dad3.
It had the wrong JIRA number in the commit.
Modified:
qpid/trunk/qpid/cpp/bindings/qmf2/examples/python/agent.py
qpid/trunk/qpid/cpp/bindings/qmf2/examples/python/find_agents.py
qpid/trunk/qpid/cpp/bindings/qmf2/python/qmf2.py
qpid/trunk/qpid/tools/src/py/qmf-tool
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/examples/python/agent.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/examples/python/agent.py?rev=1532323&r1=1532322&r2=1532323&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/examples/python/agent.py (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/examples/python/agent.py Tue Oct 15 13:10:38 2013
@@ -19,7 +19,7 @@
# under the License.
#
-import qpid_messaging
+import cqpid
from qmf2 import *
@@ -34,7 +34,7 @@ class ExampleAgent(AgentHandler):
##
## Create and open a messaging connection to a broker.
##
- self.connection = qpid_messaging.Connection(url, "{reconnect:True}")
+ self.connection = cqpid.Connection(url, "{reconnect:True}")
self.session = None
self.connection.open()
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/examples/python/find_agents.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/examples/python/find_agents.py?rev=1532323&r1=1532322&r2=1532323&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/examples/python/find_agents.py (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/examples/python/find_agents.py Tue Oct 15 13:10:38 2013
@@ -17,7 +17,7 @@
# under the License.
#
-import qpid_messaging
+import cqpid
import qmf2
class FindAgents(qmf2.ConsoleHandler):
@@ -45,7 +45,7 @@ class FindAgents(qmf2.ConsoleHandler):
url = "localhost"
options = ""
-connection = qpid_messaging.Connection(url, options)
+connection = cqpid.Connection(url, options)
connection.open()
session = qmf2.ConsoleSession(connection)
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/python/qmf2.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/python/qmf2.py?rev=1532323&r1=1532322&r2=1532323&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/python/qmf2.py (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/python/qmf2.py Tue Oct 15 13:10:38 2013
@@ -18,7 +18,7 @@
#
import cqmf2
-import qpid_messaging
+import cqpid
from threading import Thread
import time
@@ -124,7 +124,7 @@ class AgentHandler(Thread):
def run(self):
event = cqmf2.AgentEvent()
while self.__running:
- valid = self.__agent._impl.nextEvent(event, qpid_messaging.Duration.SECOND)
+ valid = self.__agent._impl.nextEvent(event, cqpid.Duration.SECOND)
if valid and self.__running:
if event.getType() == cqmf2.AGENT_METHOD:
self.method(event, event.getMethodName(), event.getArguments(), event.getArgumentSubtypes(),
@@ -156,7 +156,7 @@ class ConsoleHandler(Thread):
def run(self):
event = cqmf2.ConsoleEvent()
while self.__running:
- valid = self.__session._impl.nextEvent(event, qpid_messaging.Duration.SECOND)
+ valid = self.__session._impl.nextEvent(event, cqpid.Duration.SECOND)
if valid and self.__running:
if event.getType() == cqmf2.CONSOLE_AGENT_ADD:
self.agentAdded(Agent(event.getAgent()))
@@ -434,7 +434,7 @@ class Agent(object):
q_arg = q._impl
else:
q_arg = q
- dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout)
+ dur = cqpid.Duration(cqpid.Duration.SECOND.getMilliseconds() * timeout)
result = self._impl.query(q_arg, dur)
if result.getType() == cqmf2.CONSOLE_EXCEPTION:
raise Exception(Data(result.getData(0)))
@@ -449,7 +449,7 @@ class Agent(object):
def loadSchemaInfo(self, timeout=30):
"""
"""
- dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout)
+ dur = cqpid.Duration(cqpid.Duration.SECOND.getMilliseconds() * timeout)
self._impl.querySchema(dur)
def getPackages(self):
@@ -473,7 +473,7 @@ class Agent(object):
def getSchema(self, schemaId, timeout=30):
"""
"""
- dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout)
+ dur = cqpid.Duration(cqpid.Duration.SECOND.getMilliseconds() * timeout)
return Schema(self._impl.getSchema(schemaId._impl, dur))
## TODO: Async query
@@ -555,7 +555,7 @@ class Data(object):
return Agent(self._impl.getAgent())
def update(self, timeout=5):
- dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout)
+ dur = cqpid.Duration(cqpid.Duration.SECOND.getMilliseconds() * timeout)
agent = self._impl.getAgent()
query = cqmf2.Query(self._impl.getAddr())
result = agent.query(query, dur)
@@ -590,7 +590,7 @@ class Data(object):
timeout = 30
if '_timeout' in kwargs:
timeout = kwargs['_timeout']
- dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout)
+ dur = cqpid.Duration(cqpid.Duration.SECOND.getMilliseconds() * timeout)
##
## Get the list of arguments from the schema, isolate those that are IN or IN_OUT,
Modified: qpid/trunk/qpid/tools/src/py/qmf-tool
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qmf-tool?rev=1532323&r1=1532322&r2=1532323&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qmf-tool (original)
+++ qpid/trunk/qpid/tools/src/py/qmf-tool Tue Oct 15 13:10:38 2013
@@ -28,7 +28,7 @@ from shlex import split
from threading import Lock
from time import strftime, gmtime
from qpid.disp import Display
-import qpid_messaging
+import cqpid
import qmf2
class OptsAndArgs(object):
@@ -266,7 +266,7 @@ class QmfData:
self.conn_options = conn_options
self.qmf_options = qmf_options
self.agent_filter = '[]'
- self.connection = qpid_messaging.Connection(self.url, **self.conn_options)
+ self.connection = cqpid.Connection(self.url, **self.conn_options)
self.connection.open()
self.session = qmf2.ConsoleSession(self.connection, self.qmf_options)
self.session.setAgentFilter(self.agent_filter)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org