SEC-562: Repackaging adapters module.

adapters/cas/pom.xml

@@ -1,12 +1,12 @@
 <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-adapters</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-adapters</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>acegi-security-cas</artifactId>
-  <name>Acegi Security System for Spring - CAS adapter</name>
+  <artifactId>spring-security-cas</artifactId>
+  <name>Spring Security - CAS adapter</name>
   <dependencies>
     <dependency>
       <groupId>cas</groupId>

adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandler.java → adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java

@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.cas;
+package org.springframework.security.adapters.cas;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.AuthenticationManager;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

adapters/cas/src/main/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxy.java → adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.cas;
+package org.springframework.security.adapters.cas;
 
 import edu.yale.its.tp.cas.auth.PasswordHandler;
 
@@ -46,7 +46,7 @@ import javax.servlet.http.HttpServletRequest;
  * authentication requests to that instance.</p>
  *  <p>To configure CAS to use this class, edit CAS' <code>web.xml</code> and define the
  * <code>edu.yale.its.tp.cas.authHandler</code> context parameter with the value
- * <code>org.acegisecurity.adapters.cas.CasPasswordHandlerProxy</code>.</p>
+ * <code>org.springframework.security.adapters.cas.CasPasswordHandlerProxy</code>.</p>
  *
  * @author Ben Alex
  * @version $Id$

adapters/cas/src/main/java/org/acegisecurity/adapters/cas3/CasAuthenticationHandler.java → adapters/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java

@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.cas3;
+package org.springframework.security.adapters.cas3;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationManager;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -65,7 +65,7 @@ public final class CasAuthenticationHandler extends AbstractUsernamePasswordAuth
 
         try {
             this.authenticationManager.authenticate(authenticationRequest);
-        } catch (final org.acegisecurity.AuthenticationException e) {
+        } catch (final org.springframework.security.AuthenticationException e) {
             if (log.isDebugEnabled()) {
                 log.debug("Authentication request for " + credentials.getUsername() + " failed: " + e.toString(), e);
             }

adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml → adapters/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml

@@ -24,7 +24,7 @@
 <beans>
 
 	<!-- Data access object which stores authentication information -->
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
+	<bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
   		<property name="userMap">
 			<value>
 				marissa=koala,ROLES_IGNORED_BY_CAS
@@ -35,11 +35,11 @@
 		</property>
 	</bean>
 	
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
+	<bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
      	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
 	</bean>
 
-	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
+	<bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
 		<property name="providers">
 		  <list>
 		    <ref bean="daoAuthenticationProvider"/>
@@ -47,7 +47,7 @@
 		</property>
 	</bean>
 
-	<bean id="casPasswordHandler" class="org.acegisecurity.adapters.cas.CasPasswordHandler">
+	<bean id="casPasswordHandler" class="org.springframework.security.adapters.cas.CasPasswordHandler">
 		<property name="authenticationManager"><ref bean="authenticationManager"/></property>
 	</bean>
 </beans>

adapters/cas/src/main/resources/org/acegisecurity/adapters/cas3/applicationContext.xml → adapters/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml

@@ -27,7 +27,7 @@
 <beans>
 
 	<!-- Data access object which stores authentication information -->
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
+	<bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
   		<property name="userMap">
 			<value>
 				marissa=koala,ROLES_IGNORED_BY_CAS
@@ -38,11 +38,11 @@
 		</property>
 	</bean>
 	
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
+	<bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
      	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
 	</bean>
 
-	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
+	<bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
 		<property name="providers">
 		  <list>
 		    <ref bean="daoAuthenticationProvider"/>
@@ -50,7 +50,7 @@
 		</property>
 	</bean>
 	
-	<bean id="casAuthenticationHandler" class="org.acegisecurity.adapters.cas3.CasAuthenticationHandler">
+	<bean id="casAuthenticationHandler" class="org.springframework.security.adapters.cas3.CasAuthenticationHandler">
 		<property name="authenticationManager" ref="authenticationManager" />
 	</bean>
 </beans>

adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerProxyTests.java → adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.cas;
+package org.springframework.security.adapters.cas;
 
 import junit.framework.TestCase;
 
@@ -54,7 +54,7 @@ public class CasPasswordHandlerProxyTests extends TestCase {
 
     public void testDetectsIfHttpServletRequestNotPassed() {
         CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy(
-                "org/acegisecurity/adapters/cas/applicationContext-valid.xml");
+                "org/springframework/security/adapters/cas/applicationContext-valid.xml");
 
         try {
             proxy.authenticate(null, "x", "y");
@@ -66,7 +66,7 @@ public class CasPasswordHandlerProxyTests extends TestCase {
 
     public void testDetectsMissingDelegate() {
         CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy(
-                "org/acegisecurity/adapters/cas/applicationContext-invalid.xml");
+                "org/springframework/security/adapters/cas/applicationContext-invalid.xml");
 
         try {
             proxy.authenticate(new MockHttpServletRequest(), "x", "y");
@@ -78,7 +78,7 @@ public class CasPasswordHandlerProxyTests extends TestCase {
 
     public void testNormalOperation() {
         CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy(
-                "org/acegisecurity/adapters/cas/applicationContext-valid.xml");
+                "org/springframework/security/adapters/cas/applicationContext-valid.xml");
         assertTrue(proxy.authenticate(new MockHttpServletRequest(), "marissa", "koala"));
         assertFalse(proxy.authenticate(new MockHttpServletRequest(), "marissa", "WRONG_PASSWORD"));
         assertFalse(proxy.authenticate(new MockHttpServletRequest(), "INVALID_USER_NAME", "WRONG_PASSWORD"));

adapters/cas/src/test/java/org/acegisecurity/adapters/cas/CasPasswordHandlerTests.java → adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java

@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.cas;
+package org.springframework.security.adapters.cas;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.MockAuthenticationManager;
+import org.springframework.security.MockAuthenticationManager;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 

adapters/cas/src/test/java/org/acegisecurity/adapters/cas3/CasAuthenticationHandlerTests.java → adapters/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java

@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.cas3;
+package org.springframework.security.adapters.cas3;
 
-import org.acegisecurity.AuthenticationManager;
+import org.springframework.security.AuthenticationManager;
 
 import org.jasig.cas.authentication.handler.AuthenticationException;
 import org.jasig.cas.authentication.principal.UsernamePasswordCredentials;
@@ -38,7 +38,7 @@ public class CasAuthenticationHandlerTests extends AbstractDependencyInjectionSp
     //~ Methods ========================================================================================================
 
     protected String[] getConfigLocations() {
-        return new String[] {"/org/acegisecurity/adapters/cas/applicationContext-valid.xml"};
+        return new String[] {"/org/springframework/security/adapters/cas/applicationContext-valid.xml"};
     }
 
     private UsernamePasswordCredentials getCredentialsFor(final String username, final String password) {

adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml → adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml

@@ -20,7 +20,7 @@
 
 <beans>
 
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
+	<bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
   		<property name="userMap">
 			<value>
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -31,11 +31,11 @@
 		</property>
 	</bean>
 	
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
+	<bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
      	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
  	</bean>
 
-	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
+	<bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
 		<property name="providers">
 		  <list>
 		    <ref bean="daoAuthenticationProvider"/>

adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml → adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml

@@ -20,7 +20,7 @@
 
 <beans>
 
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
+	<bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
   		<property name="userMap">
 			<value>
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -31,11 +31,11 @@
 		</property>
 	</bean>
 	
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
+	<bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
      	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
 	</bean>
 
-	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
+	<bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
 		<property name="providers">
 		  <list>
 		    <ref bean="daoAuthenticationProvider"/>
@@ -43,7 +43,7 @@
 		</property>
 	</bean>
 
-	<bean id="casPasswordHandler" class="org.acegisecurity.adapters.cas.CasPasswordHandler">
+	<bean id="casPasswordHandler" class="org.springframework.security.adapters.cas.CasPasswordHandler">
 		<property name="authenticationManager"><ref bean="authenticationManager"/></property>
 	</bean>
 </beans>

adapters/catalina/pom.xml

@@ -1,12 +1,12 @@
 <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-adapters</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-adapters</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>acegi-security-catalina</artifactId>
-  <name>Acegi Security System for Spring - Catalina adapter</name>
+  <artifactId>spring-security-catalina</artifactId>
+  <name>Spring Security - Catalina adapter</name>
   <dependencies>
     <dependency>
       <groupId>tomcat</groupId>

adapters/catalina/src/main/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealm.java → adapters/catalina/src/main/java/org/springframework/security/adapters/catalina/CatalinaAcegiUserRealm.java

@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.catalina;
+package org.springframework.security.adapters.catalina;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.AuthenticationManager;
 
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
+import org.springframework.security.adapters.PrincipalAcegiUserToken;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.LifecycleException;

adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml → adapters/catalina/src/main/resources/org/springframework/security/adapters/catalinaAdapterTest-invalid.xml

@@ -22,7 +22,7 @@
 <beans>
 
 	<!-- Data access object which stores authentication information -->
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
+	<bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
   		<property name="userMap">
 			<value>
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR

adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml → adapters/catalina/src/main/resources/org/springframework/security/adapters/catalinaAdapterTest-valid.xml

@@ -22,7 +22,7 @@
 <beans>
 
 	<!-- Data access object which stores authentication information -->
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
+	<bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
   		<property name="userMap">
 			<value>
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -34,13 +34,13 @@
 	</bean>
 	
 	<!-- Authentication provider that queries our data access object  -->
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
+	<bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
      	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
      	<property name="forcePrincipalAsString"><value>true</value></property>
 	</bean>
 
 	<!-- The authentication manager that iterates through our only authentication provider -->
-	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
+	<bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
 		<property name="providers">
 		  <list>
 		    <ref bean="daoAuthenticationProvider"/>

adapters/catalina/src/test/java/org/acegisecurity/adapters/catalina/CatalinaAcegiUserRealmTests.java → adapters/catalina/src/test/java/org/springframework/security/adapters/catalina/CatalinaAcegiUserRealmTests.java

@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.catalina;
+package org.springframework.security.adapters.catalina;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
+import org.springframework.security.adapters.PrincipalAcegiUserToken;
 
 import org.apache.catalina.LifecycleException;
 
@@ -62,7 +62,7 @@ public class CatalinaAcegiUserRealmTests extends TestCase {
         throws Exception {
         CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
 
-        URL url = Thread.currentThread().getContextClassLoader().getResource("org/acegisecurity/adapters/" + fileName);
+        URL url = Thread.currentThread().getContextClassLoader().getResource("org/springframework/security/adapters/" + fileName);
 
         if (url == null) {
             throw new Exception("Could not find " + fileName + " - cannot continue");

adapters/jboss/pom.xml

@@ -1,12 +1,12 @@
 <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-adapters</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-adapters</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>acegi-security-jboss</artifactId>
-  <name>Acegi Security System for Spring - JBoss adapter</name>
+  <artifactId>spring-security-jboss</artifactId>
+  <name>Spring Security - JBoss adapter</name>
   <dependencies>
     <dependency>
       <groupId>jboss</groupId>

adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModule.java → adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/JbossAcegiLoginModule.java

@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.jboss;
+package org.springframework.security.adapters.jboss;
 
-import org.acegisecurity.AccountExpiredException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
-import org.acegisecurity.CredentialsExpiredException;
+import org.springframework.security.AccountExpiredException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.AuthenticationManager;
+import org.springframework.security.CredentialsExpiredException;
 
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
+import org.springframework.security.adapters.PrincipalAcegiUserToken;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.jboss.security.SimpleGroup;
 import org.jboss.security.SimplePrincipal;

adapters/jboss/src/main/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilter.java → adapters/jboss/src/main/java/org/springframework/security/adapters/jboss/JbossIntegrationFilter.java

@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.jboss;
+package org.springframework.security.adapters.jboss;
 
-import org.acegisecurity.Authentication;
+import org.springframework.security.Authentication;
 
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.context.HttpSessionContextIntegrationFilter;
-import org.acegisecurity.context.SecurityContext;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.context.HttpSessionContextIntegrationFilter;
+import org.springframework.security.context.SecurityContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossAcegiLoginModuleTests.java → adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/JbossAcegiLoginModuleTests.java

@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.jboss;
+package org.springframework.security.adapters.jboss;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
+import org.springframework.security.adapters.PrincipalAcegiUserToken;
 
 import org.jboss.security.SimplePrincipal;
 import org.jboss.security.SimpleGroup;
@@ -76,7 +76,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
         Properties props = new Properties();
         props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-invalid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-invalid.xml");
 
         try {
             adapter.initialize(null, null, null, props);
@@ -116,7 +116,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
 
         Properties props = new Properties();
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
 
         try {
             adapter.initialize(null, null, null, props);
@@ -127,7 +127,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
 
         props = new Properties();
         props.put("key", "");
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
 
         try {
             adapter.initialize(null, null, null, props);
@@ -158,7 +158,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
         Properties props = new Properties();
         props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
 
         Subject subject = new Subject();
 
@@ -176,7 +176,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
         Properties props = new Properties();
         props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.initialize(null, null, null, props);
         assertTrue(true);
     }
@@ -186,7 +186,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
         Properties props = new Properties();
         props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
 
         Subject subject = new Subject();
         CallbackHandler callback = new MockCallbackHandler("marissa", "kangaroo");
@@ -206,7 +206,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
         Properties props = new Properties();
         props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
 
         Subject subject = new Subject();
         CallbackHandler callback = new MockCallbackHandler("melissa", "koala");
@@ -225,7 +225,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
         Properties props = new Properties();
         props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
 
         Subject subject = new Subject();
         CallbackHandler callback = new MockCallbackHandler("marissa", "koala");
@@ -252,7 +252,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
         Properties props = new Properties();
         props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
 
         Subject subject = new Subject();
         CallbackHandler callback = new MockCallbackHandler("marissa", null);
@@ -272,7 +272,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
         Properties props = new Properties();
         props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
 
         Subject subject = new Subject();
         CallbackHandler callback = new MockCallbackHandler(null, null);
@@ -292,7 +292,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
         Properties props = new Properties();
         props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
 
         Subject subject = new Subject();
         CallbackHandler callback = new MockCallbackHandler(null, "kangaroo");
@@ -311,7 +311,7 @@ public class JbossAcegiLoginModuleTests extends TestCase {
         JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
         Properties props = new Properties();
         props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
+        props.put("appContextLocation", "org/springframework/security/adapters/adaptertest-valid.xml");
 
         Subject subject = new Subject();
         CallbackHandler callback = new MockCallbackHandler("marissa", "koala");

adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/JbossIntegrationFilterTests.java → adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/JbossIntegrationFilterTests.java

@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.jboss;
+package org.springframework.security.adapters.jboss;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
+import org.springframework.security.adapters.PrincipalAcegiUserToken;
 
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.context.SecurityContextImpl;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextImpl;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 

adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockInitialContext.java → adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockInitialContext.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.jboss;
+package org.springframework.security.adapters.jboss;
 
 import java.util.Hashtable;
 

adapters/jboss/src/test/java/org/acegisecurity/adapters/jboss/MockJbossIntegrationFilter.java → adapters/jboss/src/test/java/org/springframework/security/adapters/jboss/MockJbossIntegrationFilter.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.jboss;
+package org.springframework.security.adapters.jboss;
 
 import javax.naming.Context;
 import javax.naming.NamingException;

adapters/jetty/pom.xml

@@ -1,12 +1,12 @@
 <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-adapters</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-adapters</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>acegi-security-jetty</artifactId>
-  <name>Acegi Security System for Spring - Jetty adapter</name>
+  <artifactId>spring-security-jetty</artifactId>
+  <name>Spring Security - Jetty adapter</name>
   <dependencies>
     <dependency>
       <groupId>jetty</groupId>

adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealm.java → adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/JettyAcegiUserRealm.java

@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.jetty;
+package org.springframework.security.adapters.jetty;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.AuthenticationManager;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

adapters/jetty/src/main/java/org/acegisecurity/adapters/jetty/JettyAcegiUserToken.java → adapters/jetty/src/main/java/org/springframework/security/adapters/jetty/JettyAcegiUserToken.java

@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.jetty;
+package org.springframework.security.adapters.jetty;
 
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.GrantedAuthority;
 
-import org.acegisecurity.adapters.AbstractAdapterAuthenticationToken;
+import org.springframework.security.adapters.AbstractAdapterAuthenticationToken;
 
 import org.mortbay.http.UserPrincipal;
 
 
 /**
- * A Jetty compatible {@link org.acegisecurity.Authentication} object.
+ * A Jetty compatible {@link org.springframework.security.Authentication} object.
  *
  * @author Ben Alex
  * @version $Id$

adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserRealmTests.java → adapters/jetty/src/test/java/org/springframework/security/adapters/jetty/JettyAcegiUserRealmTests.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.jetty;
+package org.springframework.security.adapters.jetty;
 
 import junit.framework.TestCase;
 
@@ -50,7 +50,7 @@ public class JettyAcegiUserRealmTests extends TestCase {
 
     private JettyAcegiUserRealm makeAdapter(String fileName)
         throws Exception {
-        String useFile = "org/acegisecurity/adapters/" + fileName;
+        String useFile = "org/springframework/security/adapters/" + fileName;
 
         return new JettyAcegiUserRealm(REALM_NAME, ADAPTER_KEY, useFile);
     }

adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java → adapters/jetty/src/test/java/org/springframework/security/adapters/jetty/JettyAcegiUserTokenTests.java

@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.jetty;
+package org.springframework.security.adapters.jetty;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
 
 /**

adapters/pom.xml

@@ -1,17 +1,17 @@
 <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>
-  <artifactId>acegi-security-adapters</artifactId>
-  <name>Acegi Security System for Spring - Adapters</name>
+  <artifactId>spring-security-adapters</artifactId>
+  <name>Spring Security System for Spring - Adapters</name>
   <packaging>pom</packaging>
   <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>
     <dependency>

adapters/resin/pom.xml

@@ -1,12 +1,12 @@
 <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-adapters</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-adapters</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>acegi-security-resin</artifactId>
-  <name>Acegi Security System for Spring - Resin adapter</name>
+  <artifactId>spring-security-resin</artifactId>
+  <name>Spring Security - Resin adapter</name>
   <dependencies>
     <dependency>
       <groupId>com.caucho</groupId>

adapters/resin/src/main/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticator.java → adapters/resin/src/main/java/org/springframework/security/adapters/resin/ResinAcegiAuthenticator.java

@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.resin;
+package org.springframework.security.adapters.resin;
 
 import com.caucho.http.security.AbstractAuthenticator;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.AuthenticationManager;
 
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
+import org.springframework.security.adapters.PrincipalAcegiUserToken;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

adapters/resin/src/test/java/org/acegisecurity/adapters/resin/ResinAcegiAuthenticatorTests.java → adapters/resin/src/test/java/org/springframework/security/adapters/resin/ResinAcegiAuthenticatorTests.java

@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters.resin;
+package org.springframework.security.adapters.resin;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
+import org.springframework.security.adapters.PrincipalAcegiUserToken;
 
 import java.security.Principal;
 
@@ -61,7 +61,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
     public void testAdapterAbortsIfAppContextDoesNotContainAnAuthenticationBean()
         throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-invalid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-invalid.xml");
         adapter.setKey(ADAPTER_KEY);
 
         try {
@@ -97,7 +97,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
 
     public void testAdapterAbortsIfNoKeySpecified() throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
 
         try {
             adapter.init();
@@ -132,7 +132,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
 
     public void testAdapterStartsUpSuccess() throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         adapter.init();
         assertTrue(true);
@@ -141,7 +141,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
     public void testAuthenticationFailsForIncorrectPassword()
         throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         adapter.init();
         assertEquals(null, adapter.loginImpl("marissa", "kangaroo"));
@@ -150,7 +150,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
     public void testAuthenticationFailsForIncorrectUserName()
         throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         adapter.init();
         assertEquals(null, adapter.loginImpl("melissa", "koala"));
@@ -158,7 +158,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
 
     public void testAuthenticationSuccess() throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         adapter.init();
 
@@ -179,7 +179,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
     public void testAuthenticationSuccessUsingAlternateMethod()
         throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         adapter.init();
 
@@ -200,7 +200,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
     public void testAuthenticationWithNullPasswordHandledGracefully()
         throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         adapter.init();
         assertEquals(null, adapter.loginImpl("marissa", null));
@@ -209,7 +209,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
     public void testAuthenticationWithNullUserNameHandledGracefully()
         throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         adapter.init();
         assertEquals(null, adapter.loginImpl(null, "koala"));
@@ -217,15 +217,15 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
 
     public void testGetters() throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         assertEquals(ADAPTER_KEY, adapter.getKey());
-        assertEquals("org/acegisecurity/adapters/adaptertest-valid.xml", adapter.getAppContextLocation());
+        assertEquals("org/springframework/security/adapters/adaptertest-valid.xml", adapter.getAppContextLocation());
     }
 
     public void testHasRoleWithANullPrincipalFails() throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         adapter.init();
         assertTrue(!adapter.isUserInRole(null, null, null, null, "ROLE_ONE"));
@@ -234,7 +234,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
     public void testHasRoleWithAPrincipalTheAdapterDidNotCreateFails()
         throws Exception {
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         adapter.init();
         assertTrue(!adapter.isUserInRole(null, null, null,
@@ -251,7 +251,7 @@ public class ResinAcegiAuthenticatorTests extends TestCase {
                 new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
                 null);
         ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
+        adapter.setAppContextLocation("org/springframework/security/adapters/adaptertest-valid.xml");
         adapter.setKey(ADAPTER_KEY);
         adapter.init();
         assertTrue(adapter.isUserInRole(null, null, null, token, "ROLE_ONE"));

core/pom.xml

@@ -155,7 +155,7 @@
 			</resource>
 			<resource>
 				<directory>
-					${basedir}/src/main/resources/org/acegisecurity/taglibs
+					${basedir}/src/main/resources/org/springframework/security/taglibs
 				</directory>
 				<targetPath>META-INF</targetPath>
 				<includes>

pom.xml

@@ -9,7 +9,7 @@
 	<modules>
 		<module>core</module>
         <module>core-tiger</module>
-        <!--module>adapters</module-->
+        <module>adapters</module>
 		<module>portlet</module>
         <module>samples</module>
         <module>ntlm</module>