diff options
| author | Robert Godfrey <rgodfrey@apache.org = rgodfrey = Robert Godfrey rgodfrey@apache.org@apache.org> | 2014-04-12 23:21:35 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org = rgodfrey = Robert Godfrey rgodfrey@apache.org@apache.org> | 2014-04-12 23:21:35 +0000 |
| commit | b36245c177e3de1aaabecd0d0a6fd94b2b4996fb (patch) | |
| tree | 94281e721cb9b8f53d3d1f4d49ab93d343ee6ee1 /qpid/java/broker-core/src | |
| parent | 1e13b57a17562ca81cd9133779ce6fd3d42faee7 (diff) | |
| download | qpid-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/broker-core/src')
2 files changed, 6 insertions, 6 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java index a1dcf4e7f2..a8fdaacb23 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java @@ -63,7 +63,7 @@ import org.apache.qpid.server.security.auth.AuthenticationResult; import org.apache.qpid.server.security.auth.UsernamePrincipal; import org.apache.qpid.server.security.auth.sasl.scram.ScramSHA1SaslServer; -@ManagedObject( category = false, type = "SCRAM-SHA1" ) +@ManagedObject( category = false, type = "SCRAM-SHA-1" ) public class ScramSHA1AuthenticationManager extends AbstractAuthenticationManager<ScramSHA1AuthenticationManager> implements PasswordCredentialManagingAuthenticationProvider<ScramSHA1AuthenticationManager>, diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java index 0e6fcde394..8a8543b022 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java @@ -19,19 +19,19 @@ */ package org.apache.qpid.server.security.auth.manager; -import org.apache.qpid.server.model.AuthenticationProvider; -import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.model.ConfiguredObject; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.apache.qpid.server.model.AuthenticationProvider; +import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.ConfiguredObject; + public class ScramSHA1AuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<ScramSHA1AuthenticationManager> { - public static final String PROVIDER_TYPE = "SCRAM-SHA1"; + public static final String PROVIDER_TYPE = "SCRAM-SHA-1"; public static final String ATTRIBUTE_NAME = "name"; |