Author: orudyy
Date: Wed May 8 10:16:14 2013
New Revision: 1480218
URL: http://svn.apache.org/r1480218
Log:
QPID-4818: Remove a redundant providerSearchUrl attribute for Simple Ldap
Authentication Provider
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java?rev=1480218&r1=1480217&r2=1480218&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
Wed May 8 10:16:14 2013
@@ -38,17 +38,16 @@ public class SimpleLDAPAuthenticationMan
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 SimpleLDAPAuthenticationMan
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 SimpleLDAPAuthenticationMan
ldapContextFactory = DEFAULT_LDAP_CONTEXT_FACTORY;
}
- return new SimpleLDAPAuthenticationManager(providerSearchUrl,
providerAuthUrl, searchContext, searchFilter,
+ return new SimpleLDAPAuthenticationManager(providerUrl,
providerAuthUrl, searchContext, searchFilter,
ldapContextFactory);
}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties?rev=1480218&r1=1480217&r2=1480218&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationProviderAttributeDescriptions.properties
Wed May 8 10:16:14 2013
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
