Move LdapUserSearch into main provider package and separate out its current implementation as it may be used for more than authentication.

core/src/main/java/org/acegisecurity/providers/ldap/authenticator/LdapUserSearch.java → core/src/main/java/org/acegisecurity/providers/ldap/LdapUserSearch.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap.authenticator;
+package org.acegisecurity.providers.ldap;
 
 import org.acegisecurity.providers.ldap.LdapUserInfo;
 

core/src/main/java/org/acegisecurity/providers/ldap/authenticator/AbstractLdapAuthenticator.java

@@ -17,6 +17,7 @@ package org.acegisecurity.providers.ldap.authenticator;
 
 import org.acegisecurity.providers.ldap.LdapAuthenticator;
 import org.acegisecurity.providers.ldap.InitialDirContextFactory;
+import org.acegisecurity.providers.ldap.LdapUserSearch;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 

core/src/main/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearch.java → core/src/main/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearch.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap.authenticator;
+package org.acegisecurity.providers.ldap.search;
 
 import org.acegisecurity.providers.ldap.*;
 import org.acegisecurity.userdetails.UsernameNotFoundException;

core/src/test/java/org/acegisecurity/providers/ldap/authenticator/MockUserSearch.java

@@ -1,6 +1,7 @@
 package org.acegisecurity.providers.ldap.authenticator;
 
 import org.acegisecurity.providers.ldap.LdapUserInfo;
+import org.acegisecurity.providers.ldap.LdapUserSearch;
 
 /**
  * @author Luke Taylor

core/src/test/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearchTests.java → core/src/test/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearchTests.java

@@ -1,8 +1,9 @@
-package org.acegisecurity.providers.ldap.authenticator;
+package org.acegisecurity.providers.ldap.search;
 
 import org.acegisecurity.providers.ldap.AbstractLdapServerTestCase;
 import org.acegisecurity.providers.ldap.DefaultInitialDirContextFactory;
 import org.acegisecurity.providers.ldap.LdapUserInfo;
+import org.acegisecurity.providers.ldap.search.FilterBasedLdapUserSearch;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
 import org.acegisecurity.BadCredentialsException;