diff options
| author | Justin Ross <jross@apache.org> | 2013-09-26 18:19:17 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2013-09-26 18:19:17 +0000 |
| commit | e613a9fd4288ac4337dbdb8374af9830b8f601ab (patch) | |
| tree | 7505dd9626c1c30706d63e31201a5cf778ea1433 /qpid/tools/src/java | |
| parent | 5b3a7ee2ddff893f240990506f8e73f734c3ccae (diff) | |
| download | qpid-python-e613a9fd4288ac4337dbdb8374af9830b8f601ab.tar.gz | |
QPID-5169: CRAM-MD5, not CRAM-MD; a patch from Ernie Allen
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1526637 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/tools/src/java')
7 files changed, 14 insertions, 14 deletions
diff --git a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java index 0ce903c38b..9912b2c228 100644 --- a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java +++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java @@ -76,7 +76,7 @@ import org.apache.qpid.qmf2.util.GetOpt; * -h, --help show this help message and exit * --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. * --whitelist=<whitelist XML document> @@ -131,7 +131,7 @@ public final class ConnectionAudit implements QmfEventListener " -h, --help show this help message and exit\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" + " --whitelist=<whitelist XML document>\n" + diff --git a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java index 869d01f40c..6097c4a752 100644 --- a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java +++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java @@ -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 implements QmfEventListener " 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"; diff --git a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java index 6c08c471d7..e4f44e5db5 100644 --- a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java +++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java @@ -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. * @@ -258,7 +258,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" + diff --git a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java index d35786cce4..0e945a7ed1 100644 --- a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java +++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java @@ -78,7 +78,7 @@ import org.apache.qpid.messaging.util.AddressParser; * (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"; diff --git a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java index d5912344c7..52c8dcec27 100644 --- a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java +++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java @@ -66,7 +66,7 @@ import static org.apache.qpid.qmf2.common.WorkItem.WorkItemType.*; * --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 implements QmfEventListener " --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"; diff --git a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java index 7558da0e28..1d6f1d1bf5 100644 --- a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java +++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java @@ -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 implements QmfEventListener " 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"; diff --git a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java index 324b9bd1b5..f60dbbf4f3 100644 --- a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java +++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java @@ -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 QmfEventListener " 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"; |