From 3ba8632e6ea98543f33dfc9d1484cef00f7b5a77 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Wed, 22 Apr 2015 18:01:51 +0100
Subject: [PATCH] Change KerberosLdapContextSource package

- From client to ldap to better indicate that ldap
  classes are optional.
- Fixes #23
---
 .../kerberos/client/{ => ldap}/KerberosLdapContextSource.java   | 2 +-
 .../kerberos/client/docs/KerberosLdapContextSourceConfig.java   | 2 +-
 .../src/main/java/demo/app/WebSecurityConfig.java               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/{ => ldap}/KerberosLdapContextSource.java (98%)

diff --git a/spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/KerberosLdapContextSource.java b/spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/ldap/KerberosLdapContextSource.java
similarity index 98%
rename from spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/KerberosLdapContextSource.java
rename to spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/ldap/KerberosLdapContextSource.java
index 6eb2b2a..84782ad 100644
--- a/spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/KerberosLdapContextSource.java
+++ b/spring-security-kerberos-client/src/main/java/org/springframework/security/kerberos/client/ldap/KerberosLdapContextSource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.kerberos.client;
+package org.springframework.security.kerberos.client.ldap;
 
 import java.security.PrivilegedAction;
 import java.util.Hashtable;
diff --git a/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/docs/KerberosLdapContextSourceConfig.java b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/docs/KerberosLdapContextSourceConfig.java
index dc5906e..2dd97f9 100644
--- a/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/docs/KerberosLdapContextSourceConfig.java
+++ b/spring-security-kerberos-client/src/test/java/org/springframework/security/kerberos/client/docs/KerberosLdapContextSourceConfig.java
@@ -18,8 +18,8 @@ package org.springframework.security.kerberos.client.docs;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.FileSystemResource;
-import org.springframework.security.kerberos.client.KerberosLdapContextSource;
 import org.springframework.security.kerberos.client.config.SunJaasKrb5LoginConfig;
+import org.springframework.security.kerberos.client.ldap.KerberosLdapContextSource;
 import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
 import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
 import org.springframework.security.ldap.userdetails.LdapUserDetailsService;
diff --git a/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java b/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java
index 3c1f403..5f588e1 100644
--- a/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java
+++ b/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java
@@ -11,8 +11,8 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
 import org.springframework.security.kerberos.authentication.KerberosServiceAuthenticationProvider;
 import org.springframework.security.kerberos.authentication.sun.SunJaasKerberosTicketValidator;
-import org.springframework.security.kerberos.client.KerberosLdapContextSource;
 import org.springframework.security.kerberos.client.config.SunJaasKrb5LoginConfig;
+import org.springframework.security.kerberos.client.ldap.KerberosLdapContextSource;
 import org.springframework.security.kerberos.web.authentication.SpnegoAuthenticationProcessingFilter;
 import org.springframework.security.kerberos.web.authentication.SpnegoEntryPoint;
 import org.springframework.security.ldap.authentication.ad.ActiveDirectoryLdapAuthenticationProvider;