Author: jonathan
Date: Wed Jan 5 01:46:00 2011
New Revision: 1055267
URL: http://svn.apache.org/viewvc?rev=1055267&view=rev
Log:
Allow any SASL mechanism to be specified in command line options.
Previously used a fixed list of SASL mechanisms.
Modified:
qpid/trunk/qpid/tools/src/py/qpid-config
qpid/trunk/qpid/tools/src/py/qpid-printevents
qpid/trunk/qpid/tools/src/py/qpid-queue-stats
qpid/trunk/qpid/tools/src/py/qpid-route
qpid/trunk/qpid/tools/src/py/qpid-stat
Modified: qpid/trunk/qpid/tools/src/py/qpid-config
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-config?rev=1055267&r1=1055266&r2=1055267&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpid-config (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-config Wed Jan 5 01:46:00 2011
@@ -143,7 +143,7 @@ def OptionsAndArguments(argv):
group1.add_option("-t", "--timeout", action="store", type="int",
default=10, metavar="<secs>", help="Maximum time to wait for broker connection
(in seconds)")
group1.add_option("-b", "--bindings", action="store_true", help="Show
bindings in queue or exchange list")
group1.add_option("-a", "--broker-addr", action="store", type="string",
default="localhost:5672", metavar="<address>", help="Maximum time to wait for
broker connection (in seconds)")
- group1.add_option("--sasl-mechanism", action="store",
choices=["EXTERNAL","ANONYMOUS","PLAIN","CRAM-MD5","DIGEST-MD5","GSSAPI"],
metavar="<mech>", help="SASL mechanism for authentication. SASL automatically
picks the most secure available mechanism - use this option to override.")
+ group1.add_option("--sasl-mechanism", action="store", type="string",
metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL,
ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL automatically picks the
most secure available mechanism - use this option to override.")
parser.add_option_group(group1)
group2 = OptionGroup(parser, "Options for Adding Exchanges and Queues")
Modified: qpid/trunk/qpid/tools/src/py/qpid-printevents
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-printevents?rev=1055267&r1=1055266&r2=1055267&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpid-printevents (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-printevents Wed Jan 5 01:46:00 2011
@@ -78,7 +78,7 @@ def main(argv=None):
p = optparse.OptionParser(usage=_usage, description=_description,
formatter=JHelpFormatter())
p.add_option("--heartbeats", action="store_true", default=False, help="Use
heartbeats.")
- p.add_option("--sasl-mechanism", action="store",
choices=["EXTERNAL","ANONYMOUS","PLAIN","CRAM-MD5","DIGEST-MD5","GSSAPI"],
metavar="<mech>", help="SASL mechanism for authentication. SASL automatically
picks the most secure available mechanism - use this option to override.")
+ p.add_option("--sasl-mechanism", action="store", type="string",
metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL,
ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL automatically picks the
most secure available mechanism - use this option to override.")
p.add_option("--require-connection", action="store_true", help="Raise error
if connection can not be established. By default, retries connections that
could not be established, which allows events to be printed as brokers start
and stop.")
p.add_option("--log-level", action="store", choices=["debug", "info",
"warn", "error", "critical"], metavar="<level>", help="Logging level for
connections")
Modified: qpid/trunk/qpid/tools/src/py/qpid-queue-stats
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-queue-stats?rev=1055267&r1=1055266&r2=1055267&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpid-queue-stats (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-queue-stats Wed Jan 5 01:46:00 2011
@@ -125,7 +125,8 @@ def main(argv=None):
p = optparse.OptionParser()
p.add_option('--broker-address','-a', default='localhost' ,
help='broker-addr is in the form: [username/passw...@] hostname | ip-address
[:<port>] \n ex: localhost, 10.1.1.7:10000, broker-host:10000,
guest/gu...@localhost')
p.add_option('--filter','-f' ,default=None ,help='a list of comma separated
queue names (regex are accepted) to show')
- p.add_option("--sasl-mechanism", action="store",
choices=["EXTERNAL","ANONYMOUS","PLAIN","CRAM-MD5","DIGEST-MD5","GSSAPI"],
metavar="<mech>", help="SASL mechanism for authentication. SASL automatically
picks the most secure available mechanism - use this option to override.")
+ p.add_option("--sasl-mechanism", action="store", type="string",
metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL,
ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL automatically picks the
most secure available mechanism - use this option to override.")
+
options, arguments = p.parse_args(args=argv)
Modified: qpid/trunk/qpid/tools/src/py/qpid-route
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-route?rev=1055267&r1=1055266&r2=1055267&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpid-route (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-route Wed Jan 5 01:46:00 2011
@@ -98,7 +98,7 @@ def OptionsAndArguments(argv):
parser.add_option("--ack", action="store", type="int", metavar="<n>",
help="Acknowledge transfers over the bridge in batches of N")
parser.add_option("-t", "--transport", action="store", type="string",
default="tcp", metavar="<transport>", help="Transport to use for links,
defaults to tcp")
- parser.add_option("--sasl-mechanism", action="store",
choices=["EXTERNAL","ANONYMOUS","PLAIN","CRAM-MD5","DIGEST-MD5","GSSAPI"],
metavar="<mech>", help="SASL mechanism for authentication. Used when the client
connects to the destination broker (not for authentication between the source
and destination brokers - that is specified using the [mechanisms] argument to
'add route'). SASL automatically picks the most secure available mechanism -
use this option to override.")
+ parser.add_option("--sasl-mechanism", action="store", type="string",
metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL,
ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). Used when the client connects
to the destination broker (not for authentication between the source and
destination brokers - that is specified using the [mechanisms] argument to 'add
route'). SASL automatically picks the most secure available mechanism - use
this option to override.")
opts, encArgs = parser.parse_args(args=argv)
Modified: qpid/trunk/qpid/tools/src/py/qpid-stat
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-stat?rev=1055267&r1=1055266&r2=1055267&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpid-stat (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-stat Wed Jan 5 01:46:00 2011
@@ -52,7 +52,7 @@ def OptionsAndArguments(argv):
group1 = OptionGroup(parser, "General Options")
group1.add_option("-t", "--timeout", action="store", type="int",
default=10, metavar="<secs>", help="Maximum time to wait for broker connection
(in seconds)")
- group1.add_option("--sasl-mechanism", action="store",
choices=["EXTERNAL","ANONYMOUS","PLAIN","CRAM-MD5","DIGEST-MD5","GSSAPI"],
metavar="<mech>", help="SASL mechanism for authentication. SASL automatically
picks the most secure available mechanism - use this option to override.")
+ group1.add_option("--sasl-mechanism", action="store", type="string",
metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL,
ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL automatically picks the
most secure available mechanism - use this option to override.")
parser.add_option_group(group1)
group2 = OptionGroup(parser, "Display Options")
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
