Author: rhs
Date: Tue Apr 22 11:15:48 2008
New Revision: 650604
URL: http://svn.apache.org/viewvc?rev=650604&view=rev
Log:
QPID-948: patch from Ted Ross for updated management utilities to 0-10 final
Modified:
incubator/qpid/trunk/qpid/python/commands/qpid-config
incubator/qpid/trunk/qpid/python/commands/qpid-route
incubator/qpid/trunk/qpid/python/commands/qpid-tool
incubator/qpid/trunk/qpid/python/qpid/managementdata.py
Modified: incubator/qpid/trunk/qpid/python/commands/qpid-config
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/commands/qpid-config?rev=650604&r1=650603&r2=650604&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/commands/qpid-config (original)
+++ incubator/qpid/trunk/qpid/python/commands/qpid-config Tue Apr 22 11:15:48
2008
@@ -19,7 +19,7 @@
# under the License.
#
-import os
+import os, uuid
import getopt
import sys
import socket
@@ -27,10 +27,11 @@
from threading import Condition
from qpid.management import managementClient
from qpid.peer import Closed
-from qpid.client import Client
+from qpid.connection import Connection
+from qpid.util import connect
from time import sleep
-_defspecpath = "/usr/share/amqp/amqp.0-10-preview.xml"
+_defspecpath = "/usr/share/amqp/amqp.0-10.xml"
_specpath = _defspecpath
_recursive = False
_host = "localhost"
@@ -95,13 +96,11 @@
def ConnectToBroker (self):
try:
- self.spec = qpid.spec.load (_specpath)
- self.client = Client (self.broker.host, self.broker.port,
self.spec)
- self.client.start (response='\x00' + "guest" + '\x00' + "guest",
- mechanism="PLAIN")
- self.channel = self.client.channel (1)
+ self.spec = qpid.spec.load (_specpath)
+ self.conn = Connection (connect (self.broker.host,
self.broker.port), self.spec)
+ self.conn.start ()
self.mclient = managementClient (self.spec)
- self.mchannel = self.mclient.addChannel (self.channel)
+ self.mchannel = self.mclient.addChannel
(self.conn.session(str(uuid.uuid4())))
except socket.error, e:
print "Socket Error:", e
sys.exit (1)
Modified: incubator/qpid/trunk/qpid/python/commands/qpid-route
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/commands/qpid-route?rev=650604&r1=650603&r2=650604&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/commands/qpid-route (original)
+++ incubator/qpid/trunk/qpid/python/commands/qpid-route Tue Apr 22 11:15:48
2008
@@ -23,9 +23,11 @@
import sys
import socket
import qpid
+import uuid
from qpid.management import managementClient
from qpid.peer import Closed
-from qpid.client import Client
+from qpid.connection import Connection
+from qpid.util import connect
def Usage ():
print "Usage: qpid-route [OPTIONS] add <dest-broker> <src-broker>
<exchange> <routing-key>"
@@ -35,7 +37,7 @@
print " qpid-route [OPTIONS] flush <dest-broker>"
print
print "Options:"
- print " -s [ --spec-file ] PATH (/usr/share/amqp/amqp.0-10-preview.xml)"
+ print " -s [ --spec-file ] PATH (/usr/share/amqp/amqp.0-10.xml)"
print " -v [ --verbose ] Verbose output"
print " -q [ --quiet ] Quiet output, don't print
duplicate warnings"
print
@@ -49,7 +51,7 @@
#print
sys.exit (1)
-_specpath = "/usr/share/amqp/amqp.0-10-preview.xml"
+_specpath = "/usr/share/amqp/amqp.0-10.xml"
_verbose = False
_quiet = False
@@ -78,12 +80,10 @@
print "Connecting to broker: %s:%d" % (broker.host, broker.port)
try:
self.spec = qpid.spec.load (_specpath)
- self.client = Client (broker.host, broker.port, self.spec)
- self.client.start (response='\x00' + "guest" + '\x00' + "guest",
- mechanism="PLAIN")
- self.channel = self.client.channel (1)
+ self.conn = Connection (connect (broker.host, broker.port),
self.spec)
+ self.conn.start ()
self.mclient = managementClient (self.spec)
- self.mch = self.mclient.addChannel (self.channel)
+ self.mch = self.mclient.addChannel
(self.conn.session(str(uuid.uuid4())))
self.mclient.syncWaitForStable (self.mch)
except socket.error, e:
print "Connect Error:", e
Modified: incubator/qpid/trunk/qpid/python/commands/qpid-tool
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/commands/qpid-tool?rev=650604&r1=650603&r2=650604&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/commands/qpid-tool (original)
+++ incubator/qpid/trunk/qpid/python/commands/qpid-tool Tue Apr 22 11:15:48 2008
@@ -127,7 +127,7 @@
print "Usage:", sys.argv[0], "[OPTIONS] [<target-host[:<tcp-port>]]"
print
print "Options:"
- print " -s [ --spec-file ] PATH (/usr/share/amqp/amqp.0-10-preview.xml)"
+ print " -s [ --spec-file ] PATH (/usr/share/amqp/amqp.0-10.xml)"
print
sys.exit (1)
@@ -143,7 +143,7 @@
Usage ()
sys.exit (1)
-_specpath = "/usr/share/amqp/amqp.0-10-preview.xml"
+_specpath = "/usr/share/amqp/amqp.0-10.xml"
_host = "localhost"
for opt in optlist:
Modified: incubator/qpid/trunk/qpid/python/qpid/managementdata.py
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/managementdata.py?rev=650604&r1=650603&r2=650604&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/managementdata.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/managementdata.py Tue Apr 22 11:15:48
2008
@@ -22,11 +22,13 @@
import qpid
import socket
import struct
+import uuid
from qpid.management import managementChannel, managementClient
from threading import Lock
from disp import Display
from shlex import split
-from qpid.client import Client
+from qpid.connection import Connection
+from qpid.util import connect
class Broker:
def __init__ (self, text):
@@ -159,7 +161,7 @@
self.schema[className] = (configs, insts, methods, events)
def __init__ (self, disp, host, username="guest", password="guest",
- specfile="../../specs/amqp.0-10-preview.xml"):
+ specfile="../../specs/amqp.0-10.xml"):
self.spec = qpid.spec.load (specfile)
self.lock = Lock ()
self.tables = {}
@@ -171,15 +173,13 @@
self.methodsPending = {}
self.broker = Broker (host)
- self.client = Client (self.broker.host, self.broker.port, self.spec)
- self.client.start (response='\x00' + username + '\x00' + password,
- mechanism="PLAIN")
- self.channel = self.client.channel (1)
+ self.conn = Connection (connect (self.broker.host, self.broker.port),
self.spec)
+ self.conn.start ()
self.mclient = managementClient (self.spec, self.ctrlHandler,
self.configHandler,
self.instHandler, self.methodReply)
self.mclient.schemaListener (self.schemaHandler)
- self.mch = self.mclient.addChannel (self.channel)
+ self.mch = self.mclient.addChannel (self.conn.session(str(uuid.uuid4())))
def close (self):
self.mclient.removeChannel (self.mch)
