SEC-562: Tidied up some packaging errors in ntlm module.

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>
+</project>

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

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;

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;

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

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

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;