Modified: qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java (original) +++ qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java Mon Oct 21 22:04:51 2013 @@ -69,7 +69,7 @@ import org.apache.qpid.qmf2.util.GetOpt; * guest/guest@localhost * --sasl-mechanism=<mech> * SASL mechanism for authentication (e.g. EXTERNAL, - * ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL + * ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL * automatically picks the most secure available * mechanism - use this option to override. * </pre> @@ -91,7 +91,7 @@ public final class ConnectionLogger impl " guest/guest@localhost\n" + " --sasl-mechanism=<mech>\n" + " SASL mechanism for authentication (e.g. EXTERNAL,\n" + - " ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL\n" + + " ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL\n" + " automatically picks the most secure available\n" + " mechanism - use this option to override.\n";
Modified: qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java (original) +++ qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java Mon Oct 21 22:04:51 2013 @@ -120,7 +120,7 @@ import org.apache.qpid.qmf2.util.GetOpt; * seconds) * --sasl-mechanism=<mech> * SASL mechanism for authentication (e.g. EXTERNAL, - * ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL + * ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL * automatically picks the most secure available * mechanism - use this option to override. * @@ -139,8 +139,6 @@ import org.apache.qpid.qmf2.util.GetOpt; * --durable The new queue or exchange is durable. * * Options for Adding Queues: - * --cluster-durable The new queue becomes durable if there is only one - * functioning cluster node * --file-count=<n> Number of files in queue's persistence journal * --file-size=<n> File size in pages (64Kib/page) * --max-queue-size=<n> @@ -258,7 +256,7 @@ public final class QpidConfig " seconds)\n" + " --sasl-mechanism=<mech>\n" + " SASL mechanism for authentication (e.g. EXTERNAL,\n" + - " ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL\n" + + " ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL\n" + " automatically picks the most secure available\n" + " mechanism - use this option to override.\n" + "\n" + @@ -277,8 +275,6 @@ public final class QpidConfig " --durable The new queue or exchange is durable.\n" + "\n" + " Options for Adding Queues:\n" + - " --cluster-durable The new queue becomes durable if there is only one\n" + - " functioning cluster node\n" + " --file-count=<n> Number of files in queue's persistence journal\n" + " --file-size=<n> File size in pages (64Kib/page)\n" + " --max-queue-size=<n>\n" + @@ -337,7 +333,6 @@ public final class QpidConfig private String _altExchange = null; private boolean _passive = false; private boolean _durable = false; - private boolean _clusterDurable = false; private boolean _ifEmpty = true; private boolean _ifUnused = true; private long _fileCount = 8; @@ -364,7 +359,6 @@ public final class QpidConfig private static final String MAX_QUEUE_SIZE = "qpid.max_size"; private static final String MAX_QUEUE_COUNT = "qpid.max_count"; private static final String POLICY_TYPE = "qpid.policy_type"; - private static final String CLUSTER_DURABLE = "qpid.persist_last_node"; private static final String LVQ = "qpid.last_value_queue"; private static final String LVQNB = "qpid.last_value_queue_no_browse"; private static final String MSG_SEQUENCE = "qpid.msg_sequence"; @@ -388,7 +382,6 @@ public final class QpidConfig SPECIAL_ARGS.add(MAX_QUEUE_SIZE); SPECIAL_ARGS.add(MAX_QUEUE_COUNT); SPECIAL_ARGS.add(POLICY_TYPE); - SPECIAL_ARGS.add(CLUSTER_DURABLE); SPECIAL_ARGS.add(LVQ); SPECIAL_ARGS.add(LVQNB); SPECIAL_ARGS.add(MSG_SEQUENCE); @@ -673,11 +666,6 @@ for (Map.Entry<String, Object> entry : System.out.printf("--durable "); } - if (args.containsKey(CLUSTER_DURABLE) && QmfData.getLong(args.get(CLUSTER_DURABLE)) == 1) - { - System.out.printf("--cluster-durable "); - } - if (queue.getBooleanValue("autoDelete")) { System.out.printf("auto-del "); @@ -936,11 +924,6 @@ for (Map.Entry<String, Object> entry : properties.put(POLICY_TYPE, "ring_strict"); } - if (_clusterDurable) - { - properties.put(CLUSTER_DURABLE, 1l); - } - if (_order.equals("lvq")) { properties.put(LVQ, 1l); @@ -1255,7 +1238,7 @@ for (Map.Entry<String, Object> entry : */ public QpidConfig(final String[] args) { - String[] longOpts = {"help", "durable", "cluster-durable", "bindings", "broker-addr=", "file-count=", + String[] longOpts = {"help", "durable", "bindings", "broker-addr=", "file-count=", "file-size=", "max-queue-size=", "max-queue-count=", "limit-policy=", "order=", "sequence", "ive", "generate-queue-events=", "force", "force-if-not-empty", "force-if-used", "alternate-exchange=", "passive", "timeout=", "file=", "flow-stop-size=", @@ -1313,11 +1296,6 @@ for (Map.Entry<String, Object> entry : _durable = true; } - if (opt[0].equals("--cluster-durable")) - { - _clusterDurable = true; - } - if (opt[0].equals("--file-count")) { _fileCount = Long.parseLong(opt[1]); Modified: qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java (original) +++ qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java Mon Oct 21 22:04:51 2013 @@ -78,7 +78,7 @@ import org.apache.qpid.messaging.util.Ad * (default qpidd) * --sasl-mechanism=<mech> * SASL mechanism for authentication (e.g. EXTERNAL, - * ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL + * ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL * automatically picks the most secure available * mechanism - use this option to override. * </pre> @@ -160,7 +160,7 @@ public final class QpidCtrl " (default qpidd)\n" + " --sasl-mechanism=<mech>\n" + " SASL mechanism for authentication (e.g. EXTERNAL,\n" + - " ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL\n" + + " ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL\n" + " automatically picks the most secure available\n" + " mechanism - use this option to override.\n"; Modified: qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java (original) +++ qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java Mon Oct 21 22:04:51 2013 @@ -66,7 +66,7 @@ import static org.apache.qpid.qmf2.commo * --heartbeats Use heartbeats. * --sasl-mechanism=<mech> * SASL mechanism for authentication (e.g. EXTERNAL, - * ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL + * ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL * automatically picks the most secure available * mechanism - use this option to override. * </pre> @@ -99,7 +99,7 @@ public final class QpidPrintEvents imple " --heartbeats Use heartbeats.\n" + " --sasl-mechanism=<mech>\n" + " SASL mechanism for authentication (e.g. EXTERNAL,\n" + - " ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL\n" + + " ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL\n" + " automatically picks the most secure available\n" + " mechanism - use this option to override.\n"; Modified: qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java (original) +++ qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java Mon Oct 21 22:04:51 2013 @@ -74,7 +74,7 @@ import org.apache.qpid.qmf2.util.GetOpt; * accepted) to show * --sasl-mechanism=<mech> * SASL mechanism for authentication (e.g. EXTERNAL, - * ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL + * ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL * automatically picks the most secure available * mechanism - use this option to override. * </pre> @@ -125,7 +125,7 @@ public final class QpidQueueStats implem " accepted) to show\n" + " --sasl-mechanism=<mech>\n" + " SASL mechanism for authentication (e.g. EXTERNAL,\n" + - " ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL\n" + + " ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL\n" + " automatically picks the most secure available\n" + " mechanism - use this option to override.\n"; Modified: qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java (original) +++ qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java Mon Oct 21 22:04:51 2013 @@ -106,7 +106,7 @@ import org.apache.qpid.qmf2.util.GetOpt; * N.B. if this gets set too low the fuse may not blow.\n" + * --sasl-mechanism=<mech> * SASL mechanism for authentication (e.g. EXTERNAL, - * ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL + * ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL * automatically picks the most secure available * mechanism - use this option to override. * </pre> @@ -149,7 +149,7 @@ public final class QueueFuse implements " N.B. if this gets set too low the fuse may not blow.\n" + " --sasl-mechanism=<mech>\n" + " SASL mechanism for authentication (e.g. EXTERNAL,\n" + - " ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL\n" + + " ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL\n" + " automatically picks the most secure available\n" + " mechanism - use this option to override.\n"; Modified: qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java (original) +++ qpid/branches/linearstore/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java Mon Oct 21 22:04:51 2013 @@ -34,7 +34,7 @@ import java.util.ArrayList; * <p> * Example usage (paraphrased from QpidConfig): * <pre> - * String[] longOpts = {"help", "durable", "cluster-durable", "bindings", "broker-addr=", "file-count=", + * String[] longOpts = {"help", "durable", "bindings", "broker-addr=", "file-count=", * "file-size=", "max-queue-size=", "max-queue-count=", "limit-policy=", * "order=", "sequence", "ive", "generate-queue-events=", "force", "force-if-not-empty", * "force-if-used", "alternate-exchange=", "passive", "timeout=", "file=", "flow-stop-size=", Modified: qpid/branches/linearstore/qpid/tools/src/py/qmf-tool URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/py/qmf-tool?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/py/qmf-tool (original) +++ qpid/branches/linearstore/qpid/tools/src/py/qmf-tool Mon Oct 21 22:04:51 2013 @@ -28,7 +28,7 @@ from shlex import split from threading import Lock from time import strftime, gmtime from qpid.disp import Display -import cqpid +import qpid_messaging 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 = cqpid.Connection(self.url, **self.conn_options) + self.connection = qpid_messaging.Connection(self.url, **self.conn_options) self.connection.open() self.session = qmf2.ConsoleSession(self.connection, self.qmf_options) self.session.setAgentFilter(self.agent_filter) Modified: qpid/branches/linearstore/qpid/tools/src/py/qpid-config URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/py/qpid-config?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/py/qpid-config (original) +++ qpid/branches/linearstore/qpid/tools/src/py/qpid-config Mon Oct 21 22:04:51 2013 @@ -86,7 +86,6 @@ class Config: self._altern_ex = None self._durable = False self._replicate = None - self._clusterDurable = False self._if_empty = True self._if_unused = True self._fileCount = None @@ -117,7 +116,6 @@ FILESIZE = "qpid.file_size" MAX_QUEUE_SIZE = "qpid.max_size" MAX_QUEUE_COUNT = "qpid.max_count" POLICY_TYPE = "qpid.policy_type" -CLUSTER_DURABLE = "qpid.persist_last_node" LVQ_KEY = "qpid.last_value_queue_key" MSG_SEQUENCE = "qpid.msg_sequence" IVE = "qpid.ive" @@ -136,7 +134,7 @@ REPLICATE = "qpid.replicate" #i.e. the arguments for which there is special processing on add and #list SPECIAL_ARGS=[ - FILECOUNT,FILESIZE,MAX_QUEUE_SIZE,MAX_QUEUE_COUNT,POLICY_TYPE,CLUSTER_DURABLE, + FILECOUNT,FILESIZE,MAX_QUEUE_SIZE,MAX_QUEUE_COUNT,POLICY_TYPE, LVQ_KEY,MSG_SEQUENCE,IVE,QUEUE_EVENT_GENERATION, FLOW_STOP_COUNT,FLOW_RESUME_COUNT,FLOW_STOP_SIZE,FLOW_RESUME_SIZE, MSG_GROUP_HDR_KEY,SHARED_MSG_GROUP,REPLICATE] @@ -174,7 +172,7 @@ def OptionsAndArguments(argv): group1.add_option("-r", "--recursive", action="store_true", help="Show bindings in queue or exchange list") group1.add_option("-b", "--broker", action="store", type="string", metavar="<address>", help="Address of qpidd broker with syntax: [username/password@] hostname | ip-address [:<port>]") group1.add_option("-a", "--broker-addr", action="store", type="string", metavar="<address>") - 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.") + group1.add_option("--sasl-mechanism", action="store", type="string", metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.") group1.add_option("--ssl-certificate", action="store", type="string", metavar="<cert>", help="Client SSL certificate (PEM Format)") group1.add_option("--ssl-key", action="store", type="string", metavar="<key>", help="Client SSL private key (PEM Format)") group1.add_option("--ha-admin", action="store_true", help="Allow connection to a HA backup broker.") @@ -191,7 +189,6 @@ def OptionsAndArguments(argv): parser.add_option_group(group2) group3 = OptionGroup(parser, "Options for Adding Queues") - group3.add_option("--cluster-durable", action="store_true", help="The new queue becomes durable if there is only one functioning cluster node") group3.add_option("--file-count", action="store", type="int", metavar="<n>", help="Number of files in queue's persistence journal") group3.add_option("--file-size", action="store", type="int", metavar="<n>", help="File size in pages (64KiB/page)") group3.add_option("--max-queue-size", action="store", type="int", metavar="<n>", help="Maximum in-memory queue size as bytes") @@ -262,8 +259,6 @@ def OptionsAndArguments(argv): raise Exception("Invalid replication level '%s', should be one of: %s" % (opts.replicate, ", ".join(REPLICATE_LEVELS))) config._replicate = opts.replicate if opts.ha_admin: config._ha_admin = True - if opts.cluster_durable: - config._clusterDurable = True if opts.file: config._file = opts.file if opts.file_count is not None: @@ -441,8 +436,8 @@ class BrokerManager: if not args: args = {} if ex.durable: print "--durable", if REPLICATE in args: print "--replicate=%s" % args[REPLICATE], - if MSG_SEQUENCE in args and args[MSG_SEQUENCE] == 1: print "--sequence", - if IVE in args and args[IVE] == 1: print "--ive", + if MSG_SEQUENCE in args and args[MSG_SEQUENCE]: print "--sequence", + if IVE in args and args[IVE]: print "--ive", if ex.altExchange: print "--alternate-exchange=%s" % ex.altExchange, print @@ -494,7 +489,6 @@ class BrokerManager: if not args: args = {} if q.durable: print "--durable", if REPLICATE in args: print "--replicate=%s" % args[REPLICATE], - if CLUSTER_DURABLE in args and args[CLUSTER_DURABLE] == 1: print "--cluster-durable", if q.autoDelete: print "auto-del", if q.exclusive: print "excl", if FILESIZE in args: print "--file-size=%s" % args[FILESIZE], @@ -598,8 +592,6 @@ class BrokerManager: elif config._limitPolicy == "ring": declArgs[POLICY_TYPE] = "ring" - if config._clusterDurable: - declArgs[CLUSTER_DURABLE] = 1 if config._lvq_key: declArgs[LVQ_KEY] = config._lvq_key if config._eventGeneration: Modified: qpid/branches/linearstore/qpid/tools/src/py/qpid-ha URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/py/qpid-ha?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/py/qpid-ha (original) +++ qpid/branches/linearstore/qpid/tools/src/py/qpid-ha Mon Oct 21 22:04:51 2013 @@ -48,7 +48,7 @@ class Command: usage="%s [options] %s\n\n%s"%(name, " ".join(arg_names), help) self.help = help self.op=optparse.OptionParser(usage) - self.op.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.") + self.op.add_option("--sasl-mechanism", action="store", type="string", metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.") self.op.add_option("--ssl-certificate", action="store", type="string", metavar="<cert>", help="Client SSL certificate (PEM Format)") self.op.add_option("--ssl-key", action="store", type="string", metavar="<key>", help="Client SSL private key (PEM Format)") self.op.add_option("-b", "--broker", action="store", type="string", default="localhost:5672", metavar="<address>", help="Address of qpidd broker with syntax: [username/password@] hostname | ip-address [:<port>]") Modified: qpid/branches/linearstore/qpid/tools/src/py/qpid-printevents URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/py/qpid-printevents?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/py/qpid-printevents (original) +++ qpid/branches/linearstore/qpid/tools/src/py/qpid-printevents Mon Oct 21 22:04:51 2013 @@ -131,7 +131,7 @@ $ %prog guest/guest@broker-host:10000 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", 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("--sasl-mechanism", action="store", type="string", metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.") p.add_option("--ssl-certificate", action="store", type="string", metavar="<cert>", help="Client SSL certificate (PEM Format)") p.add_option("--ssl-key", action="store", type="string", metavar="<key>", help="Client SSL private key (PEM Format)") p.add_option("--ha-admin", action="store_true", help="Allow connection to a HA backup broker.") Modified: qpid/branches/linearstore/qpid/tools/src/py/qpid-queue-stats URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/py/qpid-queue-stats?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/py/qpid-queue-stats (original) +++ qpid/branches/linearstore/qpid/tools/src/py/qpid-queue-stats Mon Oct 21 22:04:51 2013 @@ -125,7 +125,7 @@ def main(argv=None): p = optparse.OptionParser() p.add_option('--broker-address','-a', default='localhost' , help='broker-addr is in the form: [username/password@] hostname | ip-address [:<port>] \n ex: localhost, 10.1.1.7:10000, broker-host:10000, guest/guest@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", 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("--sasl-mechanism", action="store", type="string", metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.") p.add_option("--ssl-certificate", action="store", type="string", metavar="<cert>", help="Client SSL certificate (PEM Format)") p.add_option("--ssl-key", action="store", type="string", metavar="<key>", help="Client SSL private key (PEM Format)") Modified: qpid/branches/linearstore/qpid/tools/src/py/qpid-route URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/py/qpid-route?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/py/qpid-route (original) +++ qpid/branches/linearstore/qpid/tools/src/py/qpid-route Mon Oct 21 22:04:51 2013 @@ -98,7 +98,7 @@ def OptionsAndArguments(argv): help="Maximum number of messages a sender can have outstanding (0=unlimited)") 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("--client-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.") + parser.add_option("--client-sasl-mechanism", action="store", type="string", metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD5, 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.") parser.add_option("--ssl-certificate", action="store", type="string", metavar="<cert>", help="Client SSL certificate (PEM Format)") parser.add_option("--ssl-key", action="store", type="string", metavar="<key>", help="Client SSL private key (PEM Format)") parser.add_option("--ha-admin", action="store_true", help="Allow connection to a HA backup broker.") Modified: qpid/branches/linearstore/qpid/tools/src/py/qpid-stat URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/py/qpid-stat?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/py/qpid-stat (original) +++ qpid/branches/linearstore/qpid/tools/src/py/qpid-stat Mon Oct 21 22:04:51 2013 @@ -69,7 +69,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("--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.") + help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.") group1.add_option("--ssl-certificate", action="store", type="string", metavar="<cert>", help="Client SSL certificate (PEM Format)") group1.add_option("--ssl-key", action="store", type="string", metavar="<key>", help="Client SSL private key (PEM Format)") group1.add_option("--ha-admin", action="store_true", help="Allow connection to a HA backup broker.") Modified: qpid/branches/linearstore/qpid/tools/src/py/qpid-tool URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/tools/src/py/qpid-tool?rev=1534394&r1=1534393&r2=1534394&view=diff ============================================================================== --- qpid/branches/linearstore/qpid/tools/src/py/qpid-tool (original) +++ qpid/branches/linearstore/qpid/tools/src/py/qpid-tool Mon Oct 21 22:04:51 2013 @@ -711,7 +711,7 @@ def parse_options( argv ): parser = optparse.OptionParser(usage=_usage) parser.add_option("-b", "--broker", action="store", type="string", metavar="<address>", help="Address of qpidd broker with syntax: [username/password@] hostname | ip-address [:<port>]") - 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). 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-MD5, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.") parser.add_option("--ssl-certificate", action="store", type="string", metavar="<path>", help="SSL certificate for client authentication") --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
