summaryrefslogtreecommitdiff
path: root/qpid/java/client/src
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org = rgodfrey = Robert Godfrey rgodfrey@apache.org@apache.org>2014-04-12 23:21:35 +0000
committerRobert Godfrey <rgodfrey@apache.org = rgodfrey = Robert Godfrey rgodfrey@apache.org@apache.org>2014-04-12 23:21:35 +0000
commitb36245c177e3de1aaabecd0d0a6fd94b2b4996fb (patch)
tree94281e721cb9b8f53d3d1f4d49ab93d343ee6ee1 /qpid/java/client/src
parent1e13b57a17562ca81cd9133779ce6fd3d42faee7 (diff)
downloadqpid-python-b36245c177e3de1aaabecd0d0a6fd94b2b4996fb.tar.gz
QPID-5639 : [Java Broker] Correct SASL Mechanism name in client / use consistent name form (SCRAM-SHA-1 not SRAM-SHA1)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586908 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties2
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
index 109ff9942a..7573664187 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
@@ -31,5 +31,5 @@ CRAM-MD5.4=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
AMQPLAIN.5=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
PLAIN.6=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
ANONYMOUS.7=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
-SCRAM-SHA1.8=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
+SCRAM-SHA-1.8=org.apache.qpid.client.security.UsernamePasswordCallbackHandler
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties b/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
index c2cd671bdf..fd52935fe5 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
@@ -19,4 +19,4 @@
AMQPLAIN=org.apache.qpid.client.security.amqplain.AmqPlainSaslClientFactory
CRAM-MD5-HASHED=org.apache.qpid.client.security.crammd5hashed.CRAMMD5HashedSaslClientFactory
ANONYMOUS=org.apache.qpid.client.security.anonymous.AnonymousSaslClientFactory
-SCRAM-SHA1=org.apache.qpid.client.security.scram.ScramSHA1SaslClientFactory
+SCRAM-SHA-1=org.apache.qpid.client.security.scram.ScramSHA1SaslClientFactory