From 79195fadf1ef11870ff4a1d6c4b3b66f2a5e6829 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sat, 22 Sep 2007 10:34:46 +0000
Subject: [PATCH] SEC-562: Tidied up some packaging errors in ntlm module.

---
 ntlm/pom.xml                                  | 10 ++++-----
 .../security/ui/ntlm/NtlmBaseException.java   |  2 +-
 .../ui/ntlm/NtlmProcessingFilter.java         | 22 +++++++++----------
 .../ntlm/NtlmProcessingFilterEntryPoint.java  |  4 ++--
 .../ui/ntlm/NtlmType2MessageException.java    |  4 ++--
 ...lmUsernamePasswordAuthenticationToken.java |  2 +-
 .../NtlmAwareLdapAuthenticator.java           | 10 ++++-----
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ntlm/pom.xml b/ntlm/pom.xml
index 47fac464f9..efb1c30311 100755
--- a/ntlm/pom.xml
+++ b/ntlm/pom.xml
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.acegisecurity</groupId>
-		<artifactId>acegi-security-parent</artifactId>
+		<groupId>org.springframework.security</groupId>
+		<artifactId>spring-security-parent</artifactId>
 		<version>2.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
@@ -11,8 +11,8 @@
 
 	<dependencies>
 		<dependency>
-	      <groupId>org.acegisecurity</groupId>
-	      <artifactId>acegi-security</artifactId>
+	      <groupId>org.springframework.security</groupId>
+	      <artifactId>spring-security-core</artifactId>
 	      <version>${project.version}</version>
 		</dependency>
 		<!-- SMT NTLM-->
@@ -62,4 +62,4 @@
 		</resources>
 	</build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmBaseException.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmBaseException.java
index 12c1325bcb..da91b33e6a 100755
--- a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmBaseException.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmBaseException.java
@@ -15,7 +15,7 @@
 
 package org.springframework.security.ui.ntlm;
 
-import org.acegisecurity.AuthenticationException;
+import org.springframework.security.AuthenticationException;
 
 /**
  * Base class for NTLM exceptions so that it is easier to distinguish them
diff --git a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java
index 2777772c6f..57dde40b3b 100755
--- a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java
@@ -37,17 +37,17 @@ import jcifs.smb.SmbException;
 import jcifs.smb.SmbSession;
 import jcifs.util.Base64;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationCredentialsNotFoundException;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.InsufficientAuthenticationException;
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
-import org.acegisecurity.ui.WebAuthenticationDetails;
-import org.acegisecurity.ui.webapp.AuthenticationProcessingFilter;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationCredentialsNotFoundException;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.AuthenticationManager;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.InsufficientAuthenticationException;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken;
+import org.springframework.security.ui.WebAuthenticationDetails;
+import org.springframework.security.ui.webapp.AuthenticationProcessingFilter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java
index d46eb59ac9..fad6e2cabc 100755
--- a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java
@@ -15,8 +15,8 @@
 
 package org.springframework.security.ui.ntlm;
 
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.ui.AuthenticationEntryPoint;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.ui.AuthenticationEntryPoint;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmType2MessageException.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmType2MessageException.java
index d67c849419..a3cf285940 100755
--- a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmType2MessageException.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmType2MessageException.java
@@ -15,8 +15,8 @@
 
 package org.springframework.security.ui.ntlm;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.Authentication;
+import org.springframework.security.context.SecurityContextHolder;
 
 /**
  * Contains the NTLM Type 2 message that is sent back to the client during
diff --git a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java
index ba248e87cd..8612993af5 100755
--- a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java
@@ -17,7 +17,7 @@ package org.springframework.security.ui.ntlm;
 
 import jcifs.smb.NtlmPasswordAuthentication;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 /**
  * An NTLM-specific {@link UsernamePasswordAuthenticationToken} that allows
diff --git a/ntlm/src/main/java/org/springframework/security/ui/ntlm/ldap/authenticator/NtlmAwareLdapAuthenticator.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/ldap/authenticator/NtlmAwareLdapAuthenticator.java
index 514e217ebb..aacec3b506 100755
--- a/ntlm/src/main/java/org/springframework/security/ui/ntlm/ldap/authenticator/NtlmAwareLdapAuthenticator.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/ldap/authenticator/NtlmAwareLdapAuthenticator.java
@@ -5,11 +5,11 @@ package org.springframework.security.ui.ntlm.ldap.authenticator;
 
 import java.util.Iterator;
 
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ldap.InitialDirContextFactory;
-import org.acegisecurity.ldap.SpringSecurityLdapTemplate;
-import org.acegisecurity.providers.ldap.authenticator.BindAuthenticator;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.Authentication;
+import org.springframework.security.ldap.InitialDirContextFactory;
+import org.springframework.security.ldap.SpringSecurityLdapTemplate;
+import org.springframework.security.providers.ldap.authenticator.BindAuthenticator;
 import org.springframework.security.ui.ntlm.NtlmUsernamePasswordAuthenticationToken;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;