diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactory.java b/core/src/main/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactory.java deleted file mode 100644 index dfb682856d..0000000000 --- a/core/src/main/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2004, 2005 Acegi Technology Pty Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.acegisecurity.providers.ldap; - -/** - * - * @deprecated moved to org.acegisecurity.ldap - * - * @author Robert Sanders - * @author Luke Taylor - * @version $Id$ - * - */ -public class DefaultInitialDirContextFactory extends org.acegisecurity.ldap.DefaultInitialDirContextFactory { - - - //~ Constructors =========================================================== - - public DefaultInitialDirContextFactory(String providerUrl) { - super(providerUrl); - } -} diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/InitialDirContextFactory.java b/core/src/main/java/org/acegisecurity/providers/ldap/InitialDirContextFactory.java deleted file mode 100644 index cf3795db73..0000000000 --- a/core/src/main/java/org/acegisecurity/providers/ldap/InitialDirContextFactory.java +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2004, 2005 Acegi Technology Pty Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.acegisecurity.providers.ldap; - - -/** - * Access point for obtaining LDAP contexts. - * - * @deprecated moved to org.acegisecurity.ldap - * - * @author Luke Taylor - * @version $Id$ - */ -public interface InitialDirContextFactory extends org.acegisecurity.ldap.InitialDirContextFactory { -} diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/LdapUserSearch.java b/core/src/main/java/org/acegisecurity/providers/ldap/LdapUserSearch.java deleted file mode 100644 index 35a81de3d0..0000000000 --- a/core/src/main/java/org/acegisecurity/providers/ldap/LdapUserSearch.java +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2004, 2005 Acegi Technology Pty Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.acegisecurity.providers.ldap; - -/** - * Obtains a user's information from the LDAP directory given a login name. - *

- * May be optionally used to configure the LDAP authentication implementation when - * a more sophisticated approach is required than just using a simple username->DN - * mapping. - *

- * - * @deprecated moved to org.acegisecurity.ldap - * @author Luke Taylor - * @version $Id$ - */ -public interface LdapUserSearch extends org.acegisecurity.ldap.LdapUserSearch { - -} diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearch.java b/core/src/main/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearch.java deleted file mode 100644 index 42273ec9c3..0000000000 --- a/core/src/main/java/org/acegisecurity/providers/ldap/search/FilterBasedLdapUserSearch.java +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2004, 2005 Acegi Technology Pty Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.acegisecurity.providers.ldap.search; - -import org.acegisecurity.ldap.InitialDirContextFactory; - - -/** - * LdapUserSearch implementation which uses an Ldap filter to locate the user. - * - * @deprecated Moved to org.acegisecurity.ldap.search - * @author Robert Sanders - * @author Luke Taylor - * @version $Id$ - */ -public class FilterBasedLdapUserSearch extends org.acegisecurity.ldap.search.FilterBasedLdapUserSearch { - public FilterBasedLdapUserSearch(String searchBase, String searchFilter, InitialDirContextFactory initialDirContextFactory) { - super(searchBase, searchFilter, initialDirContextFactory); - } - -} diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/search/package.html b/core/src/main/java/org/acegisecurity/providers/ldap/search/package.html deleted file mode 100644 index 67544641b9..0000000000 --- a/core/src/main/java/org/acegisecurity/providers/ldap/search/package.html +++ /dev/null @@ -1,6 +0,0 @@ - - -LdapUserSearch implementations. These may be used by the -authenticator to locate the user in the directory. - -