diff options
| author | Alex Rudyy <orudyy@apache.org> | 2013-05-08 10:19:34 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2013-05-08 10:19:34 +0000 |
| commit | 2a32e7cdaff070e359d7699abb02b12e0dae06ea (patch) | |
| tree | 3b25bc1c4afef4e87e4a39ae2d39eabc3f023187 | |
| parent | 6f2ef35f3a9dc70c9e8fc4c7ee5d920aa477ecee (diff) | |
| download | qpid-python-2a32e7cdaff070e359d7699abb02b12e0dae06ea.tar.gz | |
QPID-4818: Remove a redundant providerSearchUrl attribute for Simple Ldap Authentication Provider
merged from trunk r1480218
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1480219 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 5 insertions, 12 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java index d1f2e9b3ee..55e90178f8 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java @@ -38,17 +38,16 @@ public class SimpleLDAPAuthenticationManagerFactory implements AuthenticationMan public static final String ATTRIBUTE_SEARCH_FILTER = "searchFilter"; public static final String ATTRIBUTE_SEARCH_CONTEXT = "searchContext"; public static final String ATTRIBUTE_PROVIDER_AUTH_URL = "providerAuthUrl"; - public static final String ATTRIBUTE_PROVIDER_SEARCH_URL = "providerSearchUrl"; public static final String ATTRIBUTE_PROVIDER_URL = "providerUrl"; public static final Collection<String> ATTRIBUTES = Collections.<String> unmodifiableList(Arrays.asList( ATTRIBUTE_TYPE, - ATTRIBUTE_LDAP_CONTEXT_FACTORY, - ATTRIBUTE_SEARCH_FILTER, + ATTRIBUTE_PROVIDER_URL, ATTRIBUTE_SEARCH_CONTEXT, + ATTRIBUTE_SEARCH_FILTER, ATTRIBUTE_PROVIDER_AUTH_URL, - ATTRIBUTE_PROVIDER_SEARCH_URL, - ATTRIBUTE_PROVIDER_URL)); + ATTRIBUTE_LDAP_CONTEXT_FACTORY + )); @Override public AuthenticationManager createInstance(Map<String, Object> attributes) @@ -58,11 +57,6 @@ public class SimpleLDAPAuthenticationManagerFactory implements AuthenticationMan return null; } String providerUrl = (String) attributes.get(ATTRIBUTE_PROVIDER_URL); - String providerSearchUrl = (String) attributes.get(ATTRIBUTE_PROVIDER_SEARCH_URL); - if (providerSearchUrl == null) - { - providerSearchUrl = providerUrl; - } String providerAuthUrl = (String) attributes.get(ATTRIBUTE_PROVIDER_AUTH_URL); if (providerAuthUrl == null) { @@ -76,7 +70,7 @@ public class SimpleLDAPAuthenticationManagerFactory implements AuthenticationMan ldapContextFactory = DEFAULT_LDAP_CONTEXT_FACTORY; } - return new SimpleLDAPAuthenticationManager(providerSearchUrl, providerAuthUrl, searchContext, searchFilter, + return new SimpleLDAPAuthenticationManager(providerUrl, providerAuthUrl, searchContext, searchFilter, ldapContextFactory); } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties index 1fadfcf758..5439c7fff5 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties @@ -20,5 +20,4 @@ ldapContextFactory= LDAP context factory searchFilter=Search filter* searchContext=Search context* providerAuthUrl=LDAP authentication URL -providerSearchUrl=LDAP search URL providerUrl=LDAP server URL*
\ No newline at end of file |