diff --git a/core/pom.xml b/core/pom.xml index 9ecd4ef0bf..5f17fa5ab3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - org.acegisecurity - acegi-security-parent + org.springframework.security + spring-security-parent 2.0-SNAPSHOT jar - acegi-security - Acegi Security Core + spring-security-core + Spring Security Core scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk/core diff --git a/core/src/main/java/org/acegisecurity/AbstractAuthenticationManager.java b/core/src/main/java/org/springframework/security/AbstractAuthenticationManager.java similarity index 93% rename from core/src/main/java/org/acegisecurity/AbstractAuthenticationManager.java rename to core/src/main/java/org/springframework/security/AbstractAuthenticationManager.java index 6f7b95faa9..c556e57d57 100644 --- a/core/src/main/java/org/acegisecurity/AbstractAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/AbstractAuthenticationManager.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; -import org.acegisecurity.providers.AbstractAuthenticationToken; +import org.springframework.security.providers.AbstractAuthenticationToken; /** @@ -70,7 +70,7 @@ public abstract class AbstractAuthenticationManager implements AuthenticationMan /** *

Concrete implementations of this class override this method to provide the authentication service.

*

The contract for this method is documented in the {@link - * AuthenticationManager#authenticate(org.acegisecurity.Authentication)}.

+ * AuthenticationManager#authenticate(org.springframework.security.Authentication)}.

* * @param authentication the authentication request object * diff --git a/core/src/main/java/org/acegisecurity/AccessDecisionManager.java b/core/src/main/java/org/springframework/security/AccessDecisionManager.java similarity index 98% rename from core/src/main/java/org/acegisecurity/AccessDecisionManager.java rename to core/src/main/java/org/springframework/security/AccessDecisionManager.java index 0b6b44c13c..666a5bbe37 100644 --- a/core/src/main/java/org/acegisecurity/AccessDecisionManager.java +++ b/core/src/main/java/org/springframework/security/AccessDecisionManager.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Makes a final access control (authorization) decision. diff --git a/core/src/main/java/org/acegisecurity/AccessDeniedException.java b/core/src/main/java/org/springframework/security/AccessDeniedException.java similarity index 92% rename from core/src/main/java/org/acegisecurity/AccessDeniedException.java rename to core/src/main/java/org/springframework/security/AccessDeniedException.java index 5f5204e0c5..f08631624e 100644 --- a/core/src/main/java/org/acegisecurity/AccessDeniedException.java +++ b/core/src/main/java/org/springframework/security/AccessDeniedException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Thrown if an {@link Authentication} object does not hold a required authority. @@ -21,7 +21,7 @@ package org.acegisecurity; * @author Ben Alex * @version $Id$ */ -public class AccessDeniedException extends AcegiSecurityException { +public class AccessDeniedException extends SpringSecurityException { //~ Constructors =================================================================================================== /** diff --git a/core/src/main/java/org/acegisecurity/AccountExpiredException.java b/core/src/main/java/org/springframework/security/AccountExpiredException.java similarity index 97% rename from core/src/main/java/org/acegisecurity/AccountExpiredException.java rename to core/src/main/java/org/springframework/security/AccountExpiredException.java index ef4af2c13d..3b3f135f5e 100644 --- a/core/src/main/java/org/acegisecurity/AccountExpiredException.java +++ b/core/src/main/java/org/springframework/security/AccountExpiredException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Thrown if an authentication request is rejected because the account has expired. Makes no assertion as to diff --git a/core/src/main/java/org/acegisecurity/AcegiMessageSource.java b/core/src/main/java/org/springframework/security/AcegiMessageSource.java similarity index 94% rename from core/src/main/java/org/acegisecurity/AcegiMessageSource.java rename to core/src/main/java/org/springframework/security/AcegiMessageSource.java index f709594588..6f3d3ecdbe 100644 --- a/core/src/main/java/org/acegisecurity/AcegiMessageSource.java +++ b/core/src/main/java/org/springframework/security/AcegiMessageSource.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; import org.springframework.context.support.MessageSourceAccessor; import org.springframework.context.support.ResourceBundleMessageSource; @@ -32,7 +32,7 @@ public class AcegiMessageSource extends ResourceBundleMessageSource { //~ Constructors =================================================================================================== public AcegiMessageSource() { - setBasename("org.acegisecurity.messages"); + setBasename("org.springframework.security.messages"); } //~ Methods ======================================================================================================== diff --git a/core/src/main/java/org/acegisecurity/AfterInvocationManager.java b/core/src/main/java/org/springframework/security/AfterInvocationManager.java similarity index 97% rename from core/src/main/java/org/acegisecurity/AfterInvocationManager.java rename to core/src/main/java/org/springframework/security/AfterInvocationManager.java index 313fd52e85..2d8c2bd847 100644 --- a/core/src/main/java/org/acegisecurity/AfterInvocationManager.java +++ b/core/src/main/java/org/springframework/security/AfterInvocationManager.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Reviews the Object returned from a secure object invocation, @@ -25,7 +25,7 @@ package org.acegisecurity; * object instance returned by a service layer bean. Can also be used to * mutate the domain object instance so the principal is only able to access * authorised bean properties or Collection elements. Often used - * in conjunction with an {@link org.acegisecurity.acl.AclManager} to + * in conjunction with an {@link org.springframework.security.acl.AclManager} to * obtain the access control list applicable for the domain object instance. *

* diff --git a/core/src/main/java/org/acegisecurity/Authentication.java b/core/src/main/java/org/springframework/security/Authentication.java similarity index 97% rename from core/src/main/java/org/acegisecurity/Authentication.java rename to core/src/main/java/org/springframework/security/Authentication.java index 8191ddeb48..2eca608885 100644 --- a/core/src/main/java/org/acegisecurity/Authentication.java +++ b/core/src/main/java/org/springframework/security/Authentication.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; import java.io.Serializable; @@ -29,7 +29,7 @@ import java.security.Principal; *

* *

- * Stored in a request {@link org.acegisecurity.context.SecurityContext}. + * Stored in a request {@link org.springframework.security.context.SecurityContext}. *

* * @author Ben Alex diff --git a/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java b/core/src/main/java/org/springframework/security/AuthenticationCredentialsNotFoundException.java similarity index 93% rename from core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java rename to core/src/main/java/org/springframework/security/AuthenticationCredentialsNotFoundException.java index f1a2481261..a985486c7c 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationCredentialsNotFoundException.java +++ b/core/src/main/java/org/springframework/security/AuthenticationCredentialsNotFoundException.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Thrown if an authentication request is rejected because there is no {@link Authentication} object in the {@link - * org.acegisecurity.context.SecurityContext SecurityContext}. + * org.springframework.security.context.SecurityContext SecurityContext}. * * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/acegisecurity/AuthenticationException.java b/core/src/main/java/org/springframework/security/AuthenticationException.java similarity index 94% rename from core/src/main/java/org/acegisecurity/AuthenticationException.java rename to core/src/main/java/org/springframework/security/AuthenticationException.java index c8eb374a50..93a9f235b7 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationException.java +++ b/core/src/main/java/org/springframework/security/AuthenticationException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Abstract superclass for all exceptions related an {@link Authentication} object being invalid for whatever @@ -22,7 +22,7 @@ package org.acegisecurity; * @author Ben Alex * @version $Id$ */ -public abstract class AuthenticationException extends AcegiSecurityException { +public abstract class AuthenticationException extends SpringSecurityException { //~ Instance fields ================================================================================================ /** The authentication that related to this exception (may be null) */ diff --git a/core/src/main/java/org/acegisecurity/AuthenticationManager.java b/core/src/main/java/org/springframework/security/AuthenticationManager.java similarity index 98% rename from core/src/main/java/org/acegisecurity/AuthenticationManager.java rename to core/src/main/java/org/springframework/security/AuthenticationManager.java index 64f7c7abd5..caa7905649 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/AuthenticationManager.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Processes an {@link Authentication} request. diff --git a/core/src/main/java/org/acegisecurity/AuthenticationServiceException.java b/core/src/main/java/org/springframework/security/AuthenticationServiceException.java similarity index 97% rename from core/src/main/java/org/acegisecurity/AuthenticationServiceException.java rename to core/src/main/java/org/springframework/security/AuthenticationServiceException.java index 8231705b0d..bd3f1a30ac 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationServiceException.java +++ b/core/src/main/java/org/springframework/security/AuthenticationServiceException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Thrown if an authentication request could not be processed due to a system problem.

This might be thrown if a diff --git a/core/src/main/java/org/acegisecurity/AuthenticationTrustResolver.java b/core/src/main/java/org/springframework/security/AuthenticationTrustResolver.java similarity index 98% rename from core/src/main/java/org/acegisecurity/AuthenticationTrustResolver.java rename to core/src/main/java/org/springframework/security/AuthenticationTrustResolver.java index 20cb01e948..d730c990f9 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationTrustResolver.java +++ b/core/src/main/java/org/springframework/security/AuthenticationTrustResolver.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Evaluates Authentication tokens diff --git a/core/src/main/java/org/acegisecurity/AuthenticationTrustResolverImpl.java b/core/src/main/java/org/springframework/security/AuthenticationTrustResolverImpl.java similarity index 91% rename from core/src/main/java/org/acegisecurity/AuthenticationTrustResolverImpl.java rename to core/src/main/java/org/springframework/security/AuthenticationTrustResolverImpl.java index 92cf210e57..bdf4ec95ac 100644 --- a/core/src/main/java/org/acegisecurity/AuthenticationTrustResolverImpl.java +++ b/core/src/main/java/org/springframework/security/AuthenticationTrustResolverImpl.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; -import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken; -import org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken; +import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; +import org.springframework.security.providers.rememberme.RememberMeAuthenticationToken; /** diff --git a/core/src/main/java/org/acegisecurity/AuthorizationServiceException.java b/core/src/main/java/org/springframework/security/AuthorizationServiceException.java similarity index 97% rename from core/src/main/java/org/acegisecurity/AuthorizationServiceException.java rename to core/src/main/java/org/springframework/security/AuthorizationServiceException.java index 3bb850e3c2..ba506ca789 100644 --- a/core/src/main/java/org/acegisecurity/AuthorizationServiceException.java +++ b/core/src/main/java/org/springframework/security/AuthorizationServiceException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Thrown if an authorization request could not be processed due to a system problem.

This might be thrown if an diff --git a/core/src/main/java/org/acegisecurity/BadCredentialsException.java b/core/src/main/java/org/springframework/security/BadCredentialsException.java similarity index 98% rename from core/src/main/java/org/acegisecurity/BadCredentialsException.java rename to core/src/main/java/org/springframework/security/BadCredentialsException.java index 52f1f8da58..812cb151e0 100644 --- a/core/src/main/java/org/acegisecurity/BadCredentialsException.java +++ b/core/src/main/java/org/springframework/security/BadCredentialsException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Thrown if an authentication request is rejected because the credentials are invalid. For this exception to be diff --git a/core/src/main/java/org/acegisecurity/ConfigAttribute.java b/core/src/main/java/org/springframework/security/ConfigAttribute.java similarity index 95% rename from core/src/main/java/org/acegisecurity/ConfigAttribute.java rename to core/src/main/java/org/springframework/security/ConfigAttribute.java index a168bac2b5..d6e1e4820b 100644 --- a/core/src/main/java/org/acegisecurity/ConfigAttribute.java +++ b/core/src/main/java/org/springframework/security/ConfigAttribute.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; import java.io.Serializable; @@ -22,7 +22,7 @@ import java.io.Serializable; * Stores a security system related configuration attribute. * *

- * When an {@link org.acegisecurity.intercept.AbstractSecurityInterceptor} + * When an {@link org.springframework.security.intercept.AbstractSecurityInterceptor} * is setup, a list of configuration attributes is defined for secure object * patterns. These configuration attributes have special meaning to a {@link * RunAsManager}, {@link AccessDecisionManager} or diff --git a/core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java b/core/src/main/java/org/springframework/security/ConfigAttributeDefinition.java similarity index 95% rename from core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java rename to core/src/main/java/org/springframework/security/ConfigAttributeDefinition.java index e071455dee..993ef74438 100644 --- a/core/src/main/java/org/acegisecurity/ConfigAttributeDefinition.java +++ b/core/src/main/java/org/springframework/security/ConfigAttributeDefinition.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; import java.io.Serializable; @@ -25,8 +25,8 @@ import java.util.Vector; /** * Holds a group of {@link ConfigAttribute}s that are associated with a given secure object target.

All the * ConfigAttributeDefinitions associated with a given {@link - * org.acegisecurity.intercept.AbstractSecurityInterceptor} are stored in an {@link - * org.acegisecurity.intercept.ObjectDefinitionSource}.

+ * org.springframework.security.intercept.AbstractSecurityInterceptor} are stored in an {@link + * org.springframework.security.intercept.ObjectDefinitionSource}.

* * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java b/core/src/main/java/org/springframework/security/ConfigAttributeEditor.java similarity index 97% rename from core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java rename to core/src/main/java/org/springframework/security/ConfigAttributeEditor.java index 929016cc17..398d347008 100644 --- a/core/src/main/java/org/acegisecurity/ConfigAttributeEditor.java +++ b/core/src/main/java/org/springframework/security/ConfigAttributeEditor.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; import org.springframework.util.StringUtils; diff --git a/core/src/main/java/org/acegisecurity/CredentialsExpiredException.java b/core/src/main/java/org/springframework/security/CredentialsExpiredException.java similarity index 97% rename from core/src/main/java/org/acegisecurity/CredentialsExpiredException.java rename to core/src/main/java/org/springframework/security/CredentialsExpiredException.java index 950f6ad7a4..f6ddd3d4f3 100644 --- a/core/src/main/java/org/acegisecurity/CredentialsExpiredException.java +++ b/core/src/main/java/org/springframework/security/CredentialsExpiredException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Thrown if an authentication request is rejected because the account's credentials have expired. Makes no diff --git a/core/src/main/java/org/acegisecurity/DisabledException.java b/core/src/main/java/org/springframework/security/DisabledException.java similarity index 97% rename from core/src/main/java/org/acegisecurity/DisabledException.java rename to core/src/main/java/org/springframework/security/DisabledException.java index bfa50edc2c..3c9ec0e7e8 100644 --- a/core/src/main/java/org/acegisecurity/DisabledException.java +++ b/core/src/main/java/org/springframework/security/DisabledException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Thrown if an authentication request is rejected because the account is disabled. Makes no assertion as to diff --git a/core/src/main/java/org/acegisecurity/GrantedAuthority.java b/core/src/main/java/org/springframework/security/GrantedAuthority.java similarity index 98% rename from core/src/main/java/org/acegisecurity/GrantedAuthority.java rename to core/src/main/java/org/springframework/security/GrantedAuthority.java index 829a73fbb1..9848089926 100644 --- a/core/src/main/java/org/acegisecurity/GrantedAuthority.java +++ b/core/src/main/java/org/springframework/security/GrantedAuthority.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; import java.io.Serializable; diff --git a/core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java b/core/src/main/java/org/springframework/security/GrantedAuthorityImpl.java similarity index 98% rename from core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java rename to core/src/main/java/org/springframework/security/GrantedAuthorityImpl.java index c9a42681e6..0acfddc7c4 100644 --- a/core/src/main/java/org/acegisecurity/GrantedAuthorityImpl.java +++ b/core/src/main/java/org/springframework/security/GrantedAuthorityImpl.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; import java.io.Serializable; diff --git a/core/src/main/java/org/acegisecurity/InsufficientAuthenticationException.java b/core/src/main/java/org/springframework/security/InsufficientAuthenticationException.java similarity index 85% rename from core/src/main/java/org/acegisecurity/InsufficientAuthenticationException.java rename to core/src/main/java/org/springframework/security/InsufficientAuthenticationException.java index b3b9f79f33..6864ea5fac 100644 --- a/core/src/main/java/org/acegisecurity/InsufficientAuthenticationException.java +++ b/core/src/main/java/org/springframework/security/InsufficientAuthenticationException.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Thrown if an authentication request is rejected because the credentials are not sufficiently trusted.

{{@link - * org.acegisecurity.vote.AccessDecisionVoter}s will typically throw this exception if they are dissatisfied with the + * org.springframework.security.vote.AccessDecisionVoter}s will typically throw this exception if they are dissatisfied with the * level of the authentication, such as if performed using a remember-me mechanism or anonymously. The commonly used - * {@link org.acegisecurity.ui.ExceptionTranslationFilter} will thus cause the AuthenticationEntryPoint + * {@link org.springframework.security.ui.ExceptionTranslationFilter} will thus cause the AuthenticationEntryPoint * to be called, allowing the principal to authenticate with a stronger level of authentication.}

* * @author Ben Alex diff --git a/core/src/main/java/org/acegisecurity/LockedException.java b/core/src/main/java/org/springframework/security/LockedException.java similarity index 97% rename from core/src/main/java/org/acegisecurity/LockedException.java rename to core/src/main/java/org/springframework/security/LockedException.java index df4048c6ef..b41de14894 100644 --- a/core/src/main/java/org/acegisecurity/LockedException.java +++ b/core/src/main/java/org/springframework/security/LockedException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Thrown if an authentication request is rejected because the account is locked. Makes no assertion as to whether diff --git a/core/src/main/java/org/acegisecurity/MockAuthenticationManager.java b/core/src/main/java/org/springframework/security/MockAuthenticationManager.java similarity index 97% rename from core/src/main/java/org/acegisecurity/MockAuthenticationManager.java rename to core/src/main/java/org/springframework/security/MockAuthenticationManager.java index d55ecd7a5d..8b4c6a9552 100644 --- a/core/src/main/java/org/acegisecurity/MockAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/MockAuthenticationManager.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Simply accepts as valid whatever is passed to it, if grantAccess is set to true. diff --git a/core/src/main/java/org/acegisecurity/RunAsManager.java b/core/src/main/java/org/springframework/security/RunAsManager.java similarity index 95% rename from core/src/main/java/org/acegisecurity/RunAsManager.java rename to core/src/main/java/org/springframework/security/RunAsManager.java index 6ace86ff9f..4e82a64384 100644 --- a/core/src/main/java/org/acegisecurity/RunAsManager.java +++ b/core/src/main/java/org/springframework/security/RunAsManager.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Creates a new temporary {@link Authentication} object for the current secure @@ -23,9 +23,9 @@ package org.acegisecurity; * This interface permits implementations to replace the * Authentication object that applies to the current secure * object invocation only. The {@link - * org.acegisecurity.intercept.AbstractSecurityInterceptor} will replace + * org.springframework.security.intercept.AbstractSecurityInterceptor} will replace * the Authentication object held in the - * {@link org.acegisecurity.context.SecurityContext SecurityContext} + * {@link org.springframework.security.context.SecurityContext SecurityContext} * for the duration of the secure object callback only, returning it to * the original Authentication object when the callback ends. *

diff --git a/core/src/main/java/org/acegisecurity/SecurityConfig.java b/core/src/main/java/org/springframework/security/SecurityConfig.java similarity index 97% rename from core/src/main/java/org/acegisecurity/SecurityConfig.java rename to core/src/main/java/org/springframework/security/SecurityConfig.java index a47bdce1de..3e02351614 100644 --- a/core/src/main/java/org/acegisecurity/SecurityConfig.java +++ b/core/src/main/java/org/springframework/security/SecurityConfig.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; /** * Stores a {@link ConfigAttribute} as a String. diff --git a/core/src/main/java/org/acegisecurity/AcegiSecurityException.java b/core/src/main/java/org/springframework/security/SpringSecurityException.java similarity index 77% rename from core/src/main/java/org/acegisecurity/AcegiSecurityException.java rename to core/src/main/java/org/springframework/security/SpringSecurityException.java index 5cd656344e..2160ebe79e 100644 --- a/core/src/main/java/org/acegisecurity/AcegiSecurityException.java +++ b/core/src/main/java/org/springframework/security/SpringSecurityException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity; +package org.springframework.security; import org.springframework.core.NestedRuntimeException; @@ -25,27 +25,27 @@ import org.springframework.core.NestedRuntimeException; * @author Ben Alex * @version $Id$ */ -public abstract class AcegiSecurityException extends NestedRuntimeException { +public abstract class SpringSecurityException extends NestedRuntimeException { //~ Constructors =================================================================================================== /** - * Constructs an AcegiSecurityException with the specified + * Constructs an SpringSecurityException with the specified * message and root cause. * * @param msg the detail message * @param t the root cause */ - public AcegiSecurityException(String msg, Throwable t) { + public SpringSecurityException(String msg, Throwable t) { super(msg, t); } /** - * Constructs an AcegiSecurityException with the specified + * Constructs an SpringSecurityException with the specified * message and no root cause. * * @param msg the detail message */ - public AcegiSecurityException(String msg) { + public SpringSecurityException(String msg) { super(msg); } } diff --git a/core/src/main/java/org/acegisecurity/acl/AclEntry.java b/core/src/main/java/org/springframework/security/acl/AclEntry.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acl/AclEntry.java rename to core/src/main/java/org/springframework/security/acl/AclEntry.java index 48fe989951..9e4ca432d1 100644 --- a/core/src/main/java/org/acegisecurity/acl/AclEntry.java +++ b/core/src/main/java/org/springframework/security/acl/AclEntry.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acl; +package org.springframework.security.acl; import java.io.Serializable; diff --git a/core/src/main/java/org/acegisecurity/acl/AclManager.java b/core/src/main/java/org/springframework/security/acl/AclManager.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acl/AclManager.java rename to core/src/main/java/org/springframework/security/acl/AclManager.java index fc82de485c..b47de0e07c 100644 --- a/core/src/main/java/org/acegisecurity/acl/AclManager.java +++ b/core/src/main/java/org/springframework/security/acl/AclManager.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.acl; +package org.springframework.security.acl; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; /** diff --git a/core/src/main/java/org/acegisecurity/acl/AclProvider.java b/core/src/main/java/org/springframework/security/acl/AclProvider.java similarity index 96% rename from core/src/main/java/org/acegisecurity/acl/AclProvider.java rename to core/src/main/java/org/springframework/security/acl/AclProvider.java index 0ccf9e264b..0ca606d054 100644 --- a/core/src/main/java/org/acegisecurity/acl/AclProvider.java +++ b/core/src/main/java/org/springframework/security/acl/AclProvider.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.acl; +package org.springframework.security.acl; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; /** diff --git a/core/src/main/java/org/acegisecurity/acl/AclProviderManager.java b/core/src/main/java/org/springframework/security/acl/AclProviderManager.java similarity index 98% rename from core/src/main/java/org/acegisecurity/acl/AclProviderManager.java rename to core/src/main/java/org/springframework/security/acl/AclProviderManager.java index 168e5594f5..6b24fe8566 100644 --- a/core/src/main/java/org/acegisecurity/acl/AclProviderManager.java +++ b/core/src/main/java/org/springframework/security/acl/AclProviderManager.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.acl; +package org.springframework.security.acl; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java b/core/src/main/java/org/springframework/security/acl/basic/AbstractBasicAclEntry.java similarity index 99% rename from core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java rename to core/src/main/java/org/springframework/security/acl/basic/AbstractBasicAclEntry.java index 6382a19d9d..d802911d24 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/AbstractBasicAclEntry.java +++ b/core/src/main/java/org/springframework/security/acl/basic/AbstractBasicAclEntry.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentity.java b/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentity.java similarity index 97% rename from core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentity.java rename to core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentity.java index b7c144b367..854a1b8d58 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentity.java +++ b/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentity.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; import java.io.Serializable; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentityAware.java b/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentityAware.java similarity index 96% rename from core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentityAware.java rename to core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentityAware.java index 931bcab7b2..bf966c9621 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/AclObjectIdentityAware.java +++ b/core/src/main/java/org/springframework/security/acl/basic/AclObjectIdentityAware.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; /** * Indicates a domain object instance is able to provide {@link diff --git a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclDao.java b/core/src/main/java/org/springframework/security/acl/basic/BasicAclDao.java similarity index 97% rename from core/src/main/java/org/acegisecurity/acl/basic/BasicAclDao.java rename to core/src/main/java/org/springframework/security/acl/basic/BasicAclDao.java index 015a88e94a..93b6996367 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclDao.java +++ b/core/src/main/java/org/springframework/security/acl/basic/BasicAclDao.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; /** * Represents a data access object that can return the {@link BasicAclEntry}s diff --git a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntry.java b/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntry.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntry.java rename to core/src/main/java/org/springframework/security/acl/basic/BasicAclEntry.java index ce1fe2bf49..9a0aff4417 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntry.java +++ b/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntry.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; -import org.acegisecurity.acl.AclEntry; +import org.springframework.security.acl.AclEntry; /** @@ -65,7 +65,7 @@ public interface BasicAclEntry extends AclEntry { * object type will vary depending on the type of recipient. For instance, it might be a String * containing a username, or a GrantedAuthorityImpl containing a complex granted authority that is * being granted the permissions contained in this access control entry. The {@link EffectiveAclsResolver} and - * {@link BasicAclProvider#getAcls(Object,org.acegisecurity.Authentication)} can process the different recipient + * {@link BasicAclProvider#getAcls(Object,org.springframework.security.Authentication)} can process the different recipient * types and return only those that apply to a specified Authentication object.

* * @return the recipient of this access control list entry (never null) diff --git a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntryCache.java b/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntryCache.java similarity index 98% rename from core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntryCache.java rename to core/src/main/java/org/springframework/security/acl/basic/BasicAclEntryCache.java index 7edcc19815..ecaa3eb301 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclEntryCache.java +++ b/core/src/main/java/org/springframework/security/acl/basic/BasicAclEntryCache.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; /** * Provides a cache of {@link BasicAclEntry} objects. diff --git a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclExtendedDao.java b/core/src/main/java/org/springframework/security/acl/basic/BasicAclExtendedDao.java similarity index 98% rename from core/src/main/java/org/acegisecurity/acl/basic/BasicAclExtendedDao.java rename to core/src/main/java/org/springframework/security/acl/basic/BasicAclExtendedDao.java index e494449cdb..77bfa6d669 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclExtendedDao.java +++ b/core/src/main/java/org/springframework/security/acl/basic/BasicAclExtendedDao.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; import org.springframework.dao.DataAccessException; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclProvider.java b/core/src/main/java/org/springframework/security/acl/basic/BasicAclProvider.java similarity index 98% rename from core/src/main/java/org/acegisecurity/acl/basic/BasicAclProvider.java rename to core/src/main/java/org/springframework/security/acl/basic/BasicAclProvider.java index 71e9591096..0c982867ea 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/BasicAclProvider.java +++ b/core/src/main/java/org/springframework/security/acl/basic/BasicAclProvider.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; -import org.acegisecurity.acl.AclEntry; -import org.acegisecurity.acl.AclProvider; -import org.acegisecurity.acl.basic.cache.NullAclEntryCache; +import org.springframework.security.acl.AclEntry; +import org.springframework.security.acl.AclProvider; +import org.springframework.security.acl.basic.cache.NullAclEntryCache; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/EffectiveAclsResolver.java b/core/src/main/java/org/springframework/security/acl/basic/EffectiveAclsResolver.java similarity index 94% rename from core/src/main/java/org/acegisecurity/acl/basic/EffectiveAclsResolver.java rename to core/src/main/java/org/springframework/security/acl/basic/EffectiveAclsResolver.java index d1a76534c1..763d713125 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/EffectiveAclsResolver.java +++ b/core/src/main/java/org/springframework/security/acl/basic/EffectiveAclsResolver.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; -import org.acegisecurity.acl.AclEntry; +import org.springframework.security.acl.AclEntry; /** diff --git a/core/src/main/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolver.java b/core/src/main/java/org/springframework/security/acl/basic/GrantedAuthorityEffectiveAclsResolver.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolver.java rename to core/src/main/java/org/springframework/security/acl/basic/GrantedAuthorityEffectiveAclsResolver.java index d2fc33939a..896ad7cc10 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolver.java +++ b/core/src/main/java/org/springframework/security/acl/basic/GrantedAuthorityEffectiveAclsResolver.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; -import org.acegisecurity.Authentication; -import org.acegisecurity.GrantedAuthority; +import org.springframework.security.Authentication; +import org.springframework.security.GrantedAuthority; -import org.acegisecurity.acl.AclEntry; +import org.springframework.security.acl.AclEntry; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.userdetails.UserDetails; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentity.java b/core/src/main/java/org/springframework/security/acl/basic/NamedEntityObjectIdentity.java similarity index 99% rename from core/src/main/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentity.java rename to core/src/main/java/org/springframework/security/acl/basic/NamedEntityObjectIdentity.java index dac671709b..5f3fd14b64 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentity.java +++ b/core/src/main/java/org/springframework/security/acl/basic/NamedEntityObjectIdentity.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/SimpleAclEntry.java b/core/src/main/java/org/springframework/security/acl/basic/SimpleAclEntry.java similarity index 99% rename from core/src/main/java/org/acegisecurity/acl/basic/SimpleAclEntry.java rename to core/src/main/java/org/springframework/security/acl/basic/SimpleAclEntry.java index 818525d288..58fffed3d5 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/SimpleAclEntry.java +++ b/core/src/main/java/org/springframework/security/acl/basic/SimpleAclEntry.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic; +package org.springframework.security.acl.basic; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolder.java b/core/src/main/java/org/springframework/security/acl/basic/cache/BasicAclEntryHolder.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolder.java rename to core/src/main/java/org/springframework/security/acl/basic/cache/BasicAclEntryHolder.java index ba3a0df832..fe177eff76 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolder.java +++ b/core/src/main/java/org/springframework/security/acl/basic/cache/BasicAclEntryHolder.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic.cache; +package org.springframework.security.acl.basic.cache; -import org.acegisecurity.acl.basic.BasicAclEntry; +import org.springframework.security.acl.basic.BasicAclEntry; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java b/core/src/main/java/org/springframework/security/acl/basic/cache/EhCacheBasedAclEntryCache.java similarity index 93% rename from core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java rename to core/src/main/java/org/springframework/security/acl/basic/cache/EhCacheBasedAclEntryCache.java index f2e4cf3cfc..bb40d9c0ba 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCache.java +++ b/core/src/main/java/org/springframework/security/acl/basic/cache/EhCacheBasedAclEntryCache.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic.cache; +package org.springframework.security.acl.basic.cache; import net.sf.ehcache.CacheException; import net.sf.ehcache.Element; import net.sf.ehcache.Ehcache; -import org.acegisecurity.acl.basic.AclObjectIdentity; -import org.acegisecurity.acl.basic.BasicAclEntry; -import org.acegisecurity.acl.basic.BasicAclEntryCache; +import org.springframework.security.acl.basic.AclObjectIdentity; +import org.springframework.security.acl.basic.BasicAclEntry; +import org.springframework.security.acl.basic.BasicAclEntryCache; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/cache/NullAclEntryCache.java b/core/src/main/java/org/springframework/security/acl/basic/cache/NullAclEntryCache.java similarity index 87% rename from core/src/main/java/org/acegisecurity/acl/basic/cache/NullAclEntryCache.java rename to core/src/main/java/org/springframework/security/acl/basic/cache/NullAclEntryCache.java index 494c61cc7c..7e49f60da4 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/cache/NullAclEntryCache.java +++ b/core/src/main/java/org/springframework/security/acl/basic/cache/NullAclEntryCache.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic.cache; +package org.springframework.security.acl.basic.cache; -import org.acegisecurity.acl.basic.AclObjectIdentity; -import org.acegisecurity.acl.basic.BasicAclEntry; -import org.acegisecurity.acl.basic.BasicAclEntryCache; +import org.springframework.security.acl.basic.AclObjectIdentity; +import org.springframework.security.acl.basic.BasicAclEntry; +import org.springframework.security.acl.basic.BasicAclEntryCache; /** diff --git a/core/src/main/java/org/acegisecurity/acl/basic/cache/package.html b/core/src/main/java/org/springframework/security/acl/basic/cache/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/acl/basic/cache/package.html rename to core/src/main/java/org/springframework/security/acl/basic/cache/package.html diff --git a/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcDaoImpl.java similarity index 98% rename from core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImpl.java rename to core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcDaoImpl.java index 4dd5cb6ac5..cafd0a129f 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImpl.java +++ b/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcDaoImpl.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic.jdbc; +package org.springframework.security.acl.basic.jdbc; -import org.acegisecurity.acl.basic.AclObjectIdentity; -import org.acegisecurity.acl.basic.BasicAclDao; -import org.acegisecurity.acl.basic.BasicAclEntry; -import org.acegisecurity.acl.basic.NamedEntityObjectIdentity; +import org.springframework.security.acl.basic.AclObjectIdentity; +import org.springframework.security.acl.basic.BasicAclDao; +import org.springframework.security.acl.basic.BasicAclEntry; +import org.springframework.security.acl.basic.NamedEntityObjectIdentity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImpl.java b/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcExtendedDaoImpl.java similarity index 97% rename from core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImpl.java rename to core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcExtendedDaoImpl.java index 7311262ef2..a9147f292b 100644 --- a/core/src/main/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImpl.java +++ b/core/src/main/java/org/springframework/security/acl/basic/jdbc/JdbcExtendedDaoImpl.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.acegisecurity.acl.basic.jdbc; +package org.springframework.security.acl.basic.jdbc; -import org.acegisecurity.acl.basic.AclObjectIdentity; -import org.acegisecurity.acl.basic.BasicAclEntry; -import org.acegisecurity.acl.basic.BasicAclEntryCache; -import org.acegisecurity.acl.basic.BasicAclExtendedDao; -import org.acegisecurity.acl.basic.cache.NullAclEntryCache; +import org.springframework.security.acl.basic.AclObjectIdentity; +import org.springframework.security.acl.basic.BasicAclEntry; +import org.springframework.security.acl.basic.BasicAclEntryCache; +import org.springframework.security.acl.basic.BasicAclExtendedDao; +import org.springframework.security.acl.basic.cache.NullAclEntryCache; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,7 +53,7 @@ import javax.sql.DataSource; * #setBasicAclEntryCache(BasicAclEntryCache)}. This will cause cache evictions (removals) to take place whenever a * DAO mutator method is called.

*

This implementation works with String based recipients and {@link - * org.acegisecurity.acl.basic.NamedEntityObjectIdentity} only. The latter can be changed by overriding {@link + * org.springframework.security.acl.basic.NamedEntityObjectIdentity} only. The latter can be changed by overriding {@link * #convertAclObjectIdentityToString(AclObjectIdentity)}.

* * @author Ben Alex diff --git a/core/src/main/java/org/acegisecurity/acl/basic/jdbc/package.html b/core/src/main/java/org/springframework/security/acl/basic/jdbc/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/acl/basic/jdbc/package.html rename to core/src/main/java/org/springframework/security/acl/basic/jdbc/package.html diff --git a/core/src/main/java/org/acegisecurity/acl/basic/package.html b/core/src/main/java/org/springframework/security/acl/basic/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/acl/basic/package.html rename to core/src/main/java/org/springframework/security/acl/basic/package.html diff --git a/core/src/main/java/org/acegisecurity/acl/package.html b/core/src/main/java/org/springframework/security/acl/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/acl/package.html rename to core/src/main/java/org/springframework/security/acl/package.html diff --git a/core/src/main/java/org/acegisecurity/acls/AccessControlEntry.java b/core/src/main/java/org/springframework/security/acls/AccessControlEntry.java similarity index 94% rename from core/src/main/java/org/acegisecurity/acls/AccessControlEntry.java rename to core/src/main/java/org/springframework/security/acls/AccessControlEntry.java index a5df1648d5..af0e7eed07 100644 --- a/core/src/main/java/org/acegisecurity/acls/AccessControlEntry.java +++ b/core/src/main/java/org/springframework/security/acls/AccessControlEntry.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.sid.Sid; import java.io.Serializable; diff --git a/core/src/main/java/org/acegisecurity/acls/Acl.java b/core/src/main/java/org/springframework/security/acls/Acl.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/Acl.java rename to core/src/main/java/org/springframework/security/acls/Acl.java index adf8a4a3e1..5b71398c4a 100644 --- a/core/src/main/java/org/acegisecurity/acls/Acl.java +++ b/core/src/main/java/org/springframework/security/acls/Acl.java @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.sid.Sid; import java.io.Serializable; @@ -28,12 +28,12 @@ import java.io.Serializable; * order to avoid needing references to the domain object itself, this * interface handles indirection between a domain object and an ACL object * identity via the {@link - * org.acegisecurity.acls.objectidentity.ObjectIdentity} interface. + * org.springframework.security.acls.objectidentity.ObjectIdentity} interface. *

* *

- * An implementation represents the {@link org.acegisecurity.acls.Permission} - * list applicable for some or all {@link org.acegisecurity.acls.sid.Sid} + * An implementation represents the {@link org.springframework.security.acls.Permission} + * list applicable for some or all {@link org.springframework.security.acls.sid.Sid} * instances. *

* diff --git a/core/src/main/java/org/acegisecurity/acls/AclFormattingUtils.java b/core/src/main/java/org/springframework/security/acls/AclFormattingUtils.java similarity index 99% rename from core/src/main/java/org/acegisecurity/acls/AclFormattingUtils.java rename to core/src/main/java/org/springframework/security/acls/AclFormattingUtils.java index e6f309ffea..14b5d475e5 100644 --- a/core/src/main/java/org/acegisecurity/acls/AclFormattingUtils.java +++ b/core/src/main/java/org/springframework/security/acls/AclFormattingUtils.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/acegisecurity/acls/AclService.java b/core/src/main/java/org/springframework/security/acls/AclService.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/AclService.java rename to core/src/main/java/org/springframework/security/acls/AclService.java index fa0e90af91..b161fbe865 100644 --- a/core/src/main/java/org/acegisecurity/acls/AclService.java +++ b/core/src/main/java/org/springframework/security/acls/AclService.java @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.sid.Sid; import java.util.Map; diff --git a/core/src/main/java/org/acegisecurity/acls/AlreadyExistsException.java b/core/src/main/java/org/springframework/security/acls/AlreadyExistsException.java similarity index 88% rename from core/src/main/java/org/acegisecurity/acls/AlreadyExistsException.java rename to core/src/main/java/org/springframework/security/acls/AlreadyExistsException.java index babb4416e4..d99b8d5795 100644 --- a/core/src/main/java/org/acegisecurity/acls/AlreadyExistsException.java +++ b/core/src/main/java/org/springframework/security/acls/AlreadyExistsException.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.AcegiSecurityException; +import org.springframework.security.SpringSecurityException; /** @@ -23,24 +23,24 @@ import org.acegisecurity.AcegiSecurityException; * @author Ben Alex * @version $Id$ */ -public class AlreadyExistsException extends AcegiSecurityException { +public class AlreadyExistsException extends SpringSecurityException { //~ Constructors =================================================================================================== -/** - * Constructs an AlreadyExistsException with the specified message. - * - * @param msg the detail message +/** + * Constructs an AlreadyExistsException with the specified message. + * + * @param msg the detail message */ public AlreadyExistsException(String msg) { super(msg); } -/** - * Constructs an AlreadyExistsException with the specified message - * and root cause. - * - * @param msg the detail message - * @param t root cause +/** + * Constructs an AlreadyExistsException with the specified message + * and root cause. + * + * @param msg the detail message + * @param t root cause */ public AlreadyExistsException(String msg, Throwable t) { super(msg, t); diff --git a/core/src/main/java/org/acegisecurity/acls/AuditableAccessControlEntry.java b/core/src/main/java/org/springframework/security/acls/AuditableAccessControlEntry.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/AuditableAccessControlEntry.java rename to core/src/main/java/org/springframework/security/acls/AuditableAccessControlEntry.java index d138a0c2d7..fda5193144 100644 --- a/core/src/main/java/org/acegisecurity/acls/AuditableAccessControlEntry.java +++ b/core/src/main/java/org/springframework/security/acls/AuditableAccessControlEntry.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; /** * Represents an ACE that provides auditing information. diff --git a/core/src/main/java/org/acegisecurity/acls/AuditableAcl.java b/core/src/main/java/org/springframework/security/acls/AuditableAcl.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/AuditableAcl.java rename to core/src/main/java/org/springframework/security/acls/AuditableAcl.java index 85ae0d8dd7..23a04b6e26 100644 --- a/core/src/main/java/org/acegisecurity/acls/AuditableAcl.java +++ b/core/src/main/java/org/springframework/security/acls/AuditableAcl.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; import java.io.Serializable; diff --git a/core/src/main/java/org/acegisecurity/acls/ChildrenExistException.java b/core/src/main/java/org/springframework/security/acls/ChildrenExistException.java similarity index 88% rename from core/src/main/java/org/acegisecurity/acls/ChildrenExistException.java rename to core/src/main/java/org/springframework/security/acls/ChildrenExistException.java index c7c8b07e48..ddb7530f5b 100644 --- a/core/src/main/java/org/acegisecurity/acls/ChildrenExistException.java +++ b/core/src/main/java/org/springframework/security/acls/ChildrenExistException.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.AcegiSecurityException; +import org.springframework.security.SpringSecurityException; /** @@ -23,25 +23,25 @@ import org.acegisecurity.AcegiSecurityException; * @author Ben Alex * @version $Id$ */ -public class ChildrenExistException extends AcegiSecurityException { +public class ChildrenExistException extends SpringSecurityException { //~ Constructors =================================================================================================== -/** - * Constructs an ChildrenExistException with the specified - * message. - * - * @param msg the detail message +/** + * Constructs an ChildrenExistException with the specified + * message. + * + * @param msg the detail message */ public ChildrenExistException(String msg) { super(msg); } -/** - * Constructs an ChildrenExistException with the specified - * message and root cause. - * - * @param msg the detail message - * @param t root cause +/** + * Constructs an ChildrenExistException with the specified + * message and root cause. + * + * @param msg the detail message + * @param t root cause */ public ChildrenExistException(String msg, Throwable t) { super(msg, t); diff --git a/core/src/main/java/org/acegisecurity/acls/IdentityUnavailableException.java b/core/src/main/java/org/springframework/security/acls/IdentityUnavailableException.java similarity index 88% rename from core/src/main/java/org/acegisecurity/acls/IdentityUnavailableException.java rename to core/src/main/java/org/springframework/security/acls/IdentityUnavailableException.java index 7e346beebb..0277026082 100644 --- a/core/src/main/java/org/acegisecurity/acls/IdentityUnavailableException.java +++ b/core/src/main/java/org/springframework/security/acls/IdentityUnavailableException.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.AcegiSecurityException; +import org.springframework.security.SpringSecurityException; /** @@ -23,24 +23,24 @@ import org.acegisecurity.AcegiSecurityException; * @author Ben Alex * @version $Id$ */ -public class IdentityUnavailableException extends AcegiSecurityException { +public class IdentityUnavailableException extends SpringSecurityException { //~ Constructors =================================================================================================== -/** - * Constructs an IdentityUnavailableException with the specified message. - * - * @param msg the detail message +/** + * Constructs an IdentityUnavailableException with the specified message. + * + * @param msg the detail message */ public IdentityUnavailableException(String msg) { super(msg); } -/** - * Constructs an IdentityUnavailableException with the specified message - * and root cause. - * - * @param msg the detail message - * @param t root cause +/** + * Constructs an IdentityUnavailableException with the specified message + * and root cause. + * + * @param msg the detail message + * @param t root cause */ public IdentityUnavailableException(String msg, Throwable t) { super(msg, t); diff --git a/core/src/main/java/org/acegisecurity/acls/MutableAcl.java b/core/src/main/java/org/springframework/security/acls/MutableAcl.java similarity index 96% rename from core/src/main/java/org/acegisecurity/acls/MutableAcl.java rename to core/src/main/java/org/springframework/security/acls/MutableAcl.java index 683230fd2f..f04d0db438 100644 --- a/core/src/main/java/org/acegisecurity/acls/MutableAcl.java +++ b/core/src/main/java/org/springframework/security/acls/MutableAcl.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.sid.Sid; import java.io.Serializable; diff --git a/core/src/main/java/org/acegisecurity/acls/MutableAclService.java b/core/src/main/java/org/springframework/security/acls/MutableAclService.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/MutableAclService.java rename to core/src/main/java/org/springframework/security/acls/MutableAclService.java index b741aa8f5a..a805a3a566 100644 --- a/core/src/main/java/org/acegisecurity/acls/MutableAclService.java +++ b/core/src/main/java/org/springframework/security/acls/MutableAclService.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.objectidentity.ObjectIdentity; /** diff --git a/core/src/main/java/org/acegisecurity/acls/NotFoundException.java b/core/src/main/java/org/springframework/security/acls/NotFoundException.java similarity index 88% rename from core/src/main/java/org/acegisecurity/acls/NotFoundException.java rename to core/src/main/java/org/springframework/security/acls/NotFoundException.java index 74d0f1004b..63f73a80c6 100644 --- a/core/src/main/java/org/acegisecurity/acls/NotFoundException.java +++ b/core/src/main/java/org/springframework/security/acls/NotFoundException.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.AcegiSecurityException; +import org.springframework.security.SpringSecurityException; /** @@ -23,24 +23,24 @@ import org.acegisecurity.AcegiSecurityException; * @author Ben Alex * @version $Id$ */ -public class NotFoundException extends AcegiSecurityException { +public class NotFoundException extends SpringSecurityException { //~ Constructors =================================================================================================== -/** - * Constructs an NotFoundException with the specified message. - * - * @param msg the detail message +/** + * Constructs an NotFoundException with the specified message. + * + * @param msg the detail message */ public NotFoundException(String msg) { super(msg); } -/** - * Constructs an NotFoundException with the specified message - * and root cause. - * - * @param msg the detail message - * @param t root cause +/** + * Constructs an NotFoundException with the specified message + * and root cause. + * + * @param msg the detail message + * @param t root cause */ public NotFoundException(String msg, Throwable t) { super(msg, t); diff --git a/core/src/main/java/org/acegisecurity/acls/OwnershipAcl.java b/core/src/main/java/org/springframework/security/acls/OwnershipAcl.java similarity index 91% rename from core/src/main/java/org/acegisecurity/acls/OwnershipAcl.java rename to core/src/main/java/org/springframework/security/acls/OwnershipAcl.java index 1a2bc32702..524d90290b 100644 --- a/core/src/main/java/org/acegisecurity/acls/OwnershipAcl.java +++ b/core/src/main/java/org/springframework/security/acls/OwnershipAcl.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.sid.Sid; /** diff --git a/core/src/main/java/org/acegisecurity/acls/Permission.java b/core/src/main/java/org/springframework/security/acls/Permission.java similarity index 93% rename from core/src/main/java/org/acegisecurity/acls/Permission.java rename to core/src/main/java/org/springframework/security/acls/Permission.java index 3e041525c7..36aba2c7cb 100644 --- a/core/src/main/java/org/acegisecurity/acls/Permission.java +++ b/core/src/main/java/org/springframework/security/acls/Permission.java @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; /** - * Represents a permission granted to a {@link org.acegisecurity.acls.sid.Sid Sid} for a given domain object. + * Represents a permission granted to a {@link org.springframework.security.acls.sid.Sid Sid} for a given domain object. * * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/acegisecurity/acls/UnloadedSidException.java b/core/src/main/java/org/springframework/security/acls/UnloadedSidException.java similarity index 89% rename from core/src/main/java/org/acegisecurity/acls/UnloadedSidException.java rename to core/src/main/java/org/springframework/security/acls/UnloadedSidException.java index d093d8387e..a2fa3f4e99 100644 --- a/core/src/main/java/org/acegisecurity/acls/UnloadedSidException.java +++ b/core/src/main/java/org/springframework/security/acls/UnloadedSidException.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls; +package org.springframework.security.acls; -import org.acegisecurity.AcegiSecurityException; +import org.springframework.security.SpringSecurityException; /** @@ -24,24 +24,24 @@ import org.acegisecurity.AcegiSecurityException; * @author Ben Alex * @version $Id$ */ -public class UnloadedSidException extends AcegiSecurityException { +public class UnloadedSidException extends SpringSecurityException { //~ Constructors =================================================================================================== -/** - * Constructs an NotFoundException with the specified message. - * - * @param msg the detail message +/** + * Constructs an NotFoundException with the specified message. + * + * @param msg the detail message */ public UnloadedSidException(String msg) { super(msg); } -/** - * Constructs an NotFoundException with the specified message - * and root cause. - * - * @param msg the detail message - * @param t root cause +/** + * Constructs an NotFoundException with the specified message + * and root cause. + * + * @param msg the detail message + * @param t root cause */ public UnloadedSidException(String msg, Throwable t) { super(msg, t); diff --git a/core/src/main/java/org/acegisecurity/acls/domain/AccessControlEntryImpl.java b/core/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java similarity index 92% rename from core/src/main/java/org/acegisecurity/acls/domain/AccessControlEntryImpl.java rename to core/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java index c810d376f5..85624007a1 100644 --- a/core/src/main/java/org/acegisecurity/acls/domain/AccessControlEntryImpl.java +++ b/core/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.domain; +package org.springframework.security.acls.domain; -import org.acegisecurity.acls.AccessControlEntry; -import org.acegisecurity.acls.Acl; -import org.acegisecurity.acls.AuditableAccessControlEntry; -import org.acegisecurity.acls.Permission; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.AccessControlEntry; +import org.springframework.security.acls.Acl; +import org.springframework.security.acls.AuditableAccessControlEntry; +import org.springframework.security.acls.Permission; +import org.springframework.security.acls.sid.Sid; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/acegisecurity/acls/domain/AclAuthorizationStrategy.java b/core/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java similarity index 92% rename from core/src/main/java/org/acegisecurity/acls/domain/AclAuthorizationStrategy.java rename to core/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java index 6c43d062e7..dde5230cec 100644 --- a/core/src/main/java/org/acegisecurity/acls/domain/AclAuthorizationStrategy.java +++ b/core/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.acls.domain; +package org.springframework.security.acls.domain; -import org.acegisecurity.acls.Acl; +import org.springframework.security.acls.Acl; /** diff --git a/core/src/main/java/org/acegisecurity/acls/domain/AclAuthorizationStrategyImpl.java b/core/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java similarity index 88% rename from core/src/main/java/org/acegisecurity/acls/domain/AclAuthorizationStrategyImpl.java rename to core/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java index 8d688546d1..2826ad8979 100644 --- a/core/src/main/java/org/acegisecurity/acls/domain/AclAuthorizationStrategyImpl.java +++ b/core/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java @@ -13,20 +13,20 @@ * limitations under the License. */ -package org.acegisecurity.acls.domain; +package org.springframework.security.acls.domain; -import org.acegisecurity.AccessDeniedException; -import org.acegisecurity.Authentication; -import org.acegisecurity.GrantedAuthority; +import org.springframework.security.AccessDeniedException; +import org.springframework.security.Authentication; +import org.springframework.security.GrantedAuthority; -import org.acegisecurity.acls.Acl; -import org.acegisecurity.acls.Permission; -import org.acegisecurity.acls.sid.PrincipalSid; -import org.acegisecurity.acls.sid.Sid; -import org.acegisecurity.acls.sid.SidRetrievalStrategy; -import org.acegisecurity.acls.sid.SidRetrievalStrategyImpl; +import org.springframework.security.acls.Acl; +import org.springframework.security.acls.Permission; +import org.springframework.security.acls.sid.PrincipalSid; +import org.springframework.security.acls.sid.Sid; +import org.springframework.security.acls.sid.SidRetrievalStrategy; +import org.springframework.security.acls.sid.SidRetrievalStrategyImpl; -import org.acegisecurity.context.SecurityContextHolder; +import org.springframework.security.context.SecurityContextHolder; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/acegisecurity/acls/domain/AclImpl.java b/core/src/main/java/org/springframework/security/acls/domain/AclImpl.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/domain/AclImpl.java rename to core/src/main/java/org/springframework/security/acls/domain/AclImpl.java index fd454c3c68..7a3807c501 100644 --- a/core/src/main/java/org/acegisecurity/acls/domain/AclImpl.java +++ b/core/src/main/java/org/springframework/security/acls/domain/AclImpl.java @@ -12,18 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.domain; +package org.springframework.security.acls.domain; -import org.acegisecurity.acls.AccessControlEntry; -import org.acegisecurity.acls.Acl; -import org.acegisecurity.acls.AuditableAcl; -import org.acegisecurity.acls.MutableAcl; -import org.acegisecurity.acls.NotFoundException; -import org.acegisecurity.acls.OwnershipAcl; -import org.acegisecurity.acls.Permission; -import org.acegisecurity.acls.UnloadedSidException; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.AccessControlEntry; +import org.springframework.security.acls.Acl; +import org.springframework.security.acls.AuditableAcl; +import org.springframework.security.acls.MutableAcl; +import org.springframework.security.acls.NotFoundException; +import org.springframework.security.acls.OwnershipAcl; +import org.springframework.security.acls.Permission; +import org.springframework.security.acls.UnloadedSidException; +import org.springframework.security.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.sid.Sid; import org.springframework.util.Assert; @@ -57,7 +57,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { /** * Minimal constructor, which should be used {@link - * org.acegisecurity.acls.MutableAclService#createAcl(ObjectIdentity)}. + * org.springframework.security.acls.MutableAclService#createAcl(ObjectIdentity)}. * * @param objectIdentity the object identity this ACL relates to (required) * @param id the primary key assigned to this ACL (required) diff --git a/core/src/main/java/org/acegisecurity/acls/domain/AuditLogger.java b/core/src/main/java/org/springframework/security/acls/domain/AuditLogger.java similarity index 89% rename from core/src/main/java/org/acegisecurity/acls/domain/AuditLogger.java rename to core/src/main/java/org/springframework/security/acls/domain/AuditLogger.java index 8c725d463c..47b80b9d17 100644 --- a/core/src/main/java/org/acegisecurity/acls/domain/AuditLogger.java +++ b/core/src/main/java/org/springframework/security/acls/domain/AuditLogger.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.domain; +package org.springframework.security.acls.domain; -import org.acegisecurity.acls.AccessControlEntry; +import org.springframework.security.acls.AccessControlEntry; /** diff --git a/core/src/main/java/org/acegisecurity/acls/domain/BasePermission.java b/core/src/main/java/org/springframework/security/acls/domain/BasePermission.java similarity index 97% rename from core/src/main/java/org/acegisecurity/acls/domain/BasePermission.java rename to core/src/main/java/org/springframework/security/acls/domain/BasePermission.java index 68fd6480fa..ed5c9efb67 100644 --- a/core/src/main/java/org/acegisecurity/acls/domain/BasePermission.java +++ b/core/src/main/java/org/springframework/security/acls/domain/BasePermission.java @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.domain; +package org.springframework.security.acls.domain; -import org.acegisecurity.acls.AclFormattingUtils; -import org.acegisecurity.acls.Permission; +import org.springframework.security.acls.AclFormattingUtils; +import org.springframework.security.acls.Permission; import org.springframework.util.Assert; @@ -161,7 +161,7 @@ public final class BasePermission implements Permission { public String toString() { return "BasePermission[" + getPattern() + "=" + mask + "]"; } - + public int hashCode() { return this.mask; } diff --git a/core/src/main/java/org/acegisecurity/acls/domain/ConsoleAuditLogger.java b/core/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java similarity index 89% rename from core/src/main/java/org/acegisecurity/acls/domain/ConsoleAuditLogger.java rename to core/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java index f10f72d8e0..4eb7b0b41e 100644 --- a/core/src/main/java/org/acegisecurity/acls/domain/ConsoleAuditLogger.java +++ b/core/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.domain; +package org.springframework.security.acls.domain; -import org.acegisecurity.acls.AccessControlEntry; -import org.acegisecurity.acls.AuditableAccessControlEntry; +import org.springframework.security.acls.AccessControlEntry; +import org.springframework.security.acls.AuditableAccessControlEntry; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/acegisecurity/acls/domain/CumulativePermission.java b/core/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java similarity index 93% rename from core/src/main/java/org/acegisecurity/acls/domain/CumulativePermission.java rename to core/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java index 7b6b67e64f..76e41b6dae 100644 --- a/core/src/main/java/org/acegisecurity/acls/domain/CumulativePermission.java +++ b/core/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.domain; +package org.springframework.security.acls.domain; -import org.acegisecurity.acls.AclFormattingUtils; -import org.acegisecurity.acls.Permission; +import org.springframework.security.acls.AclFormattingUtils; +import org.springframework.security.acls.Permission; /** @@ -56,7 +56,7 @@ public class CumulativePermission implements Permission { return (this.mask == rhs.getMask()); } - + public int hashCode() { return this.mask; } diff --git a/core/src/main/java/org/acegisecurity/acls/domain/package.html b/core/src/main/java/org/springframework/security/acls/domain/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/acls/domain/package.html rename to core/src/main/java/org/springframework/security/acls/domain/package.html diff --git a/core/src/main/java/org/acegisecurity/acls/jdbc/AclCache.java b/core/src/main/java/org/springframework/security/acls/jdbc/AclCache.java similarity index 86% rename from core/src/main/java/org/acegisecurity/acls/jdbc/AclCache.java rename to core/src/main/java/org/springframework/security/acls/jdbc/AclCache.java index 106c0f7325..97db73ef65 100644 --- a/core/src/main/java/org/acegisecurity/acls/jdbc/AclCache.java +++ b/core/src/main/java/org/springframework/security/acls/jdbc/AclCache.java @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.jdbc; +package org.springframework.security.acls.jdbc; -import org.acegisecurity.acls.MutableAcl; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.MutableAcl; +import org.springframework.security.acls.objectidentity.ObjectIdentity; import java.io.Serializable; diff --git a/core/src/main/java/org/acegisecurity/acls/jdbc/BasicLookupStrategy.java b/core/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/jdbc/BasicLookupStrategy.java rename to core/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java index ece12047a5..3b8c4b54a8 100644 --- a/core/src/main/java/org/acegisecurity/acls/jdbc/BasicLookupStrategy.java +++ b/core/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java @@ -12,26 +12,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.jdbc; +package org.springframework.security.acls.jdbc; -import org.acegisecurity.acls.AccessControlEntry; -import org.acegisecurity.acls.Acl; -import org.acegisecurity.acls.MutableAcl; -import org.acegisecurity.acls.NotFoundException; -import org.acegisecurity.acls.Permission; -import org.acegisecurity.acls.UnloadedSidException; -import org.acegisecurity.acls.domain.AccessControlEntryImpl; -import org.acegisecurity.acls.domain.AclAuthorizationStrategy; -import org.acegisecurity.acls.domain.AclImpl; -import org.acegisecurity.acls.domain.AuditLogger; -import org.acegisecurity.acls.domain.BasePermission; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; -import org.acegisecurity.acls.objectidentity.ObjectIdentityImpl; -import org.acegisecurity.acls.sid.GrantedAuthoritySid; -import org.acegisecurity.acls.sid.PrincipalSid; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.AccessControlEntry; +import org.springframework.security.acls.Acl; +import org.springframework.security.acls.MutableAcl; +import org.springframework.security.acls.NotFoundException; +import org.springframework.security.acls.Permission; +import org.springframework.security.acls.UnloadedSidException; +import org.springframework.security.acls.domain.AccessControlEntryImpl; +import org.springframework.security.acls.domain.AclAuthorizationStrategy; +import org.springframework.security.acls.domain.AclImpl; +import org.springframework.security.acls.domain.AuditLogger; +import org.springframework.security.acls.domain.BasePermission; +import org.springframework.security.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.objectidentity.ObjectIdentityImpl; +import org.springframework.security.acls.sid.GrantedAuthoritySid; +import org.springframework.security.acls.sid.PrincipalSid; +import org.springframework.security.acls.sid.Sid; -import org.acegisecurity.util.FieldUtils; +import org.springframework.security.util.FieldUtils; import org.springframework.dao.DataAccessException; diff --git a/core/src/main/java/org/acegisecurity/acls/jdbc/EhCacheBasedAclCache.java b/core/src/main/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCache.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/jdbc/EhCacheBasedAclCache.java rename to core/src/main/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCache.java index b7bbb4819c..4a217410a8 100644 --- a/core/src/main/java/org/acegisecurity/acls/jdbc/EhCacheBasedAclCache.java +++ b/core/src/main/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCache.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.jdbc; +package org.springframework.security.acls.jdbc; import net.sf.ehcache.CacheException; import net.sf.ehcache.Element; import net.sf.ehcache.Ehcache; -import org.acegisecurity.acls.MutableAcl; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.MutableAcl; +import org.springframework.security.acls.objectidentity.ObjectIdentity; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/acegisecurity/acls/jdbc/JdbcAclService.java b/core/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java similarity index 88% rename from core/src/main/java/org/acegisecurity/acls/jdbc/JdbcAclService.java rename to core/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java index cac18a5c13..47e07fec6d 100644 --- a/core/src/main/java/org/acegisecurity/acls/jdbc/JdbcAclService.java +++ b/core/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.jdbc; +package org.springframework.security.acls.jdbc; -import org.acegisecurity.acls.Acl; -import org.acegisecurity.acls.AclService; -import org.acegisecurity.acls.NotFoundException; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; -import org.acegisecurity.acls.objectidentity.ObjectIdentityImpl; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.Acl; +import org.springframework.security.acls.AclService; +import org.springframework.security.acls.NotFoundException; +import org.springframework.security.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.objectidentity.ObjectIdentityImpl; +import org.springframework.security.acls.sid.Sid; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +40,7 @@ import javax.sql.DataSource; /** * Simple JDBC-based implementation of AclService.

Requires the "dirty" flags in {@link - * org.acegisecurity.acls.domain.AclImpl} and {@link org.acegisecurity.acls.domain.AccessControlEntryImpl} to be set, + * org.springframework.security.acls.domain.AclImpl} and {@link org.springframework.security.acls.domain.AccessControlEntryImpl} to be set, * so that the implementation can detect changed parameters easily.

* * @author Ben Alex diff --git a/core/src/main/java/org/acegisecurity/acls/jdbc/JdbcMutableAclService.java b/core/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java similarity index 94% rename from core/src/main/java/org/acegisecurity/acls/jdbc/JdbcMutableAclService.java rename to core/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java index ec63c871b9..e369c0ed69 100644 --- a/core/src/main/java/org/acegisecurity/acls/jdbc/JdbcMutableAclService.java +++ b/core/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java @@ -12,25 +12,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.jdbc; +package org.springframework.security.acls.jdbc; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; -import org.acegisecurity.acls.AccessControlEntry; -import org.acegisecurity.acls.Acl; -import org.acegisecurity.acls.AlreadyExistsException; -import org.acegisecurity.acls.ChildrenExistException; -import org.acegisecurity.acls.MutableAcl; -import org.acegisecurity.acls.MutableAclService; -import org.acegisecurity.acls.NotFoundException; -import org.acegisecurity.acls.domain.AccessControlEntryImpl; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; -import org.acegisecurity.acls.objectidentity.ObjectIdentityImpl; -import org.acegisecurity.acls.sid.GrantedAuthoritySid; -import org.acegisecurity.acls.sid.PrincipalSid; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.AccessControlEntry; +import org.springframework.security.acls.Acl; +import org.springframework.security.acls.AlreadyExistsException; +import org.springframework.security.acls.ChildrenExistException; +import org.springframework.security.acls.MutableAcl; +import org.springframework.security.acls.MutableAclService; +import org.springframework.security.acls.NotFoundException; +import org.springframework.security.acls.domain.AccessControlEntryImpl; +import org.springframework.security.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.objectidentity.ObjectIdentityImpl; +import org.springframework.security.acls.sid.GrantedAuthoritySid; +import org.springframework.security.acls.sid.PrincipalSid; +import org.springframework.security.acls.sid.Sid; -import org.acegisecurity.context.SecurityContextHolder; +import org.springframework.security.context.SecurityContextHolder; import org.springframework.dao.DataAccessException; diff --git a/core/src/main/java/org/acegisecurity/acls/jdbc/LookupStrategy.java b/core/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java similarity index 83% rename from core/src/main/java/org/acegisecurity/acls/jdbc/LookupStrategy.java rename to core/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java index f2f95a28b1..e8791916a7 100644 --- a/core/src/main/java/org/acegisecurity/acls/jdbc/LookupStrategy.java +++ b/core/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.jdbc; +package org.springframework.security.acls.jdbc; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; -import org.acegisecurity.acls.sid.Sid; +import org.springframework.security.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.sid.Sid; import java.util.Map; @@ -37,7 +37,7 @@ public interface LookupStrategy { * to provide SID optimisations) * * @return the Map pursuant to the interface contract for {@link - * org.acegisecurity.acls.AclService#readAclsById(ObjectIdentity[], Sid[])} + * org.springframework.security.acls.AclService#readAclsById(ObjectIdentity[], Sid[])} */ Map readAclsById(ObjectIdentity[] objects, Sid[] sids); } diff --git a/core/src/main/java/org/acegisecurity/acls/jdbc/package.html b/core/src/main/java/org/springframework/security/acls/jdbc/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/acls/jdbc/package.html rename to core/src/main/java/org/springframework/security/acls/jdbc/package.html diff --git a/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentity.java b/core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentity.java similarity index 97% rename from core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentity.java rename to core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentity.java index 169ebf3bbe..3d1634a088 100644 --- a/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentity.java +++ b/core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentity.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.objectidentity; +package org.springframework.security.acls.objectidentity; import java.io.Serializable; diff --git a/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityImpl.java b/core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentityImpl.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityImpl.java rename to core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentityImpl.java index 06a7282552..80f0801c4f 100644 --- a/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityImpl.java +++ b/core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentityImpl.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.objectidentity; +package org.springframework.security.acls.objectidentity; -import org.acegisecurity.acls.IdentityUnavailableException; +import org.springframework.security.acls.IdentityUnavailableException; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; @@ -25,7 +25,7 @@ import java.lang.reflect.Method; /** - * Simple implementation of {@link org.acegisecurity.acl.basic.AclObjectIdentity AclObjectIdentity}. + * Simple implementation of {@link org.springframework.security.acl.basic.AclObjectIdentity AclObjectIdentity}. *

* Uses Strings to store the identity of the domain object instance. Also offers a constructor that uses * reflection to build the identity information. diff --git a/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityRetrievalStrategy.java b/core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentityRetrievalStrategy.java similarity index 94% rename from core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityRetrievalStrategy.java rename to core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentityRetrievalStrategy.java index bf1c4f78ba..7963ec8f96 100644 --- a/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityRetrievalStrategy.java +++ b/core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentityRetrievalStrategy.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acls.objectidentity; +package org.springframework.security.acls.objectidentity; /** * Strategy interface that provides the ability to determine which {@link ObjectIdentity} diff --git a/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityRetrievalStrategyImpl.java b/core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentityRetrievalStrategyImpl.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityRetrievalStrategyImpl.java rename to core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentityRetrievalStrategyImpl.java index 436e535192..893d20dd78 100644 --- a/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityRetrievalStrategyImpl.java +++ b/core/src/main/java/org/springframework/security/acls/objectidentity/ObjectIdentityRetrievalStrategyImpl.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.acls.objectidentity; +package org.springframework.security.acls.objectidentity; /** * Basic implementation of {@link ObjectIdentityRetrievalStrategy} that uses the constructor of {@link diff --git a/core/src/main/java/org/acegisecurity/acls/objectidentity/package.html b/core/src/main/java/org/springframework/security/acls/objectidentity/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/acls/objectidentity/package.html rename to core/src/main/java/org/springframework/security/acls/objectidentity/package.html diff --git a/core/src/main/java/org/acegisecurity/acls/package.html b/core/src/main/java/org/springframework/security/acls/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/acls/package.html rename to core/src/main/java/org/springframework/security/acls/package.html diff --git a/core/src/main/java/org/acegisecurity/acls/sid/GrantedAuthoritySid.java b/core/src/main/java/org/springframework/security/acls/sid/GrantedAuthoritySid.java similarity index 95% rename from core/src/main/java/org/acegisecurity/acls/sid/GrantedAuthoritySid.java rename to core/src/main/java/org/springframework/security/acls/sid/GrantedAuthoritySid.java index da54a33f7a..0e0148e6f4 100644 --- a/core/src/main/java/org/acegisecurity/acls/sid/GrantedAuthoritySid.java +++ b/core/src/main/java/org/springframework/security/acls/sid/GrantedAuthoritySid.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.sid; +package org.springframework.security.acls.sid; -import org.acegisecurity.GrantedAuthority; +import org.springframework.security.GrantedAuthority; import org.springframework.util.Assert; @@ -53,7 +53,7 @@ public class GrantedAuthoritySid implements Sid { return false; } - // Delegate to getGrantedAuthority() to perform actual comparison (both should be identical) + // Delegate to getGrantedAuthority() to perform actual comparison (both should be identical) return ((GrantedAuthoritySid) object).getGrantedAuthority().equals(this.getGrantedAuthority()); } diff --git a/core/src/main/java/org/acegisecurity/acls/sid/PrincipalSid.java b/core/src/main/java/org/springframework/security/acls/sid/PrincipalSid.java similarity index 93% rename from core/src/main/java/org/acegisecurity/acls/sid/PrincipalSid.java rename to core/src/main/java/org/springframework/security/acls/sid/PrincipalSid.java index 4d7223fbde..6a64440c23 100644 --- a/core/src/main/java/org/acegisecurity/acls/sid/PrincipalSid.java +++ b/core/src/main/java/org/springframework/security/acls/sid/PrincipalSid.java @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.sid; +package org.springframework.security.acls.sid; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.userdetails.UserDetails; import org.springframework.util.Assert; @@ -58,7 +58,7 @@ public class PrincipalSid implements Sid { return false; } - // Delegate to getPrincipal() to perform actual comparison (both should be identical) + // Delegate to getPrincipal() to perform actual comparison (both should be identical) return ((PrincipalSid) object).getPrincipal().equals(this.getPrincipal()); } diff --git a/core/src/main/java/org/acegisecurity/acls/sid/Sid.java b/core/src/main/java/org/springframework/security/acls/sid/Sid.java similarity index 97% rename from core/src/main/java/org/acegisecurity/acls/sid/Sid.java rename to core/src/main/java/org/springframework/security/acls/sid/Sid.java index 477fd3a0fe..725551a182 100644 --- a/core/src/main/java/org/acegisecurity/acls/sid/Sid.java +++ b/core/src/main/java/org/springframework/security/acls/sid/Sid.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.acls.sid; +package org.springframework.security.acls.sid; /** * A security identity recognised by the ACL system. diff --git a/core/src/main/java/org/acegisecurity/acls/sid/SidRetrievalStrategy.java b/core/src/main/java/org/springframework/security/acls/sid/SidRetrievalStrategy.java similarity index 91% rename from core/src/main/java/org/acegisecurity/acls/sid/SidRetrievalStrategy.java rename to core/src/main/java/org/springframework/security/acls/sid/SidRetrievalStrategy.java index c46b62212b..85908c9dd9 100644 --- a/core/src/main/java/org/acegisecurity/acls/sid/SidRetrievalStrategy.java +++ b/core/src/main/java/org/springframework/security/acls/sid/SidRetrievalStrategy.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.acls.sid; +package org.springframework.security.acls.sid; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; /** diff --git a/core/src/main/java/org/acegisecurity/acls/sid/SidRetrievalStrategyImpl.java b/core/src/main/java/org/springframework/security/acls/sid/SidRetrievalStrategyImpl.java similarity index 91% rename from core/src/main/java/org/acegisecurity/acls/sid/SidRetrievalStrategyImpl.java rename to core/src/main/java/org/springframework/security/acls/sid/SidRetrievalStrategyImpl.java index 7fe5a8b9c6..c70f0dd63b 100644 --- a/core/src/main/java/org/acegisecurity/acls/sid/SidRetrievalStrategyImpl.java +++ b/core/src/main/java/org/springframework/security/acls/sid/SidRetrievalStrategyImpl.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.acegisecurity.acls.sid; +package org.springframework.security.acls.sid; -import org.acegisecurity.Authentication; -import org.acegisecurity.GrantedAuthority; +import org.springframework.security.Authentication; +import org.springframework.security.GrantedAuthority; import java.util.List; import java.util.Vector; diff --git a/core/src/main/java/org/acegisecurity/acls/sid/package.html b/core/src/main/java/org/springframework/security/acls/sid/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/acls/sid/package.html rename to core/src/main/java/org/springframework/security/acls/sid/package.html diff --git a/core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java b/core/src/main/java/org/springframework/security/adapters/AbstractAdapterAuthenticationToken.java similarity index 94% rename from core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java rename to core/src/main/java/org/springframework/security/adapters/AbstractAdapterAuthenticationToken.java index 39322c6e03..2dd0e6d21e 100644 --- a/core/src/main/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/adapters/AbstractAdapterAuthenticationToken.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package org.acegisecurity.adapters; +package org.springframework.security.adapters; -import org.acegisecurity.GrantedAuthority; +import org.springframework.security.GrantedAuthority; -import org.acegisecurity.providers.AbstractAuthenticationToken; +import org.springframework.security.providers.AbstractAuthenticationToken; /** diff --git a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java b/core/src/main/java/org/springframework/security/adapters/AuthByAdapter.java similarity index 93% rename from core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java rename to core/src/main/java/org/springframework/security/adapters/AuthByAdapter.java index 50af9fe47d..4b3f8c01e2 100644 --- a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapter.java +++ b/core/src/main/java/org/springframework/security/adapters/AuthByAdapter.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.adapters; +package org.springframework.security.adapters; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; /** diff --git a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java b/core/src/main/java/org/springframework/security/adapters/AuthByAdapterProvider.java similarity index 89% rename from core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java rename to core/src/main/java/org/springframework/security/adapters/AuthByAdapterProvider.java index 3b46273b17..69c9e98ea6 100644 --- a/core/src/main/java/org/acegisecurity/adapters/AuthByAdapterProvider.java +++ b/core/src/main/java/org/springframework/security/adapters/AuthByAdapterProvider.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package org.acegisecurity.adapters; +package org.springframework.security.adapters; -import org.acegisecurity.AcegiMessageSource; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.BadCredentialsException; +import org.springframework.security.AcegiMessageSource; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.BadCredentialsException; -import org.acegisecurity.providers.AuthenticationProvider; +import org.springframework.security.providers.AuthenticationProvider; import org.springframework.beans.factory.InitializingBean; diff --git a/core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java b/core/src/main/java/org/springframework/security/adapters/HttpRequestIntegrationFilter.java similarity index 91% rename from core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java rename to core/src/main/java/org/springframework/security/adapters/HttpRequestIntegrationFilter.java index 5ec0b273f2..00b961c0cf 100644 --- a/core/src/main/java/org/acegisecurity/adapters/HttpRequestIntegrationFilter.java +++ b/core/src/main/java/org/springframework/security/adapters/HttpRequestIntegrationFilter.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package org.acegisecurity.adapters; +package org.springframework.security.adapters; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; -import org.acegisecurity.context.SecurityContextHolder; +import org.springframework.security.context.SecurityContextHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletRequest; * HttpServletRequest.getUserPrincipal().

Use this filter with container adapters only.

*

This filter never preserves the Authentication on the SecurityContext - it * is replaced every request.

- *

See {@link org.acegisecurity.context.HttpSessionContextIntegrationFilter} for further information.

+ *

See {@link org.springframework.security.context.HttpSessionContextIntegrationFilter} for further information.

* * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java b/core/src/main/java/org/springframework/security/adapters/PrincipalAcegiUserToken.java similarity index 90% rename from core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java rename to core/src/main/java/org/springframework/security/adapters/PrincipalAcegiUserToken.java index 373f6efd4d..f0cf97209d 100644 --- a/core/src/main/java/org/acegisecurity/adapters/PrincipalAcegiUserToken.java +++ b/core/src/main/java/org/springframework/security/adapters/PrincipalAcegiUserToken.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package org.acegisecurity.adapters; +package org.springframework.security.adapters; -import org.acegisecurity.GrantedAuthority; +import org.springframework.security.GrantedAuthority; import java.security.Principal; /** - * A {@link Principal} compatible {@link org.acegisecurity.Authentication} object. + * A {@link Principal} compatible {@link org.springframework.security.Authentication} object. * * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/acegisecurity/adapters/package.html b/core/src/main/java/org/springframework/security/adapters/package.html similarity index 70% rename from core/src/main/java/org/acegisecurity/adapters/package.html rename to core/src/main/java/org/springframework/security/adapters/package.html index 117e4e1e86..b2e14dfc56 100644 --- a/core/src/main/java/org/acegisecurity/adapters/package.html +++ b/core/src/main/java/org/springframework/security/adapters/package.html @@ -3,7 +3,7 @@ Allows external containers to obtain authentication information from the system. -

It is recommended to use the net.sf.acegisecurity.ui.webapp +

It is recommended to use the org.springframework.security.ui.webapp package for standard web applications, as it has much lower configuration complexity.

diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/AbstractAclProvider.java b/core/src/main/java/org/springframework/security/afterinvocation/AbstractAclProvider.java similarity index 83% rename from core/src/main/java/org/acegisecurity/afterinvocation/AbstractAclProvider.java rename to core/src/main/java/org/springframework/security/afterinvocation/AbstractAclProvider.java index 968af86903..17f58e9335 100644 --- a/core/src/main/java/org/acegisecurity/afterinvocation/AbstractAclProvider.java +++ b/core/src/main/java/org/springframework/security/afterinvocation/AbstractAclProvider.java @@ -13,22 +13,22 @@ * limitations under the License. */ -package org.acegisecurity.afterinvocation; +package org.springframework.security.afterinvocation; -import org.acegisecurity.Authentication; -import org.acegisecurity.ConfigAttribute; +import org.springframework.security.Authentication; +import org.springframework.security.ConfigAttribute; -import org.acegisecurity.acls.Acl; -import org.acegisecurity.acls.AclService; -import org.acegisecurity.acls.NotFoundException; -import org.acegisecurity.acls.Permission; -import org.acegisecurity.acls.domain.BasePermission; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; -import org.acegisecurity.acls.objectidentity.ObjectIdentityRetrievalStrategy; -import org.acegisecurity.acls.objectidentity.ObjectIdentityRetrievalStrategyImpl; -import org.acegisecurity.acls.sid.Sid; -import org.acegisecurity.acls.sid.SidRetrievalStrategy; -import org.acegisecurity.acls.sid.SidRetrievalStrategyImpl; +import org.springframework.security.acls.Acl; +import org.springframework.security.acls.AclService; +import org.springframework.security.acls.NotFoundException; +import org.springframework.security.acls.Permission; +import org.springframework.security.acls.domain.BasePermission; +import org.springframework.security.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.objectidentity.ObjectIdentityRetrievalStrategy; +import org.springframework.security.acls.objectidentity.ObjectIdentityRetrievalStrategyImpl; +import org.springframework.security.acls.sid.Sid; +import org.springframework.security.acls.sid.SidRetrievalStrategy; +import org.springframework.security.acls.sid.SidRetrievalStrategyImpl; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java b/core/src/main/java/org/springframework/security/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java similarity index 89% rename from core/src/main/java/org/acegisecurity/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java rename to core/src/main/java/org/springframework/security/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java index c0e3955443..974a6f9a41 100644 --- a/core/src/main/java/org/acegisecurity/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java +++ b/core/src/main/java/org/springframework/security/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.afterinvocation; +package org.springframework.security.afterinvocation; -import org.acegisecurity.AccessDeniedException; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthorizationServiceException; -import org.acegisecurity.ConfigAttribute; -import org.acegisecurity.ConfigAttributeDefinition; +import org.springframework.security.AccessDeniedException; +import org.springframework.security.Authentication; +import org.springframework.security.AuthorizationServiceException; +import org.springframework.security.ConfigAttribute; +import org.springframework.security.ConfigAttributeDefinition; -import org.acegisecurity.acls.AclService; -import org.acegisecurity.acls.Permission; +import org.springframework.security.acls.AclService; +import org.springframework.security.acls.Permission; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,8 +39,8 @@ import java.util.Iterator; *

This after invocation provider will fire if any {@link ConfigAttribute#getAttribute()} matches the {@link * #processConfigAttribute}. The provider will then lookup the ACLs from the AclService and ensure the * principal is - * {@link org.acegisecurity.acls.Acl#isGranted(org.acegisecurity.acls.Permission[], - * org.acegisecurity.acls.sid.Sid[], boolean) Acl.isGranted(Permission[], Sid[], boolean)} + * {@link org.springframework.security.acls.Acl#isGranted(org.springframework.security.acls.Permission[], + * org.springframework.security.acls.sid.Sid[], boolean) Acl.isGranted(Permission[], Sid[], boolean)} * when presenting the {@link #requirePermission} array to that method.

*

If the principal does not have permission, that element will not be included in the returned * Collection.

diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/AclEntryAfterInvocationProvider.java b/core/src/main/java/org/springframework/security/afterinvocation/AclEntryAfterInvocationProvider.java similarity index 88% rename from core/src/main/java/org/acegisecurity/afterinvocation/AclEntryAfterInvocationProvider.java rename to core/src/main/java/org/springframework/security/afterinvocation/AclEntryAfterInvocationProvider.java index 4887600caa..ec32888a76 100644 --- a/core/src/main/java/org/acegisecurity/afterinvocation/AclEntryAfterInvocationProvider.java +++ b/core/src/main/java/org/springframework/security/afterinvocation/AclEntryAfterInvocationProvider.java @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.afterinvocation; +package org.springframework.security.afterinvocation; -import org.acegisecurity.AccessDeniedException; -import org.acegisecurity.AcegiMessageSource; -import org.acegisecurity.Authentication; -import org.acegisecurity.ConfigAttribute; -import org.acegisecurity.ConfigAttributeDefinition; +import org.springframework.security.AccessDeniedException; +import org.springframework.security.AcegiMessageSource; +import org.springframework.security.Authentication; +import org.springframework.security.ConfigAttribute; +import org.springframework.security.ConfigAttributeDefinition; -import org.acegisecurity.acls.AclService; -import org.acegisecurity.acls.Permission; +import org.springframework.security.acls.AclService; +import org.springframework.security.acls.Permission; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,8 +40,8 @@ import java.util.Iterator; * domain object instance for the current Authentication object.

*

This after invocation provider will fire if any {@link ConfigAttribute#getAttribute()} matches the {@link * #processConfigAttribute}. The provider will then lookup the ACLs from the AclService and ensure the - * principal is {@link org.acegisecurity.acls.Acl#isGranted(org.acegisecurity.acls.Permission[], - org.acegisecurity.acls.sid.Sid[], boolean) Acl.isGranted(Permission[], Sid[], boolean)} + * principal is {@link org.springframework.security.acls.Acl#isGranted(org.springframework.security.acls.Permission[], + org.springframework.security.acls.sid.Sid[], boolean) Acl.isGranted(Permission[], Sid[], boolean)} * when presenting the {@link #requirePermission} array to that method.

*

Often users will setup an AclEntryAfterInvocationProvider with a {@link * #processConfigAttribute} of AFTER_ACL_READ and a {@link #requirePermission} of diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProvider.java b/core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProvider.java similarity index 88% rename from core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProvider.java rename to core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProvider.java index 0d9ddf858c..62857cad92 100644 --- a/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProvider.java +++ b/core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProvider.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.acegisecurity.afterinvocation; +package org.springframework.security.afterinvocation; -import org.acegisecurity.AccessDeniedException; -import org.acegisecurity.Authentication; -import org.acegisecurity.ConfigAttribute; -import org.acegisecurity.ConfigAttributeDefinition; +import org.springframework.security.AccessDeniedException; +import org.springframework.security.Authentication; +import org.springframework.security.ConfigAttribute; +import org.springframework.security.ConfigAttributeDefinition; /** diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManager.java b/core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProviderManager.java similarity index 93% rename from core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManager.java rename to core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProviderManager.java index 1a60ac4e1e..52964479f3 100644 --- a/core/src/main/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManager.java +++ b/core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProviderManager.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.acegisecurity.afterinvocation; +package org.springframework.security.afterinvocation; -import org.acegisecurity.AccessDeniedException; -import org.acegisecurity.AfterInvocationManager; -import org.acegisecurity.Authentication; -import org.acegisecurity.ConfigAttribute; -import org.acegisecurity.ConfigAttributeDefinition; +import org.springframework.security.AccessDeniedException; +import org.springframework.security.AfterInvocationManager; +import org.springframework.security.Authentication; +import org.springframework.security.ConfigAttribute; +import org.springframework.security.ConfigAttributeDefinition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/ArrayFilterer.java b/core/src/main/java/org/springframework/security/afterinvocation/ArrayFilterer.java similarity index 90% rename from core/src/main/java/org/acegisecurity/afterinvocation/ArrayFilterer.java rename to core/src/main/java/org/springframework/security/afterinvocation/ArrayFilterer.java index c0733114dd..774d13224c 100644 --- a/core/src/main/java/org/acegisecurity/afterinvocation/ArrayFilterer.java +++ b/core/src/main/java/org/springframework/security/afterinvocation/ArrayFilterer.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.afterinvocation; +package org.springframework.security.afterinvocation; import org.apache.commons.collections.iterators.ArrayIterator; import org.apache.commons.logging.Log; @@ -59,7 +59,7 @@ class ArrayFilterer implements Filterer { /** * - * @see org.acegisecurity.afterinvocation.Filterer#getFilteredObject() + * @see org.springframework.security.afterinvocation.Filterer#getFilteredObject() */ public Object getFilteredObject() { // Recreate an array of same type and filter the removed objects. @@ -86,7 +86,7 @@ class ArrayFilterer implements Filterer { /** * - * @see org.acegisecurity.afterinvocation.Filterer#iterator() + * @see org.springframework.security.afterinvocation.Filterer#iterator() */ public Iterator iterator() { return new ArrayIterator(list); @@ -94,7 +94,7 @@ class ArrayFilterer implements Filterer { /** * - * @see org.acegisecurity.afterinvocation.Filterer#remove(java.lang.Object) + * @see org.springframework.security.afterinvocation.Filterer#remove(java.lang.Object) */ public void remove(Object object) { removeList.add(object); diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java b/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java similarity index 91% rename from core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java rename to core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java index b39c67efc8..6c9311be80 100644 --- a/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java +++ b/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProvider.java @@ -12,18 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.acegisecurity.afterinvocation; +package org.springframework.security.afterinvocation; -import org.acegisecurity.AccessDeniedException; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthorizationServiceException; -import org.acegisecurity.ConfigAttribute; -import org.acegisecurity.ConfigAttributeDefinition; +import org.springframework.security.AccessDeniedException; +import org.springframework.security.Authentication; +import org.springframework.security.AuthorizationServiceException; +import org.springframework.security.ConfigAttribute; +import org.springframework.security.ConfigAttributeDefinition; -import org.acegisecurity.acl.AclEntry; -import org.acegisecurity.acl.AclManager; -import org.acegisecurity.acl.basic.BasicAclEntry; -import org.acegisecurity.acl.basic.SimpleAclEntry; +import org.springframework.security.acl.AclEntry; +import org.springframework.security.acl.AclManager; +import org.springframework.security.acl.basic.BasicAclEntry; +import org.springframework.security.acl.basic.SimpleAclEntry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,11 +43,11 @@ import java.util.Iterator; *

The AclManager is used to retrieve the access control list (ACL) permissions associated with * each Collection domain object instance element for the current Authentication object. * This class is designed to process {@link AclEntry}s that are subclasses of {@link - * org.acegisecurity.acl.basic.BasicAclEntry} only. Generally these are obtained by using the {@link - * org.acegisecurity.acl.basic.BasicAclProvider}.

+ * org.springframework.security.acl.basic.BasicAclEntry} only. Generally these are obtained by using the {@link + * org.springframework.security.acl.basic.BasicAclProvider}.

*

This after invocation provider will fire if any {@link ConfigAttribute#getAttribute()} matches the {@link * #processConfigAttribute}. The provider will then lookup the ACLs from the AclManager and ensure the - * principal is {@link org.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for at least one of the {@link + * principal is {@link org.springframework.security.acl.basic.BasicAclEntry#isPermitted(int)} for at least one of the {@link * #requirePermission}s for each Collection element. If the principal does not have at least one of the * permissions, that element will not be included in the returned Collection.

*

Often users will setup a BasicAclEntryAfterInvocationProvider with a {@link diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProvider.java b/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationProvider.java similarity index 91% rename from core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProvider.java rename to core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationProvider.java index 5d3136a2a7..3665817b03 100644 --- a/core/src/main/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProvider.java +++ b/core/src/main/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationProvider.java @@ -13,18 +13,18 @@ * limitations under the License. */ -package org.acegisecurity.afterinvocation; +package org.springframework.security.afterinvocation; -import org.acegisecurity.AccessDeniedException; -import org.acegisecurity.AcegiMessageSource; -import org.acegisecurity.Authentication; -import org.acegisecurity.ConfigAttribute; -import org.acegisecurity.ConfigAttributeDefinition; +import org.springframework.security.AccessDeniedException; +import org.springframework.security.AcegiMessageSource; +import org.springframework.security.Authentication; +import org.springframework.security.ConfigAttribute; +import org.springframework.security.ConfigAttributeDefinition; -import org.acegisecurity.acl.AclEntry; -import org.acegisecurity.acl.AclManager; -import org.acegisecurity.acl.basic.BasicAclEntry; -import org.acegisecurity.acl.basic.SimpleAclEntry; +import org.springframework.security.acl.AclEntry; +import org.springframework.security.acl.AclManager; +import org.springframework.security.acl.basic.BasicAclEntry; +import org.springframework.security.acl.basic.SimpleAclEntry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,11 +45,11 @@ import java.util.Iterator; * appropriate permission as defined by the {@link AclManager}.

*

The AclManager is used to retrieve the access control list (ACL) permissions associated with a * domain object instance for the current Authentication object. This class is designed to process {@link - * AclEntry}s that are subclasses of {@link org.acegisecurity.acl.basic.BasicAclEntry} only. Generally these are - * obtained by using the {@link org.acegisecurity.acl.basic.BasicAclProvider}.

+ * AclEntry}s that are subclasses of {@link org.springframework.security.acl.basic.BasicAclEntry} only. Generally these are + * obtained by using the {@link org.springframework.security.acl.basic.BasicAclProvider}.

*

This after invocation provider will fire if any {@link ConfigAttribute#getAttribute()} matches the {@link * #processConfigAttribute}. The provider will then lookup the ACLs from the AclManager and ensure the - * principal is {@link org.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for at least one of the {@link + * principal is {@link org.springframework.security.acl.basic.BasicAclEntry#isPermitted(int)} for at least one of the {@link * #requirePermission}s.

*

Often users will setup a BasicAclEntryAfterInvocationProvider with a {@link * #processConfigAttribute} of AFTER_ACL_READ and a {@link #requirePermission} of diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/CollectionFilterer.java b/core/src/main/java/org/springframework/security/afterinvocation/CollectionFilterer.java similarity index 88% rename from core/src/main/java/org/acegisecurity/afterinvocation/CollectionFilterer.java rename to core/src/main/java/org/springframework/security/afterinvocation/CollectionFilterer.java index 50195aad45..0254a56270 100644 --- a/core/src/main/java/org/acegisecurity/afterinvocation/CollectionFilterer.java +++ b/core/src/main/java/org/springframework/security/afterinvocation/CollectionFilterer.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.afterinvocation; +package org.springframework.security.afterinvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,7 +41,7 @@ class CollectionFilterer implements Filterer { private Collection collection; // collectionIter offers significant performance optimisations (as - // per acegisecurity-developer mailing list conversation 19/5/05) + // per security-developer mailing list conversation 19/5/05) private Iterator collectionIter; private Set removeList; @@ -63,8 +63,8 @@ class CollectionFilterer implements Filterer { //~ Methods ======================================================================================================== /** - * - * @see org.acegisecurity.afterinvocation.Filterer#getFilteredObject() + * + * @see org.springframework.security.afterinvocation.Filterer#getFilteredObject() */ public Object getFilteredObject() { // Now the Iterator has ended, remove Objects from Collection @@ -85,8 +85,8 @@ class CollectionFilterer implements Filterer { } /** - * - * @see org.acegisecurity.afterinvocation.Filterer#iterator() + * + * @see org.springframework.security.afterinvocation.Filterer#iterator() */ public Iterator iterator() { collectionIter = collection.iterator(); @@ -95,8 +95,8 @@ class CollectionFilterer implements Filterer { } /** - * - * @see org.acegisecurity.afterinvocation.Filterer#remove(java.lang.Object) + * + * @see org.springframework.security.afterinvocation.Filterer#remove(java.lang.Object) */ public void remove(Object object) { removeList.add(object); diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/Filterer.java b/core/src/main/java/org/springframework/security/afterinvocation/Filterer.java similarity index 96% rename from core/src/main/java/org/acegisecurity/afterinvocation/Filterer.java rename to core/src/main/java/org/springframework/security/afterinvocation/Filterer.java index bc4e1e4e29..3e26be8c10 100644 --- a/core/src/main/java/org/acegisecurity/afterinvocation/Filterer.java +++ b/core/src/main/java/org/springframework/security/afterinvocation/Filterer.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.afterinvocation; +package org.springframework.security.afterinvocation; import java.util.Iterator; diff --git a/core/src/main/java/org/acegisecurity/afterinvocation/package.html b/core/src/main/java/org/springframework/security/afterinvocation/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/afterinvocation/package.html rename to core/src/main/java/org/springframework/security/afterinvocation/package.html diff --git a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java b/core/src/main/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java similarity index 98% rename from core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java rename to core/src/main/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java index 53a998e76c..a5768b4d99 100644 --- a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java +++ b/core/src/main/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessor.java @@ -16,7 +16,7 @@ /* * Copyright (c) 2005 Your Corporation. All Rights Reserved. */ -package org.acegisecurity.captcha; +package org.springframework.security.captcha; /** *

return false if ny CaptchaChannelProcessorTemplate of mapped urls has been requested more than thresold;
diff --git a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java b/core/src/main/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java similarity index 98% rename from core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java rename to core/src/main/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java index fc9966fc25..d138b2e13f 100644 --- a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java +++ b/core/src/main/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessor.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.captcha; +package org.springframework.security.captcha; /** *

return false if thresold is greater than millis since last captcha test has occured;
diff --git a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java b/core/src/main/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java similarity index 98% rename from core/src/main/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java rename to core/src/main/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java index 2234c8d5ae..45b43fdf7f 100644 --- a/core/src/main/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java +++ b/core/src/main/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessor.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.captcha; +package org.springframework.security.captcha; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplate.java b/core/src/main/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplate.java similarity index 90% rename from core/src/main/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplate.java rename to core/src/main/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplate.java index b70f57fb01..dd569ebf65 100644 --- a/core/src/main/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplate.java +++ b/core/src/main/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplate.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package org.acegisecurity.captcha; +package org.springframework.security.captcha; -import org.acegisecurity.ConfigAttribute; -import org.acegisecurity.ConfigAttributeDefinition; +import org.springframework.security.ConfigAttribute; +import org.springframework.security.ConfigAttributeDefinition; -import org.acegisecurity.context.SecurityContextHolder; +import org.springframework.security.context.SecurityContextHolder; -import org.acegisecurity.intercept.web.FilterInvocation; +import org.springframework.security.intercept.web.FilterInvocation; -import org.acegisecurity.securechannel.ChannelEntryPoint; -import org.acegisecurity.securechannel.ChannelProcessor; +import org.springframework.security.securechannel.ChannelEntryPoint; +import org.springframework.security.securechannel.ChannelProcessor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,7 +46,7 @@ import javax.servlet.ServletException; *

The component uses 2 main parameters for its configuration : *

*

* Do not use this class directly. Instead configure web.xml to use the - * {@link org.acegisecurity.util.FilterToBeanProxy}. + * {@link org.springframework.security.util.FilterToBeanProxy}. *

* * @author Ben Alex @@ -135,7 +133,7 @@ public class ExceptionTranslationFilter implements Filter, InitializingBean { catch (ServletException ex) { if (ex.getRootCause() instanceof AuthenticationException || ex.getRootCause() instanceof AccessDeniedException) { - handleException(request, response, chain, (AcegiSecurityException) ex.getRootCause()); + handleException(request, response, chain, (SpringSecurityException) ex.getRootCause()); } else { throw ex; @@ -159,7 +157,7 @@ public class ExceptionTranslationFilter implements Filter, InitializingBean { } private void handleException(ServletRequest request, ServletResponse response, FilterChain chain, - AcegiSecurityException exception) throws IOException, ServletException { + SpringSecurityException exception) throws IOException, ServletException { if (exception instanceof AuthenticationException) { if (logger.isDebugEnabled()) { logger.debug("Authentication exception occurred; redirecting to authentication entry point", exception); @@ -194,7 +192,7 @@ public class ExceptionTranslationFilter implements Filter, InitializingBean { * In situations where you do not wish to unnecessarily create HttpSessions - because the user agent * will know the failed URL, such as with BASIC or Digest authentication - you may wish to * set this property to false. Remember to also set the - * {@link org.acegisecurity.context.HttpSessionContextIntegrationFilter#allowSessionCreation} + * {@link org.springframework.security.context.HttpSessionContextIntegrationFilter#allowSessionCreation} * to false if you set this property to false. * * @return true if the HttpSession will be diff --git a/core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java b/core/src/main/java/org/springframework/security/ui/WebAuthenticationDetails.java similarity index 97% rename from core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java rename to core/src/main/java/org/springframework/security/ui/WebAuthenticationDetails.java index 88ee0d31d1..19cd113aa7 100644 --- a/core/src/main/java/org/acegisecurity/ui/WebAuthenticationDetails.java +++ b/core/src/main/java/org/springframework/security/ui/WebAuthenticationDetails.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.ui; +package org.springframework.security.ui; -import org.acegisecurity.concurrent.SessionIdentifierAware; +import org.springframework.security.concurrent.SessionIdentifierAware; import java.io.Serializable; @@ -39,7 +39,7 @@ public class WebAuthenticationDetails implements SessionIdentifierAware, Seriali /** * Constructor. - * + * *

* NB: This constructor will cause a HttpSession to be created * (this is considered reasonable as all Acegi Security authentication diff --git a/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilter.java similarity index 92% rename from core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java rename to core/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilter.java index 05c72257b8..1b43d46abe 100644 --- a/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilter.java +++ b/core/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.basicauth; +package org.springframework.security.ui.basicauth; import java.io.IOException; @@ -26,15 +26,15 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationManager; -import org.acegisecurity.context.SecurityContextHolder; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; -import org.acegisecurity.ui.AuthenticationDetailsSource; -import org.acegisecurity.ui.AuthenticationDetailsSourceImpl; -import org.acegisecurity.ui.AuthenticationEntryPoint; -import org.acegisecurity.ui.rememberme.RememberMeServices; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationManager; +import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.ui.AuthenticationDetailsSource; +import org.springframework.security.ui.AuthenticationDetailsSourceImpl; +import org.springframework.security.ui.AuthenticationEntryPoint; +import org.springframework.security.ui.rememberme.RememberMeServices; import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,12 +62,12 @@ import org.springframework.util.Assert; *

Basic authentication is an attractive protocol because it is simple and widely deployed. However, it still * transmits a password in clear text and as such is undesirable in many situations. Digest authentication is also * provided by Acegi Security and should be used instead of Basic authentication wherever possible. See {@link - * org.acegisecurity.ui.digestauth.DigestProcessingFilter}.

+ * org.springframework.security.ui.digestauth.DigestProcessingFilter}.

*

Note that if a {@link #rememberMeServices} is set, this filter will automatically send back remember-me * details to the client. Therefore, subsequent requests will not need to present a BASIC authentication header as * they will be authenticated using the remember-me mechanism.

*

Do not use this class directly. Instead configure web.xml to use the {@link - * org.acegisecurity.util.FilterToBeanProxy}.

+ * org.springframework.security.util.FilterToBeanProxy}.

* * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPoint.java b/core/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPoint.java similarity index 93% rename from core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPoint.java rename to core/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPoint.java index c0ed5658cc..59185e3c1a 100644 --- a/core/src/main/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPoint.java +++ b/core/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPoint.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.basicauth; +package org.springframework.security.ui.basicauth; import java.io.IOException; @@ -22,8 +22,8 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.ui.AuthenticationEntryPoint; +import org.springframework.security.AuthenticationException; +import org.springframework.security.ui.AuthenticationEntryPoint; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/acegisecurity/ui/basicauth/package.html b/core/src/main/java/org/springframework/security/ui/basicauth/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/ui/basicauth/package.html rename to core/src/main/java/org/springframework/security/ui/basicauth/package.html diff --git a/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java similarity index 91% rename from core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilter.java rename to core/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java index a5eff646c7..fffa4e92ab 100644 --- a/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilter.java +++ b/core/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package org.acegisecurity.ui.cas; +package org.springframework.security.ui.cas; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationException; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationException; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.acegisecurity.ui.AbstractProcessingFilter; +import org.springframework.security.ui.AbstractProcessingFilter; import javax.servlet.FilterConfig; import javax.servlet.ServletException; @@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletRequest; * UsernamePasswordAuthenticationTokens containing this special principal name, and process * them accordingly by validation with the CAS server.

*

Do not use this class directly. Instead configure web.xml to use the {@link - * org.acegisecurity.util.FilterToBeanProxy}.

+ * org.springframework.security.util.FilterToBeanProxy}.

* * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPoint.java b/core/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java similarity index 96% rename from core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPoint.java rename to core/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java index 840269a39e..797438dc0d 100644 --- a/core/src/main/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPoint.java +++ b/core/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.cas; +package org.springframework.security.ui.cas; import java.io.IOException; import java.net.URLEncoder; @@ -24,8 +24,8 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.ui.AuthenticationEntryPoint; +import org.springframework.security.AuthenticationException; +import org.springframework.security.ui.AuthenticationEntryPoint; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; @@ -46,13 +46,13 @@ public class CasProcessingFilterEntryPoint implements AuthenticationEntryPoint, private ServiceProperties serviceProperties; private String loginUrl; - + /** * Determines whether the Service URL should include the session id for the specific user. As of CAS 3.0.5, the * session id will automatically be stripped. However, older versions of CAS (i.e. CAS 2), do not automatically * strip the session identifier (this is a bug on the part of the older server implementations), so an option to * disable the session encoding is provided for backwards compatibility. - * + * * By default, encoding is enabled. */ private boolean encodeServiceUrlWithSessionId = true; @@ -104,7 +104,7 @@ public class CasProcessingFilterEntryPoint implements AuthenticationEntryPoint, public void setServiceProperties(final ServiceProperties serviceProperties) { this.serviceProperties = serviceProperties; } - + public void setEncodeServiceUrlWithSessionId(final boolean encodeServiceUrlWithSessionId) { this.encodeServiceUrlWithSessionId = encodeServiceUrlWithSessionId; } diff --git a/core/src/main/java/org/acegisecurity/ui/cas/ServiceProperties.java b/core/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java similarity index 98% rename from core/src/main/java/org/acegisecurity/ui/cas/ServiceProperties.java rename to core/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java index 0e38b1c614..cecaa348c7 100644 --- a/core/src/main/java/org/acegisecurity/ui/cas/ServiceProperties.java +++ b/core/src/main/java/org/springframework/security/ui/cas/ServiceProperties.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.cas; +package org.springframework.security.ui.cas; import org.springframework.beans.factory.InitializingBean; diff --git a/core/src/main/java/org/acegisecurity/ui/cas/package.html b/core/src/main/java/org/springframework/security/ui/cas/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/ui/cas/package.html rename to core/src/main/java/org/springframework/security/ui/cas/package.html diff --git a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilter.java similarity index 94% rename from core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java rename to core/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilter.java index 9bb7dfc7a0..b4232a4888 100644 --- a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java +++ b/core/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilter.java @@ -13,27 +13,27 @@ * limitations under the License. */ -package org.acegisecurity.ui.digestauth; +package org.springframework.security.ui.digestauth; -import org.acegisecurity.AcegiMessageSource; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.AuthenticationServiceException; -import org.acegisecurity.BadCredentialsException; +import org.springframework.security.AcegiMessageSource; +import org.springframework.security.AuthenticationException; +import org.springframework.security.AuthenticationServiceException; +import org.springframework.security.BadCredentialsException; -import org.acegisecurity.context.SecurityContextHolder; +import org.springframework.security.context.SecurityContextHolder; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; -import org.acegisecurity.providers.dao.UserCache; -import org.acegisecurity.providers.dao.cache.NullUserCache; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.providers.dao.UserCache; +import org.springframework.security.providers.dao.cache.NullUserCache; -import org.acegisecurity.ui.AuthenticationDetailsSource; -import org.acegisecurity.ui.AuthenticationDetailsSourceImpl; +import org.springframework.security.ui.AuthenticationDetailsSource; +import org.springframework.security.ui.AuthenticationDetailsSourceImpl; -import org.acegisecurity.userdetails.UserDetails; -import org.acegisecurity.userdetails.UserDetailsService; -import org.acegisecurity.userdetails.UsernameNotFoundException; +import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.userdetails.UserDetailsService; +import org.springframework.security.userdetails.UsernameNotFoundException; -import org.acegisecurity.util.StringSplitUtils; +import org.springframework.security.util.StringSplitUtils; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; @@ -73,16 +73,16 @@ import javax.servlet.http.HttpServletResponse; *

This Digest implementation has been designed to avoid needing to store session state between invocations. * All session management information is stored in the "nonce" that is sent to the client by the {@link * DigestProcessingFilterEntryPoint}.

- *

If authentication is successful, the resulting {@link org.acegisecurity.Authentication Authentication} + *

If authentication is successful, the resulting {@link org.springframework.security.Authentication Authentication} * object will be placed into the SecurityContextHolder.

- *

If authentication fails, an {@link org.acegisecurity.ui.AuthenticationEntryPoint AuthenticationEntryPoint} + *

If authentication fails, an {@link org.springframework.security.ui.AuthenticationEntryPoint AuthenticationEntryPoint} * implementation is called. This must always be {@link DigestProcessingFilterEntryPoint}, which will prompt the user * to authenticate again via Digest authentication.

*

Note there are limitations to Digest authentication, although it is a more comprehensive and secure solution * than Basic authentication. Please see RFC 2617 section 4 for a full discussion on the advantages of Digest * authentication over Basic authentication, including commentary on the limitations that it still imposes.

*

Do not use this class directly. Instead configure web.xml to use the {@link - * org.acegisecurity.util.FilterToBeanProxy}.

+ * org.springframework.security.util.FilterToBeanProxy}.

*/ public class DigestProcessingFilter implements Filter, InitializingBean, MessageSourceAware { //~ Static fields/initializers ===================================================================================== diff --git a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPoint.java b/core/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPoint.java similarity index 96% rename from core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPoint.java rename to core/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPoint.java index e17f0ce64a..79ec0c8aab 100644 --- a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPoint.java +++ b/core/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPoint.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.digestauth; +package org.springframework.security.ui.digestauth; import java.io.IOException; @@ -22,8 +22,8 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.ui.AuthenticationEntryPoint; +import org.springframework.security.AuthenticationException; +import org.springframework.security.ui.AuthenticationEntryPoint; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.logging.Log; @@ -80,7 +80,7 @@ public class DigestProcessingFilterEntryPoint implements AuthenticationEntryPoin HttpServletResponse httpResponse = (HttpServletResponse) response; // compute a nonce (do not use remote IP address due to proxy farms) - // format of nonce is: + // format of nonce is: // base64(expirationTime + ":" + md5Hex(expirationTime + ":" + key)) long expiryTime = System.currentTimeMillis() + (nonceValiditySeconds * 1000); String signatureValue = new String(DigestUtils.md5Hex(expiryTime + ":" + key)); diff --git a/core/src/main/java/org/acegisecurity/ui/digestauth/NonceExpiredException.java b/core/src/main/java/org/springframework/security/ui/digestauth/NonceExpiredException.java similarity index 92% rename from core/src/main/java/org/acegisecurity/ui/digestauth/NonceExpiredException.java rename to core/src/main/java/org/springframework/security/ui/digestauth/NonceExpiredException.java index 205918627d..63e7ea1846 100644 --- a/core/src/main/java/org/acegisecurity/ui/digestauth/NonceExpiredException.java +++ b/core/src/main/java/org/springframework/security/ui/digestauth/NonceExpiredException.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.ui.digestauth; +package org.springframework.security.ui.digestauth; -import org.acegisecurity.AuthenticationException; +import org.springframework.security.AuthenticationException; /** diff --git a/core/src/main/java/org/acegisecurity/ui/digestauth/package.html b/core/src/main/java/org/springframework/security/ui/digestauth/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/ui/digestauth/package.html rename to core/src/main/java/org/springframework/security/ui/digestauth/package.html diff --git a/core/src/main/java/org/acegisecurity/ui/logout/LogoutFilter.java b/core/src/main/java/org/springframework/security/ui/logout/LogoutFilter.java similarity index 92% rename from core/src/main/java/org/acegisecurity/ui/logout/LogoutFilter.java rename to core/src/main/java/org/springframework/security/ui/logout/LogoutFilter.java index d5a043e69c..55870db23d 100644 --- a/core/src/main/java/org/acegisecurity/ui/logout/LogoutFilter.java +++ b/core/src/main/java/org/springframework/security/ui/logout/LogoutFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.logout; +package org.springframework.security.ui.logout; import java.io.IOException; @@ -26,9 +26,9 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.acegisecurity.Authentication; -import org.acegisecurity.util.RedirectUtils; -import org.acegisecurity.context.SecurityContextHolder; +import org.springframework.security.Authentication; +import org.springframework.security.util.RedirectUtils; +import org.springframework.security.context.SecurityContextHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.util.Assert; @@ -45,7 +45,7 @@ import org.springframework.util.Assert; *

*

* Do not use this class directly. Instead configure web.xml to use the - * {@link org.acegisecurity.util.FilterToBeanProxy}. + * {@link org.springframework.security.util.FilterToBeanProxy}. *

* * @author Ben Alex diff --git a/core/src/main/java/org/acegisecurity/ui/logout/LogoutHandler.java b/core/src/main/java/org/springframework/security/ui/logout/LogoutHandler.java similarity index 90% rename from core/src/main/java/org/acegisecurity/ui/logout/LogoutHandler.java rename to core/src/main/java/org/springframework/security/ui/logout/LogoutHandler.java index 8bd51e5324..abd44113a3 100644 --- a/core/src/main/java/org/acegisecurity/ui/logout/LogoutHandler.java +++ b/core/src/main/java/org/springframework/security/ui/logout/LogoutHandler.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.ui.logout; +package org.springframework.security.ui.logout; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/org/acegisecurity/ui/logout/SecurityContextLogoutHandler.java b/core/src/main/java/org/springframework/security/ui/logout/SecurityContextLogoutHandler.java similarity index 87% rename from core/src/main/java/org/acegisecurity/ui/logout/SecurityContextLogoutHandler.java rename to core/src/main/java/org/springframework/security/ui/logout/SecurityContextLogoutHandler.java index cd0bec94dd..cb46376b71 100644 --- a/core/src/main/java/org/acegisecurity/ui/logout/SecurityContextLogoutHandler.java +++ b/core/src/main/java/org/springframework/security/ui/logout/SecurityContextLogoutHandler.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package org.acegisecurity.ui.logout; +package org.springframework.security.ui.logout; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; -import org.acegisecurity.context.SecurityContextHolder; +import org.springframework.security.context.SecurityContextHolder; import org.springframework.util.Assert; import javax.servlet.http.HttpServletRequest; @@ -26,13 +26,13 @@ import javax.servlet.http.HttpSession; /** * Performs a logout by modifying the - * {@link org.acegisecurity.context.SecurityContextHolder}. - * + * {@link org.springframework.security.context.SecurityContextHolder}. + * *

* Will also invalidate the {@link HttpSession} if * {@link #isInvalidateHttpSession()} is true and the session is * not null. - * + * * @author Ben Alex * @version $Id: SecurityContextLogoutHandler.java 1784 2007-02-24 21:00:24Z * luke_t $ @@ -45,7 +45,7 @@ public class SecurityContextLogoutHandler implements LogoutHandler { /** * Requires the request to be passed in. - * + * * @param request from which to obtain a HTTP session (cannot be null) * @param response not used (can be null) * @param authentication not used (can be null) @@ -69,7 +69,7 @@ public class SecurityContextLogoutHandler implements LogoutHandler { /** * Causes the {@link HttpSession} to be invalidated when this * {@link LogoutHandler} is invoked. Defaults to true. - * + * * @param invalidateHttpSession true if you wish the session to be * invalidated (default) or false if it should not be */ diff --git a/core/src/main/java/org/acegisecurity/ui/package.html b/core/src/main/java/org/springframework/security/ui/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/ui/package.html rename to core/src/main/java/org/springframework/security/ui/package.html diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/NullRememberMeServices.java b/core/src/main/java/org/springframework/security/ui/rememberme/NullRememberMeServices.java similarity index 93% rename from core/src/main/java/org/acegisecurity/ui/rememberme/NullRememberMeServices.java rename to core/src/main/java/org/springframework/security/ui/rememberme/NullRememberMeServices.java index e5bfb3adda..1ad6232812 100644 --- a/core/src/main/java/org/acegisecurity/ui/rememberme/NullRememberMeServices.java +++ b/core/src/main/java/org/springframework/security/ui/rememberme/NullRememberMeServices.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.ui.rememberme; +package org.springframework.security.ui.rememberme; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilter.java similarity index 89% rename from core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java rename to core/src/main/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilter.java index d9b2a6c1d4..4a2824464a 100644 --- a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilter.java +++ b/core/src/main/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilter.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package org.acegisecurity.ui.rememberme; +package org.springframework.security.ui.rememberme; -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.context.SecurityContextHolder; +import org.springframework.security.context.SecurityContextHolder; -import org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent; +import org.springframework.security.event.authentication.InteractiveAuthenticationSuccessEvent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,19 +47,19 @@ import javax.servlet.http.HttpServletResponse; /** * Detects if there is no Authentication object in the SecurityContext, and populates it - * with a remember-me authentication token if a {@link org.acegisecurity.ui.rememberme.RememberMeServices} + * with a remember-me authentication token if a {@link org.springframework.security.ui.rememberme.RememberMeServices} * implementation so requests.

Concrete RememberMeServices implementations will have their {@link - * org.acegisecurity.ui.rememberme.RememberMeServices#autoLogin(HttpServletRequest, HttpServletResponse)} method + * org.springframework.security.ui.rememberme.RememberMeServices#autoLogin(HttpServletRequest, HttpServletResponse)} method * called by this filter. The Authentication or null returned by that method will be placed * into the SecurityContext. The AuthenticationManager will be used, so that any concurrent * session management or other authentication-specific behaviour can be achieved. This is the same pattern as with * other authentication mechanisms, which call the AuthenticationManager as part of their contract.

*

If authentication is successful, an {@link - * org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent} will be published to the application + * org.springframework.security.event.authentication.InteractiveAuthenticationSuccessEvent} will be published to the application * context. No events will be published if authentication was unsuccessful, because this would generally be recorded * via an AuthenticationManager-specific application event.

*

Do not use this class directly. Instead configure web.xml to use the {@link - * org.acegisecurity.util.FilterToBeanProxy}.

+ * org.springframework.security.util.FilterToBeanProxy}.

* * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java b/core/src/main/java/org/springframework/security/ui/rememberme/RememberMeServices.java similarity index 89% rename from core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java rename to core/src/main/java/org/springframework/security/ui/rememberme/RememberMeServices.java index 1c88788110..5d59981554 100644 --- a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java +++ b/core/src/main/java/org/springframework/security/ui/rememberme/RememberMeServices.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.acegisecurity.ui.rememberme; +package org.springframework.security.ui.rememberme; -import org.acegisecurity.Authentication; +import org.springframework.security.Authentication; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletResponse; * *

* Acegi Security filters (namely {@link - * org.acegisecurity.ui.AbstractProcessingFilter} and {@link - * org.acegisecurity.ui.rememberme.RememberMeProcessingFilter} will call + * org.springframework.security.ui.AbstractProcessingFilter} and {@link + * org.springframework.security.ui.rememberme.RememberMeProcessingFilter} will call * the methods provided by an implementation of this interface. *

* @@ -61,9 +61,9 @@ public interface RememberMeServices { * Such determinations are left to the implementation. If a browser has presented an unauthorised cookie for * whatever reason, it should be silently ignored and invalidated using the HttpServletResponse * object.

The returned Authentication must be acceptable to {@link - * org.acegisecurity.AuthenticationManager} or {@link org.acegisecurity.providers.AuthenticationProvider} defined + * org.springframework.security.AuthenticationManager} or {@link org.springframework.security.providers.AuthenticationProvider} defined * by the web application. It is recommended {@link - * org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken} be used in most cases, as it has a + * org.springframework.security.providers.rememberme.RememberMeAuthenticationToken} be used in most cases, as it has a * corresponding authentication provider.

* * @param request to look for a remember-me token within diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java b/core/src/main/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServices.java similarity index 95% rename from core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java rename to core/src/main/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServices.java index 7f9875d1de..fce98c5cca 100644 --- a/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java +++ b/core/src/main/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServices.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.rememberme; +package org.springframework.security.ui.rememberme; import java.util.Date; import java.util.Map; @@ -22,15 +22,15 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.acegisecurity.Authentication; -import org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken; -import org.acegisecurity.ui.AccessDeniedHandler; -import org.acegisecurity.ui.AuthenticationDetailsSource; -import org.acegisecurity.ui.AuthenticationDetailsSourceImpl; -import org.acegisecurity.ui.logout.LogoutHandler; -import org.acegisecurity.userdetails.UserDetails; -import org.acegisecurity.userdetails.UserDetailsService; -import org.acegisecurity.userdetails.UsernameNotFoundException; +import org.springframework.security.Authentication; +import org.springframework.security.providers.rememberme.RememberMeAuthenticationToken; +import org.springframework.security.ui.AccessDeniedHandler; +import org.springframework.security.ui.AuthenticationDetailsSource; +import org.springframework.security.ui.AuthenticationDetailsSourceImpl; +import org.springframework.security.ui.logout.LogoutHandler; +import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.userdetails.UserDetailsService; +import org.springframework.security.userdetails.UsernameNotFoundException; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.logging.Log; @@ -58,10 +58,10 @@ import org.springframework.web.bind.RequestUtils; *

* *

- * An {@link org.acegisecurity.userdetails.UserDetailsService} is required by + * An {@link org.springframework.security.userdetails.UserDetailsService} is required by * this implementation, so that it can construct a valid * Authentication from the returned {@link - * org.acegisecurity.userdetails.UserDetails}. This is also necessary so that + * org.springframework.security.userdetails.UserDetails}. This is also necessary so that * the user's password is available and can be checked as part of the encoded * cookie. *

diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/package.html b/core/src/main/java/org/springframework/security/ui/rememberme/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/ui/rememberme/package.html rename to core/src/main/java/org/springframework/security/ui/rememberme/package.html diff --git a/core/src/main/java/org/acegisecurity/ui/savedrequest/Enumerator.java b/core/src/main/java/org/springframework/security/ui/savedrequest/Enumerator.java similarity index 95% rename from core/src/main/java/org/acegisecurity/ui/savedrequest/Enumerator.java rename to core/src/main/java/org/springframework/security/ui/savedrequest/Enumerator.java index 1eefd28acc..2c259f6f2a 100644 --- a/core/src/main/java/org/acegisecurity/ui/savedrequest/Enumerator.java +++ b/core/src/main/java/org/springframework/security/ui/savedrequest/Enumerator.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.savedrequest; +package org.springframework.security.ui.savedrequest; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/org/acegisecurity/ui/savedrequest/FastHttpDateFormat.java b/core/src/main/java/org/springframework/security/ui/savedrequest/FastHttpDateFormat.java similarity index 96% rename from core/src/main/java/org/acegisecurity/ui/savedrequest/FastHttpDateFormat.java rename to core/src/main/java/org/springframework/security/ui/savedrequest/FastHttpDateFormat.java index a8e0c66bec..a70c2f18c2 100644 --- a/core/src/main/java/org/acegisecurity/ui/savedrequest/FastHttpDateFormat.java +++ b/core/src/main/java/org/springframework/security/ui/savedrequest/FastHttpDateFormat.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.savedrequest; +package org.springframework.security.ui.savedrequest; import java.text.DateFormat; import java.text.ParseException; diff --git a/core/src/main/java/org/acegisecurity/ui/savedrequest/SavedCookie.java b/core/src/main/java/org/springframework/security/ui/savedrequest/SavedCookie.java similarity index 93% rename from core/src/main/java/org/acegisecurity/ui/savedrequest/SavedCookie.java rename to core/src/main/java/org/springframework/security/ui/savedrequest/SavedCookie.java index 17b2d34597..1362b5d338 100644 --- a/core/src/main/java/org/acegisecurity/ui/savedrequest/SavedCookie.java +++ b/core/src/main/java/org/springframework/security/ui/savedrequest/SavedCookie.java @@ -1,4 +1,4 @@ -package org.acegisecurity.ui.savedrequest; +package org.springframework.security.ui.savedrequest; import javax.servlet.http.Cookie; import java.io.Serializable; diff --git a/core/src/main/java/org/acegisecurity/ui/savedrequest/SavedRequest.java b/core/src/main/java/org/springframework/security/ui/savedrequest/SavedRequest.java similarity index 93% rename from core/src/main/java/org/acegisecurity/ui/savedrequest/SavedRequest.java rename to core/src/main/java/org/springframework/security/ui/savedrequest/SavedRequest.java index 70e7250f97..0011a75e21 100644 --- a/core/src/main/java/org/acegisecurity/ui/savedrequest/SavedRequest.java +++ b/core/src/main/java/org/springframework/security/ui/savedrequest/SavedRequest.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.acegisecurity.ui.savedrequest; +package org.springframework.security.ui.savedrequest; -import org.acegisecurity.util.PortResolver; -import org.acegisecurity.util.UrlUtils; +import org.springframework.security.util.PortResolver; +import org.springframework.security.util.UrlUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.util.Assert; @@ -34,9 +34,9 @@ import java.util.TreeMap; /** * Represents central information from a HttpServletRequest.

This class is used by {@link - * org.acegisecurity.ui.AbstractProcessingFilter} and {@link org.acegisecurity.wrapper.SavedRequestAwareWrapper} to + * org.springframework.security.ui.AbstractProcessingFilter} and {@link org.springframework.security.wrapper.SavedRequestAwareWrapper} to * reproduce the request after successful authentication. An instance of this class is stored at the time of an - * authentication exception by {@link org.acegisecurity.ui.ExceptionTranslationFilter}.

+ * authentication exception by {@link org.springframework.security.ui.ExceptionTranslationFilter}.

*

IMPLEMENTATION NOTE: It is assumed that this object is accessed only from the context of a single * thread, so no synchronization around internal collection classes is performed.

*

This class is based on code in Apache Tomcat.

diff --git a/core/src/main/java/org/acegisecurity/ui/savedrequest/package.html b/core/src/main/java/org/springframework/security/ui/savedrequest/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/ui/savedrequest/package.html rename to core/src/main/java/org/springframework/security/ui/savedrequest/package.html diff --git a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionApplicationEvent.java b/core/src/main/java/org/springframework/security/ui/session/HttpSessionApplicationEvent.java similarity index 96% rename from core/src/main/java/org/acegisecurity/ui/session/HttpSessionApplicationEvent.java rename to core/src/main/java/org/springframework/security/ui/session/HttpSessionApplicationEvent.java index a4b7edfdf8..7d8e9b1fbf 100644 --- a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionApplicationEvent.java +++ b/core/src/main/java/org/springframework/security/ui/session/HttpSessionApplicationEvent.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.session; +package org.springframework.security.ui.session; import org.springframework.context.ApplicationEvent; diff --git a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionCreatedEvent.java b/core/src/main/java/org/springframework/security/ui/session/HttpSessionCreatedEvent.java similarity index 95% rename from core/src/main/java/org/acegisecurity/ui/session/HttpSessionCreatedEvent.java rename to core/src/main/java/org/springframework/security/ui/session/HttpSessionCreatedEvent.java index 86e76cb912..85b1a326fa 100644 --- a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionCreatedEvent.java +++ b/core/src/main/java/org/springframework/security/ui/session/HttpSessionCreatedEvent.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.session; +package org.springframework.security.ui.session; import javax.servlet.http.HttpSession; diff --git a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionDestroyedEvent.java b/core/src/main/java/org/springframework/security/ui/session/HttpSessionDestroyedEvent.java similarity index 95% rename from core/src/main/java/org/acegisecurity/ui/session/HttpSessionDestroyedEvent.java rename to core/src/main/java/org/springframework/security/ui/session/HttpSessionDestroyedEvent.java index c1ddff339c..3f9fa3c46a 100644 --- a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionDestroyedEvent.java +++ b/core/src/main/java/org/springframework/security/ui/session/HttpSessionDestroyedEvent.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.session; +package org.springframework.security.ui.session; import javax.servlet.http.HttpSession; diff --git a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionEventPublisher.java b/core/src/main/java/org/springframework/security/ui/session/HttpSessionEventPublisher.java similarity index 94% rename from core/src/main/java/org/acegisecurity/ui/session/HttpSessionEventPublisher.java rename to core/src/main/java/org/springframework/security/ui/session/HttpSessionEventPublisher.java index 77310b8a7a..86db367364 100644 --- a/core/src/main/java/org/acegisecurity/ui/session/HttpSessionEventPublisher.java +++ b/core/src/main/java/org/springframework/security/ui/session/HttpSessionEventPublisher.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.acegisecurity.ui.session; +package org.springframework.security.ui.session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -31,7 +31,7 @@ import javax.servlet.http.HttpSessionListener; * Declared in web.xml as * 
  * <listener>
- *     <listener-class>org.acegisecurity.ui.session.HttpSessionEventPublisher</listener-class>
+ *     <listener-class>org.springframework.security.ui.session.HttpSessionEventPublisher</listener-class>
  * </listener>
  *
* diff --git a/core/src/main/java/org/acegisecurity/ui/session/package.html b/core/src/main/java/org/springframework/security/ui/session/package.html similarity index 100% rename from core/src/main/java/org/acegisecurity/ui/session/package.html rename to core/src/main/java/org/springframework/security/ui/session/package.html diff --git a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserAuthorityChanger.java b/core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserAuthorityChanger.java similarity index 82% rename from core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserAuthorityChanger.java rename to core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserAuthorityChanger.java index 2e3688dd3d..f8b01c5223 100644 --- a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserAuthorityChanger.java +++ b/core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserAuthorityChanger.java @@ -1,10 +1,10 @@ -package org.acegisecurity.ui.switchuser; +package org.springframework.security.ui.switchuser; import java.util.List; -import org.acegisecurity.Authentication; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.userdetails.UserDetails; +import org.springframework.security.Authentication; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.userdetails.UserDetails; /** * Allows subclasses to modify the {@link GrantedAuthority} list that will be assigned to the principal diff --git a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserGrantedAuthority.java b/core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserGrantedAuthority.java similarity index 82% rename from core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserGrantedAuthority.java rename to core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserGrantedAuthority.java index 407d2f0e4e..d859b0243e 100644 --- a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserGrantedAuthority.java +++ b/core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserGrantedAuthority.java @@ -13,20 +13,20 @@ * limitations under the License. */ -package org.acegisecurity.ui.switchuser; +package org.springframework.security.ui.switchuser; -import org.acegisecurity.Authentication; -import org.acegisecurity.GrantedAuthorityImpl; +import org.springframework.security.Authentication; +import org.springframework.security.GrantedAuthorityImpl; /** - * Custom GrantedAuthority used by {@link org.acegisecurity.ui.switchuser.SwitchUserProcessingFilter}

Stores + * Custom GrantedAuthority used by {@link org.springframework.security.ui.switchuser.SwitchUserProcessingFilter}

Stores * the Authentication object of the original user to be used later when 'exiting' from a user switch.

* * @author Mark St.Godard * @version $Id$ * - * @see org.acegisecurity.ui.switchuser.SwitchUserProcessingFilter + * @see org.springframework.security.ui.switchuser.SwitchUserProcessingFilter */ public class SwitchUserGrantedAuthority extends GrantedAuthorityImpl { //~ Instance fields ================================================================================================ diff --git a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilter.java similarity index 92% rename from core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java rename to core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilter.java index 9a913fdb1e..c977e75501 100644 --- a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java +++ b/core/src/main/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilter.java @@ -13,30 +13,30 @@ * limitations under the License. */ -package org.acegisecurity.ui.switchuser; +package org.springframework.security.ui.switchuser; -import org.acegisecurity.AccountExpiredException; -import org.acegisecurity.AcegiMessageSource; -import org.acegisecurity.Authentication; -import org.acegisecurity.AuthenticationCredentialsNotFoundException; -import org.acegisecurity.AuthenticationException; -import org.acegisecurity.CredentialsExpiredException; -import org.acegisecurity.DisabledException; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.LockedException; +import org.springframework.security.AccountExpiredException; +import org.springframework.security.AcegiMessageSource; +import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationCredentialsNotFoundException; +import org.springframework.security.AuthenticationException; +import org.springframework.security.CredentialsExpiredException; +import org.springframework.security.DisabledException; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.LockedException; -import org.acegisecurity.context.SecurityContextHolder; +import org.springframework.security.context.SecurityContextHolder; -import org.acegisecurity.event.authentication.AuthenticationSwitchUserEvent; +import org.springframework.security.event.authentication.AuthenticationSwitchUserEvent; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.acegisecurity.ui.AuthenticationDetailsSource; -import org.acegisecurity.ui.AuthenticationDetailsSourceImpl; +import org.springframework.security.ui.AuthenticationDetailsSource; +import org.springframework.security.ui.AuthenticationDetailsSourceImpl; -import org.acegisecurity.userdetails.UserDetails; -import org.acegisecurity.userdetails.UserDetailsService; -import org.acegisecurity.userdetails.UsernameNotFoundException; +import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.userdetails.UserDetailsService; +import org.springframework.security.userdetails.UsernameNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -78,14 +78,14 @@ import javax.servlet.http.HttpServletResponse; * Note: This URL will be required to have to appropriate security contraints configured so that only users of that * role can access (i.e. ROLE_ADMIN).

*

On successful switch, the user's SecurityContextHolder will be updated to reflect the - * specified user and will also contain an additinal {@link org.acegisecurity.ui.switchuser.SwitchUserGrantedAuthority + * specified user and will also contain an additinal {@link org.springframework.security.ui.switchuser.SwitchUserGrantedAuthority * } which contains the original user.

*

To 'exit' from a user context, the user will then need to access a URL (see exitUserUrl) that * will switch back to the original user as identified by the SWITCH_USER_GRANTED_AUTHORITY.

*

To configure the Switch User Processing Filter, create a bean definition for the Switch User processing * filter and add to the filterChainProxy.
* Example:

- * <bean id="switchUserProcessingFilter" class="org.acegisecurity.ui.switchuser.SwitchUserProcessingFilter">
+ * <bean id="switchUserProcessingFilter" class="org.springframework.security.ui.switchuser.SwitchUserProcessingFilter">
  *    <property name="authenticationDao" ref="jdbcDaoImpl" />
  *    <property name="switchUserUrl"><value>/j_acegi_switch_user</value></property>
  *    <property name="exitUserUrl"><value>/j_acegi_exit_user</value></property>
@@ -94,7 +94,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author Mark St.Godard
  * @version $Id$
  *
- * @see org.acegisecurity.ui.switchuser.SwitchUserGrantedAuthority
+ * @see org.springframework.security.ui.switchuser.SwitchUserGrantedAuthority
  */
 public class SwitchUserProcessingFilter implements Filter, InitializingBean, ApplicationEventPublisherAware,
     MessageSourceAware {
diff --git a/core/src/main/java/org/acegisecurity/ui/switchuser/package.html b/core/src/main/java/org/springframework/security/ui/switchuser/package.html
similarity index 100%
rename from core/src/main/java/org/acegisecurity/ui/switchuser/package.html
rename to core/src/main/java/org/springframework/security/ui/switchuser/package.html
diff --git a/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilter.java
similarity index 94%
rename from core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilter.java
rename to core/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilter.java
index d6dd8a438c..4156cc3975 100644
--- a/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilter.java
+++ b/core/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilter.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.webapp;
+package org.springframework.security.ui.webapp;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.ui.AbstractProcessingFilter;
+import org.springframework.security.ui.AbstractProcessingFilter;
 import org.springframework.util.Assert;
 
 import javax.servlet.FilterConfig;
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletRequest;
  * 

  *
  * 
Do not use this class directly. Instead configure web.xml to use the {@link
- * org.acegisecurity.util.FilterToBeanProxy}.

+ * org.springframework.security.util.FilterToBeanProxy}.

  *
  * @author Ben Alex
  * @author Colin Sampaleanu
diff --git a/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java b/core/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPoint.java
similarity index 94%
rename from core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java
rename to core/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPoint.java
index 46b733e4c9..ab6350ac79 100644
--- a/core/src/main/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPoint.java
+++ b/core/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPoint.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.webapp;
+package org.springframework.security.ui.webapp;
 
-import org.acegisecurity.AuthenticationException;
+import org.springframework.security.AuthenticationException;
 
-import org.acegisecurity.ui.AuthenticationEntryPoint;
+import org.springframework.security.ui.AuthenticationEntryPoint;
 
-import org.acegisecurity.util.PortMapper;
-import org.acegisecurity.util.PortMapperImpl;
-import org.acegisecurity.util.PortResolver;
-import org.acegisecurity.util.PortResolverImpl;
+import org.springframework.security.util.PortMapper;
+import org.springframework.security.util.PortMapperImpl;
+import org.springframework.security.util.PortResolver;
+import org.springframework.security.util.PortResolverImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -56,7 +56,7 @@ import javax.servlet.http.HttpServletResponse;
  * original request URL. For the forced HTTPS feature to work, the {@link
  * PortMapper} is consulted to determine the HTTP:HTTPS pairs.
  * 

- * 
+ *
  * @author Ben Alex
  * @author colin sampaleanu
  * @author Omri Spector
@@ -94,7 +94,7 @@ public class AuthenticationProcessingFilterEntryPoint implements AuthenticationE
 	/**
 	 * Allows subclasses to modify the login form URL that should be applicable
 	 * for a given request.
-	 * 
+	 *
 	 * @param request the request
 	 * @param response the response
 	 * @param exception the exception
@@ -226,7 +226,7 @@ public class AuthenticationProcessingFilterEntryPoint implements AuthenticationE
 	 * ture (the default is false), and the incoming request for the protected
 	 * resource which triggered the interceptor was not already
 	 * https, then
-	 * 
+	 *
 	 * @param forceHttps
 	 */
 	public void setForceHttps(boolean forceHttps) {
@@ -237,7 +237,7 @@ public class AuthenticationProcessingFilterEntryPoint implements AuthenticationE
 	 * The URL where the AuthenticationProcessingFilter login
 	 * page can be found. Should be relative to the web-app context path, and
 	 * include a leading /
-	 * 
+	 *
 	 * @param loginFormUrl
 	 */
 	public void setLoginFormUrl(String loginFormUrl) {
@@ -255,7 +255,7 @@ public class AuthenticationProcessingFilterEntryPoint implements AuthenticationE
 	/**
 	 * Tells if we are to do a server side include of the
 	 * loginFormUrl instead of a 302 redirect.
-	 * 
+	 *
 	 * @param serverSideRedirect
 	 */
 	public void setServerSideRedirect(boolean serverSideRedirect) {
diff --git a/core/src/main/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/webapp/SiteminderAuthenticationProcessingFilter.java
similarity index 93%
rename from core/src/main/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilter.java
rename to core/src/main/java/org/springframework/security/ui/webapp/SiteminderAuthenticationProcessingFilter.java
index 62c5d2f2ed..2d3786a36e 100644
--- a/core/src/main/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilter.java
+++ b/core/src/main/java/org/springframework/security/ui/webapp/SiteminderAuthenticationProcessingFilter.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.webapp;
+package org.springframework.security.ui.webapp;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
 
-import org.acegisecurity.context.HttpSessionContextIntegrationFilter;
-import org.acegisecurity.context.SecurityContext;
+import org.springframework.security.context.HttpSessionContextIntegrationFilter;
+import org.springframework.security.context.SecurityContext;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -42,7 +42,7 @@ import javax.servlet.http.HttpServletResponse;
  * specified, the parameter names to use are contained in the static fields {@link #ACEGI_SECURITY_FORM_USERNAME_KEY}
  * and {@link #ACEGI_SECURITY_FORM_PASSWORD_KEY}.

  *  
Do not use this class directly. Instead, configure web.xml to use the {@link
- * org.acegisecurity.util.FilterToBeanProxy}.

+ * org.springframework.security.util.FilterToBeanProxy}.

  */
 public class SiteminderAuthenticationProcessingFilter extends AuthenticationProcessingFilter {
     //~ Static fields/initializers =====================================================================================
@@ -77,7 +77,7 @@ public class SiteminderAuthenticationProcessingFilter extends AuthenticationProc
 
     /**
      *
-     * @see org.acegisecurity.ui.AbstractProcessingFilter#attemptAuthentication(javax.servlet.http.HttpServletRequest)
+     * @see org.springframework.security.ui.AbstractProcessingFilter#attemptAuthentication(javax.servlet.http.HttpServletRequest)
      */
     public Authentication attemptAuthentication(HttpServletRequest request)
         throws AuthenticationException {
@@ -193,7 +193,7 @@ public class SiteminderAuthenticationProcessingFilter extends AuthenticationProc
      * target URL when the user isn't already authenticated.
Thank you Paul Garvey for providing a
      * straightforward solution (and code) for this!

      *
-     * @see org.acegisecurity.ui.AbstractProcessingFilter#requiresAuthentication(javax.servlet.http.HttpServletRequest,
+     * @see org.springframework.security.ui.AbstractProcessingFilter#requiresAuthentication(javax.servlet.http.HttpServletRequest,
      *      javax.servlet.http.HttpServletResponse)
      */
     protected boolean requiresAuthentication(final HttpServletRequest request, final HttpServletResponse response) {
diff --git a/core/src/main/java/org/acegisecurity/ui/webapp/package.html b/core/src/main/java/org/springframework/security/ui/webapp/package.html
similarity index 100%
rename from core/src/main/java/org/acegisecurity/ui/webapp/package.html
rename to core/src/main/java/org/springframework/security/ui/webapp/package.html
diff --git a/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/x509/X509ProcessingFilter.java
similarity index 89%
rename from core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java
rename to core/src/main/java/org/springframework/security/ui/x509/X509ProcessingFilter.java
index 65e131e4cc..102d517c5d 100644
--- a/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilter.java
+++ b/core/src/main/java/org/springframework/security/ui/x509/X509ProcessingFilter.java
@@ -13,21 +13,21 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.x509;
+package org.springframework.security.ui.x509;
 
-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.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent;
+import org.springframework.security.event.authentication.InteractiveAuthenticationSuccessEvent;
 
-import org.acegisecurity.providers.x509.X509AuthenticationToken;
+import org.springframework.security.providers.x509.X509AuthenticationToken;
 
-import org.acegisecurity.ui.AbstractProcessingFilter;
-import org.acegisecurity.ui.AuthenticationDetailsSource;
-import org.acegisecurity.ui.AuthenticationDetailsSourceImpl;
+import org.springframework.security.ui.AbstractProcessingFilter;
+import org.springframework.security.ui.AuthenticationDetailsSource;
+import org.springframework.security.ui.AuthenticationDetailsSourceImpl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -57,13 +57,13 @@ import javax.servlet.FilterConfig;
  * Processes the X.509 certificate submitted by a client browser when HTTPS is used with client-authentication
  * enabled.
An {@link X509AuthenticationToken} is created with the certificate as the credentials.

  *  
The configured authentication manager is expected to supply a provider which can handle this token (usually
- * an instance of {@link org.acegisecurity.providers.x509.X509AuthenticationProvider}).

+ * an instance of {@link org.springframework.security.providers.x509.X509AuthenticationProvider}).

  *  
If authentication is successful, an {@link
- * org.acegisecurity.event.authentication.InteractiveAuthenticationSuccessEvent} will be published to the application
+ * org.springframework.security.event.authentication.InteractiveAuthenticationSuccessEvent} will be published to the application
  * context. No events will be published if authentication was unsuccessful, because this would generally be recorded
  * via an AuthenticationManager-specific application event.

  *  
Do not use this class directly. Instead configure web.xml to use the {@link
- * org.acegisecurity.util.FilterToBeanProxy}.

+ * org.springframework.security.util.FilterToBeanProxy}.

  *
  * @author Luke Taylor
  * @version $Id$
diff --git a/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPoint.java b/core/src/main/java/org/springframework/security/ui/x509/X509ProcessingFilterEntryPoint.java
similarity index 91%
rename from core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPoint.java
rename to core/src/main/java/org/springframework/security/ui/x509/X509ProcessingFilterEntryPoint.java
index 56ba288e90..cf86dc0706 100644
--- a/core/src/main/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPoint.java
+++ b/core/src/main/java/org/springframework/security/ui/x509/X509ProcessingFilterEntryPoint.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.x509;
+package org.springframework.security.ui.x509;
 
 import java.io.IOException;
 
@@ -22,8 +22,8 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
-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;
 
@@ -39,12 +39,12 @@ import org.apache.commons.logging.LogFactory;
  * 

  * The commence method will always return an
  * HttpServletResponse.SC_FORBIDDEN (403 error).
- * 
+ *
  * @author Luke Taylor
  * @version $Id: X509ProcessingFilterEntryPoint.java 1496 2006-05-23 13:38:33Z
  * benalex $
- * 
- * @see org.acegisecurity.ui.ExceptionTranslationFilter
+ *
+ * @see org.springframework.security.ui.ExceptionTranslationFilter
  */
 public class X509ProcessingFilterEntryPoint implements AuthenticationEntryPoint {
 	// ~ Static fields/initializers
@@ -57,11 +57,11 @@ public class X509ProcessingFilterEntryPoint implements AuthenticationEntryPoint
 
 	/**
 	 * Returns a 403 error code to the client.
-	 * 
+	 *
 	 * @param request DOCUMENT ME!
 	 * @param response DOCUMENT ME!
 	 * @param authException DOCUMENT ME!
-	 * 
+	 *
 	 * @throws IOException DOCUMENT ME!
 	 * @throws ServletException DOCUMENT ME!
 	 */
diff --git a/core/src/main/java/org/acegisecurity/ui/x509/package.html b/core/src/main/java/org/springframework/security/ui/x509/package.html
similarity index 100%
rename from core/src/main/java/org/acegisecurity/ui/x509/package.html
rename to core/src/main/java/org/springframework/security/ui/x509/package.html
diff --git a/core/src/main/java/org/acegisecurity/userdetails/User.java b/core/src/main/java/org/springframework/security/userdetails/User.java
similarity index 96%
rename from core/src/main/java/org/acegisecurity/userdetails/User.java
rename to core/src/main/java/org/springframework/security/userdetails/User.java
index 5b8bb92d7f..0e8d947fc2 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/User.java
+++ b/core/src/main/java/org/springframework/security/userdetails/User.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails;
+package org.springframework.security.userdetails;
 
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.GrantedAuthority;
 
 import org.springframework.util.Assert;
 
@@ -44,7 +44,7 @@ public class User implements UserDetails {
 
     /**
      * Construct the User with the details required by
-     * {@link org.acegisecurity.providers.dao.DaoAuthenticationProvider}.
+     * {@link org.springframework.security.providers.dao.DaoAuthenticationProvider}.
      *
      * @param username the username presented to the
      *        DaoAuthenticationProvider
@@ -69,7 +69,7 @@ public class User implements UserDetails {
 
     /**
      * Construct the User with the details required by
-     * {@link org.acegisecurity.providers.dao.DaoAuthenticationProvider}.
+     * {@link org.springframework.security.providers.dao.DaoAuthenticationProvider}.
      *
      * @param username the username presented to the
      *        DaoAuthenticationProvider
@@ -99,7 +99,7 @@ public class User implements UserDetails {
 
     /**
      * Construct the User with the details required by
-     * {@link org.acegisecurity.providers.dao.DaoAuthenticationProvider}.
+     * {@link org.springframework.security.providers.dao.DaoAuthenticationProvider}.
      *
      * @param username the username presented to the
      *        DaoAuthenticationProvider
diff --git a/core/src/main/java/org/acegisecurity/userdetails/UserDetails.java b/core/src/main/java/org/springframework/security/userdetails/UserDetails.java
similarity index 94%
rename from core/src/main/java/org/acegisecurity/userdetails/UserDetails.java
rename to core/src/main/java/org/springframework/security/userdetails/UserDetails.java
index c88cad0f45..28783d0317 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/UserDetails.java
+++ b/core/src/main/java/org/springframework/security/userdetails/UserDetails.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails;
+package org.springframework.security.userdetails;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
 
 import java.io.Serializable;
 
@@ -35,7 +35,7 @@ import java.io.Serializable;
  * 

  * Concrete implementations must take particular care to ensure the non-null
  * contract detailed for each method is enforced. See
- * {@link org.acegisecurity.userdetails.User} for a
+ * {@link org.springframework.security.userdetails.User} for a
  * reference implementation (which you might like to extend).
  * 

  *
diff --git a/core/src/main/java/org/acegisecurity/userdetails/UserDetailsManager.java b/core/src/main/java/org/springframework/security/userdetails/UserDetailsManager.java
similarity index 90%
rename from core/src/main/java/org/acegisecurity/userdetails/UserDetailsManager.java
rename to core/src/main/java/org/springframework/security/userdetails/UserDetailsManager.java
index 9729f0fc0d..e4a45bc637 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/UserDetailsManager.java
+++ b/core/src/main/java/org/springframework/security/userdetails/UserDetailsManager.java
@@ -1,4 +1,4 @@
-package org.acegisecurity.userdetails;
+package org.springframework.security.userdetails;
 
 /**
  * An extension of the {@link UserDetailsService} which provides the ability
@@ -27,7 +27,7 @@ public interface UserDetailsManager extends UserDetailsService {
 
     /**
      * Modify the current user's password.
-     * 
+     *
      *
      * @param oldPassword current password (for re-authentication if required)
      * @param newPassword the password to change to
diff --git a/core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java b/core/src/main/java/org/springframework/security/userdetails/UserDetailsService.java
similarity index 94%
rename from core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java
rename to core/src/main/java/org/springframework/security/userdetails/UserDetailsService.java
index 84c7156f1a..deeb7dd020 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java
+++ b/core/src/main/java/org/springframework/security/userdetails/UserDetailsService.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails;
+package org.springframework.security.userdetails;
 
-import org.acegisecurity.providers.dao.DaoAuthenticationProvider;
+import org.springframework.security.providers.dao.DaoAuthenticationProvider;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/core/src/main/java/org/acegisecurity/userdetails/UsernameNotFoundException.java b/core/src/main/java/org/springframework/security/userdetails/UsernameNotFoundException.java
similarity index 94%
rename from core/src/main/java/org/acegisecurity/userdetails/UsernameNotFoundException.java
rename to core/src/main/java/org/springframework/security/userdetails/UsernameNotFoundException.java
index c40a4c9cd7..c26a684638 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/UsernameNotFoundException.java
+++ b/core/src/main/java/org/springframework/security/userdetails/UsernameNotFoundException.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails;
+package org.springframework.security.userdetails;
 
-import org.acegisecurity.BadCredentialsException;
+import org.springframework.security.BadCredentialsException;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/CycleInRoleHierarchyException.java b/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/CycleInRoleHierarchyException.java
similarity index 90%
rename from core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/CycleInRoleHierarchyException.java
rename to core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/CycleInRoleHierarchyException.java
index 409326235f..131b37877a 100755
--- a/core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/CycleInRoleHierarchyException.java
+++ b/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/CycleInRoleHierarchyException.java
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.hierarchicalroles;
+package org.springframework.security.userdetails.hierarchicalroles;
 
 /**
  * Exception that is thrown because of a cycle in the role hierarchy definition
- * 
+ *
  * @author Michael Mayr
  */
 public class CycleInRoleHierarchyException extends RuntimeException {
diff --git a/core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/RoleHierarchy.java b/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchy.java
similarity index 87%
rename from core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/RoleHierarchy.java
rename to core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchy.java
index 27bc20618f..cb3a95807c 100755
--- a/core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/RoleHierarchy.java
+++ b/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchy.java
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.hierarchicalroles;
+package org.springframework.security.userdetails.hierarchicalroles;
 
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.GrantedAuthority;
 
 /**
  * The simple interface of a role hierarchy.
@@ -23,17 +23,17 @@ import org.acegisecurity.GrantedAuthority;
  *
  */
 public interface RoleHierarchy {
-    
+
     /**
      * This method returns an array of all reachable authorities.

-     * Reachable authorities are the directly assigned authorities plus all 
-     * authorities that are (transitively) reachable from them in the role 
+     * Reachable authorities are the directly assigned authorities plus all
+     * authorities that are (transitively) reachable from them in the role
      * hierarchy.

      * Example:

      * Role hierarchy: ROLE_A > ROLE_B and ROLE_B > ROLE_C.

      * Directly assigned authority: ROLE_A.

      * Reachable authorities: ROLE_A, ROLE_B, ROLE_C.
-     *   
+     *
      * @param authorities - Array of the directly assigned authorities.
      * @return Array of all reachable authorities given the assigned authorities.
      */
diff --git a/core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/RoleHierarchyImpl.java b/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImpl.java
similarity index 95%
rename from core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/RoleHierarchyImpl.java
rename to core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImpl.java
index f2e0e25e07..70b7c1f240 100755
--- a/core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/RoleHierarchyImpl.java
+++ b/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImpl.java
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.hierarchicalroles;
+package org.springframework.security.userdetails.hierarchicalroles;
 
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsServiceWrapper.java b/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapper.java
similarity index 82%
rename from core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsServiceWrapper.java
rename to core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapper.java
index 0953accea9..01bf325f45 100755
--- a/core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsServiceWrapper.java
+++ b/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapper.java
@@ -12,30 +12,30 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.hierarchicalroles;
+package org.springframework.security.userdetails.hierarchicalroles;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.springframework.dao.DataAccessException;
 
 /**
- * This class wraps Acegi's UserDetailsService in a way that its loadUserByUsername() 
- * method returns wrapped UserDetails that return all hierachically reachable authorities 
+ * This class wraps Acegi's UserDetailsService in a way that its loadUserByUsername()
+ * method returns wrapped UserDetails that return all hierachically reachable authorities
  * instead of only the directly assigned authorities.
- * 
+ *
  * @author Michael Mayr
  */
 public class UserDetailsServiceWrapper implements UserDetailsService {
-    
+
     private UserDetailsService userDetailsService = null;
-    
+
     private RoleHierarchy roleHierarchy = null;
 
     public void setRoleHierarchy(RoleHierarchy roleHierarchy) {
         this.roleHierarchy = roleHierarchy;
     }
-    
+
     public void setUserDetailsService(UserDetailsService userDetailsService) {
         this.userDetailsService = userDetailsService;
     }
@@ -45,7 +45,7 @@ public class UserDetailsServiceWrapper implements UserDetailsService {
         // wrapped UserDetailsService might throw UsernameNotFoundException or DataAccessException which will then bubble up
         return new UserDetailsWrapper(userDetails, roleHierarchy);
     }
-    
+
     public UserDetailsService getWrappedUserDetailsService() {
         return userDetailsService;
     }
diff --git a/core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsWrapper.java b/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapper.java
similarity index 87%
rename from core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsWrapper.java
rename to core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapper.java
index c017e7bda5..a4ee70b84a 100755
--- a/core/src/main/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsWrapper.java
+++ b/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapper.java
@@ -12,26 +12,26 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.hierarchicalroles;
+package org.springframework.security.userdetails.hierarchicalroles;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.userdetails.UserDetails;
 
 /**
- * This class wraps Acegi's UserDetails in a way that its getAuthorities()-Method is 
+ * This class wraps Acegi's UserDetails in a way that its getAuthorities()-Method is
  * delegated to RoleHierarchy.getReachableGrantedAuthorities. All other methods are
  * delegated to the UserDetails implementation.
- * 
+ *
  * @author Michael Mayr
  */
 public class UserDetailsWrapper implements UserDetails {
 
     private static final long serialVersionUID = 1532428778390085311L;
-    
+
     private UserDetails userDetails = null;
-    
+
     private RoleHierarchy roleHierarchy = null;
-    
+
     public UserDetailsWrapper(UserDetails userDetails, RoleHierarchy roleHierarchy) {
         this.userDetails = userDetails;
         this.roleHierarchy = roleHierarchy;
@@ -64,9 +64,9 @@ public class UserDetailsWrapper implements UserDetails {
     public String getUsername() {
         return userDetails.getUsername();
     }
-    
+
     public UserDetails getUnwrappedUserDetails() {
         return userDetails;
     }
-    
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcDaoImpl.java
similarity index 95%
rename from core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java
rename to core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcDaoImpl.java
index af3a0fb501..ebfd2984c0 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java
+++ b/core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcDaoImpl.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.jdbc;
+package org.springframework.security.userdetails.jdbc;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.AcegiMessageSource;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.AcegiMessageSource;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 
 import org.springframework.context.ApplicationContextException;
 import org.springframework.context.support.MessageSourceAccessor;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/jdbc/package.html b/core/src/main/java/org/springframework/security/userdetails/jdbc/package.html
similarity index 100%
rename from core/src/main/java/org/acegisecurity/userdetails/jdbc/package.html
rename to core/src/main/java/org/springframework/security/userdetails/jdbc/package.html
diff --git a/core/src/main/java/org/acegisecurity/userdetails/ldap/InetOrgPerson.java b/core/src/main/java/org/springframework/security/userdetails/ldap/InetOrgPerson.java
similarity index 95%
rename from core/src/main/java/org/acegisecurity/userdetails/ldap/InetOrgPerson.java
rename to core/src/main/java/org/springframework/security/userdetails/ldap/InetOrgPerson.java
index fcd687b508..bdb53ac928 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/ldap/InetOrgPerson.java
+++ b/core/src/main/java/org/springframework/security/userdetails/ldap/InetOrgPerson.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DirContextOperations;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/ldap/InetOrgPersonContextMapper.java b/core/src/main/java/org/springframework/security/userdetails/ldap/InetOrgPersonContextMapper.java
similarity index 89%
rename from core/src/main/java/org/acegisecurity/userdetails/ldap/InetOrgPersonContextMapper.java
rename to core/src/main/java/org/springframework/security/userdetails/ldap/InetOrgPersonContextMapper.java
index 7ca1ab9ad5..15a4fc6bbb 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/ldap/InetOrgPersonContextMapper.java
+++ b/core/src/main/java/org/springframework/security/userdetails/ldap/InetOrgPersonContextMapper.java
@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.GrantedAuthority;
 import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetails.java b/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetails.java
similarity index 90%
rename from core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetails.java
rename to core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetails.java
index f42f69b9a0..b602a58ef7 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetails.java
+++ b/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetails.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetails;
 
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.Control;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsImpl.java b/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetailsImpl.java
similarity index 95%
rename from core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsImpl.java
rename to core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetailsImpl.java
index 7c0bb6d075..e4bf9b9baf 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsImpl.java
+++ b/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetailsImpl.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.GrantedAuthority;
 
 import org.springframework.util.Assert;
 import org.springframework.ldap.core.DirContextOperations;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsManager.java b/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetailsManager.java
similarity index 94%
rename from core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsManager.java
rename to core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetailsManager.java
index 8e460ef4d1..9c05e8e798 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsManager.java
+++ b/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetailsManager.java
@@ -12,17 +12,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
-import org.acegisecurity.userdetails.UserDetailsManager;
-import org.acegisecurity.ldap.LdapUtils;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.UserDetailsManager;
+import org.springframework.security.ldap.LdapUtils;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.dao.DataAccessException;
 import org.springframework.util.Assert;
 import org.springframework.ldap.core.DistinguishedName;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsMapper.java b/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetailsMapper.java
similarity index 91%
rename from core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsMapper.java
rename to core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetailsMapper.java
index 31fd128928..0aad9d888c 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsMapper.java
+++ b/core/src/main/java/org/springframework/security/userdetails/ldap/LdapUserDetailsMapper.java
@@ -13,24 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.userdetails.UserDetails;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.util.Assert;
-import org.springframework.ldap.UncategorizedLdapException;
-import org.springframework.ldap.core.ContextMapper;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DirContextOperations;
 
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-
 
 /**
  * The context mapper used by the authenticators to create an ldap user object.
diff --git a/core/src/main/java/org/acegisecurity/userdetails/ldap/Person.java b/core/src/main/java/org/springframework/security/userdetails/ldap/Person.java
similarity index 96%
rename from core/src/main/java/org/acegisecurity/userdetails/ldap/Person.java
rename to core/src/main/java/org/springframework/security/userdetails/ldap/Person.java
index 0acfa09edb..3b247a93d6 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/ldap/Person.java
+++ b/core/src/main/java/org/springframework/security/userdetails/ldap/Person.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
 
 import org.springframework.util.Assert;
@@ -20,7 +20,7 @@ import org.springframework.util.Assert;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DirContextOperations;
 
-import org.acegisecurity.ldap.LdapUtils;
+import org.springframework.security.ldap.LdapUtils;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/ldap/PersonContextMapper.java b/core/src/main/java/org/springframework/security/userdetails/ldap/PersonContextMapper.java
similarity index 82%
rename from core/src/main/java/org/acegisecurity/userdetails/ldap/PersonContextMapper.java
rename to core/src/main/java/org/springframework/security/userdetails/ldap/PersonContextMapper.java
index bdfb46aa8b..8c41d114ca 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/ldap/PersonContextMapper.java
+++ b/core/src/main/java/org/springframework/security/userdetails/ldap/PersonContextMapper.java
@@ -1,7 +1,7 @@
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.GrantedAuthority;
 import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.util.Assert;
diff --git a/core/src/main/java/org/acegisecurity/userdetails/ldap/UserDetailsContextMapper.java b/core/src/main/java/org/springframework/security/userdetails/ldap/UserDetailsContextMapper.java
similarity index 91%
rename from core/src/main/java/org/acegisecurity/userdetails/ldap/UserDetailsContextMapper.java
rename to core/src/main/java/org/springframework/security/userdetails/ldap/UserDetailsContextMapper.java
index 13596d17e5..aec082fc26 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/ldap/UserDetailsContextMapper.java
+++ b/core/src/main/java/org/springframework/security/userdetails/ldap/UserDetailsContextMapper.java
@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.GrantedAuthority;
 import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.DirContextAdapter;
 
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java b/core/src/main/java/org/springframework/security/userdetails/memory/InMemoryDaoImpl.java
similarity index 89%
rename from core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java
rename to core/src/main/java/org/springframework/security/userdetails/memory/InMemoryDaoImpl.java
index 38ad2d695d..ad3082d75d 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java
+++ b/core/src/main/java/org/springframework/security/userdetails/memory/InMemoryDaoImpl.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.memory;
+package org.springframework.security.userdetails.memory;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 
 import org.springframework.beans.factory.InitializingBean;
 
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttribute.java b/core/src/main/java/org/springframework/security/userdetails/memory/UserAttribute.java
similarity index 94%
rename from core/src/main/java/org/acegisecurity/userdetails/memory/UserAttribute.java
rename to core/src/main/java/org/springframework/security/userdetails/memory/UserAttribute.java
index 4709b1c57c..d49fc2a533 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttribute.java
+++ b/core/src/main/java/org/springframework/security/userdetails/memory/UserAttribute.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.memory;
+package org.springframework.security.userdetails.memory;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -57,7 +57,7 @@ public class UserAttribute {
 
     /**
      * Set all authorities for this user.
-     * 
+     *
      * @param authorities {@link List} <{@link GrantedAuthority}>
      * @since 1.1
      */
@@ -68,7 +68,7 @@ public class UserAttribute {
     /**
      * Set all authorities for this user from String values.
      * It will create the necessary {@link GrantedAuthority} objects.
-     * 
+     *
      * @param authoritiesAsString {@link List} <{@link String}>
      * @since 1.1
      */
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java b/core/src/main/java/org/springframework/security/userdetails/memory/UserAttributeEditor.java
similarity index 97%
rename from core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java
rename to core/src/main/java/org/springframework/security/userdetails/memory/UserAttributeEditor.java
index 02856851dd..795b79aadc 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserAttributeEditor.java
+++ b/core/src/main/java/org/springframework/security/userdetails/memory/UserAttributeEditor.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.memory;
+package org.springframework.security.userdetails.memory;
 
 import java.beans.PropertyEditorSupport;
 import java.util.ArrayList;
@@ -34,7 +34,7 @@ public class UserAttributeEditor extends PropertyEditorSupport {
         if (StringUtils.hasText(s)) {
             String[] tokens = StringUtils.commaDelimitedListToStringArray(s);
             UserAttribute userAttrib = new UserAttribute();
-            
+
             List authoritiesAsString = new ArrayList();
 
             for (int i = 0; i < tokens.length; i++) {
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java b/core/src/main/java/org/springframework/security/userdetails/memory/UserMap.java
similarity index 93%
rename from core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java
rename to core/src/main/java/org/springframework/security/userdetails/memory/UserMap.java
index 96ebe4bd36..d73c9c4f01 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java
+++ b/core/src/main/java/org/springframework/security/userdetails/memory/UserMap.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.memory;
+package org.springframework.security.userdetails.memory;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
@@ -86,7 +86,7 @@ public class UserMap {
 
     /**
      * Set the users in this {@link UserMap}. Overrides previously added users.
-     * 
+     *
      * @param users {@link Map} <{@link String}, {@link UserDetails}> with pairs (username, userdetails)
      * @since 1.1
      */
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java b/core/src/main/java/org/springframework/security/userdetails/memory/UserMapEditor.java
similarity index 95%
rename from core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java
rename to core/src/main/java/org/springframework/security/userdetails/memory/UserMapEditor.java
index 6a582b6224..31d76eff8a 100644
--- a/core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java
+++ b/core/src/main/java/org/springframework/security/userdetails/memory/UserMapEditor.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.memory;
+package org.springframework.security.userdetails.memory;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
 
 import org.springframework.beans.propertyeditors.PropertiesEditor;
 
diff --git a/core/src/main/java/org/acegisecurity/userdetails/memory/package.html b/core/src/main/java/org/springframework/security/userdetails/memory/package.html
similarity index 100%
rename from core/src/main/java/org/acegisecurity/userdetails/memory/package.html
rename to core/src/main/java/org/springframework/security/userdetails/memory/package.html
diff --git a/core/src/main/java/org/acegisecurity/util/EncryptionUtils.java b/core/src/main/java/org/springframework/security/util/EncryptionUtils.java
similarity index 97%
rename from core/src/main/java/org/acegisecurity/util/EncryptionUtils.java
rename to core/src/main/java/org/springframework/security/util/EncryptionUtils.java
index caf25f442a..35b822dabf 100644
--- a/core/src/main/java/org/acegisecurity/util/EncryptionUtils.java
+++ b/core/src/main/java/org/springframework/security/util/EncryptionUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import java.io.UnsupportedEncodingException;
 import java.security.spec.KeySpec;
@@ -23,7 +23,7 @@ import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.DESedeKeySpec;
 
-import org.acegisecurity.AcegiSecurityException;
+import org.springframework.security.SpringSecurityException;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.util.Assert;
 
@@ -150,7 +150,7 @@ public final class EncryptionUtils {
         Assert.isTrue(key.length() >= 24, "Key must be at least 24 characters long");
     }
 
-    public static class EncryptionException extends AcegiSecurityException {
+    public static class EncryptionException extends SpringSecurityException {
         private static final long serialVersionUID = 1L;
 
         public EncryptionException(String message, Throwable t) {
diff --git a/core/src/main/java/org/acegisecurity/util/FieldUtils.java b/core/src/main/java/org/springframework/security/util/FieldUtils.java
similarity index 98%
rename from core/src/main/java/org/acegisecurity/util/FieldUtils.java
rename to core/src/main/java/org/springframework/security/util/FieldUtils.java
index 839bd24b93..c76b40e2b7 100644
--- a/core/src/main/java/org/acegisecurity/util/FieldUtils.java
+++ b/core/src/main/java/org/springframework/security/util/FieldUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
diff --git a/core/src/main/java/org/acegisecurity/util/FilterChainProxy.java b/core/src/main/java/org/springframework/security/util/FilterChainProxy.java
similarity index 93%
rename from core/src/main/java/org/acegisecurity/util/FilterChainProxy.java
rename to core/src/main/java/org/springframework/security/util/FilterChainProxy.java
index f146b14785..f5faf1c80c 100644
--- a/core/src/main/java/org/acegisecurity/util/FilterChainProxy.java
+++ b/core/src/main/java/org/springframework/security/util/FilterChainProxy.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
 
-import org.acegisecurity.intercept.web.FilterInvocation;
-import org.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
+import org.springframework.security.intercept.web.FilterInvocation;
+import org.springframework.security.intercept.web.FilterInvocationDefinitionSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -50,12 +50,12 @@ import javax.servlet.ServletResponse;
 
 /**
  * Delegates Filter requests to a list of Spring-managed beans.
The FilterChainProxy is
- * loaded via a standard {@link org.acegisecurity.util.FilterToBeanProxy} declaration in web.xml.
+ * loaded via a standard {@link org.springframework.security.util.FilterToBeanProxy} declaration in web.xml.
  * FilterChainProxy will then pass {@link #init(FilterConfig)}, {@link #destroy()} and {@link
  * #doFilter(ServletRequest, ServletResponse, FilterChain)} invocations through to each Filter defined
  * against FilterChainProxy.

  *  
FilterChainProxy is configured using a standard {@link
- * org.acegisecurity.intercept.web.FilterInvocationDefinitionSource}. Each possible URI pattern that
+ * org.springframework.security.intercept.web.FilterInvocationDefinitionSource}. Each possible URI pattern that
  * FilterChainProxy should service must be entered. The first matching URI pattern located by
  * FilterInvocationDefinitionSource for a given request will be used to define all of the
  * Filters that apply to that request. NB: This means you must put most specific URI patterns at the top
@@ -63,14 +63,14 @@ import javax.servlet.ServletResponse;
  * respective entry. The FilterChainProxy will not iterate the remainder of the URI patterns to locate
  * additional Filters.  The FilterInvocationDefinitionSource described the applicable URI
  * pattern to fire the filter chain, followed by a list of configuration attributes. Each configuration attribute's
- * {@link org.acegisecurity.ConfigAttribute#getAttribute()} corresponds to a bean name that is available from the
+ * {@link org.springframework.security.ConfigAttribute#getAttribute()} corresponds to a bean name that is available from the
  * application context.

  *  
FilterChainProxy respects normal handling of Filters that elect not to call {@link
  * javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse,
  * javax.servlet.FilterChain)}, in that the remainder of the origial or FilterChainProxy-declared filter
  * chain will not be called.

  *  
It is particularly noted the Filter lifecycle mismatch between the servlet container and IoC
- * container. As per {@link org.acegisecurity.util.FilterToBeanProxy} JavaDocs, we recommend you allow the IoC
+ * container. As per {@link org.springframework.security.util.FilterToBeanProxy} JavaDocs, we recommend you allow the IoC
  * container to manage lifecycle instead of the servlet container. By default the FilterToBeanProxy will
  * never call this class' {@link #init(FilterConfig)} and {@link #destroy()} methods, meaning each of the filters
  * defined against FilterInvocationDefinitionSource will not be called. If you do need your filters to be
diff --git a/core/src/main/java/org/acegisecurity/util/FilterInvocationUtils.java b/core/src/main/java/org/springframework/security/util/FilterInvocationUtils.java
similarity index 97%
rename from core/src/main/java/org/acegisecurity/util/FilterInvocationUtils.java
rename to core/src/main/java/org/springframework/security/util/FilterInvocationUtils.java
index a38e4daea1..4347451d28 100644
--- a/core/src/main/java/org/acegisecurity/util/FilterInvocationUtils.java
+++ b/core/src/main/java/org/springframework/security/util/FilterInvocationUtils.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
-import org.acegisecurity.intercept.web.FilterInvocation;
+import org.springframework.security.intercept.web.FilterInvocation;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/main/java/org/acegisecurity/util/FilterToBeanProxy.java b/core/src/main/java/org/springframework/security/util/FilterToBeanProxy.java
similarity index 99%
rename from core/src/main/java/org/acegisecurity/util/FilterToBeanProxy.java
rename to core/src/main/java/org/springframework/security/util/FilterToBeanProxy.java
index 00909fe58c..1aa525885f 100644
--- a/core/src/main/java/org/acegisecurity/util/FilterToBeanProxy.java
+++ b/core/src/main/java/org/springframework/security/util/FilterToBeanProxy.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import org.springframework.beans.factory.BeanFactoryUtils;
 
diff --git a/core/src/main/java/org/acegisecurity/util/InMemoryResource.java b/core/src/main/java/org/springframework/security/util/InMemoryResource.java
similarity index 97%
rename from core/src/main/java/org/acegisecurity/util/InMemoryResource.java
rename to core/src/main/java/org/springframework/security/util/InMemoryResource.java
index 7e202a285d..db433955fd 100644
--- a/core/src/main/java/org/acegisecurity/util/InMemoryResource.java
+++ b/core/src/main/java/org/springframework/security/util/InMemoryResource.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import org.springframework.core.io.AbstractResource;
 
diff --git a/core/src/main/java/org/acegisecurity/util/MethodInvocationUtils.java b/core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java
similarity index 96%
rename from core/src/main/java/org/acegisecurity/util/MethodInvocationUtils.java
rename to core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java
index 5d1992e504..a234dc51fb 100644
--- a/core/src/main/java/org/acegisecurity/util/MethodInvocationUtils.java
+++ b/core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -27,7 +27,7 @@ import java.util.List;
 
 /**
  * Static utility methods for creating MethodInvocations usable within Acegi Security.
All methods
- * of this class return a {@link org.acegisecurity.util.SimpleMethodInvocation}.

+ * of this class return a {@link org.springframework.security.util.SimpleMethodInvocation}.

  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/main/java/org/acegisecurity/util/OrderedUtils.java b/core/src/main/java/org/springframework/security/util/OrderedUtils.java
similarity index 98%
rename from core/src/main/java/org/acegisecurity/util/OrderedUtils.java
rename to core/src/main/java/org/springframework/security/util/OrderedUtils.java
index ce66c6da6b..16053f0dc9 100644
--- a/core/src/main/java/org/acegisecurity/util/OrderedUtils.java
+++ b/core/src/main/java/org/springframework/security/util/OrderedUtils.java
@@ -1,4 +1,4 @@
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -11,7 +11,7 @@ import org.springframework.util.ReflectionUtils;
 /**
  * Proivdes common logic for manipulating classes implementing the Spring
  * {@link Ordered} interface.
- * 
+ *
  * @author Ben Alex
  */
 public abstract class OrderedUtils {
@@ -19,10 +19,10 @@ public abstract class OrderedUtils {
 	 * Introspects the application context for a single instance of sourceClass. If found, the order from the source
 	 * class instance is copied into the destinationObject. If more than one instance of sourceClass
 	 * is found, the method throws IllegalStateException.
-	 * 
+	 *
 	 * 
The destinationObject is required to provide a public setOrder(int) method to permit
 	 * mutation of the order property.
-	 * 
+	 *
 	 * @param sourceClass to locate in the application context (must be assignable to Ordered)
 	 * @param applicationContext to locate the class
 	 * @param destinationObject to copy the order into (must provide public setOrder(int) method)
@@ -44,13 +44,13 @@ public abstract class OrderedUtils {
 			return true;
 		}
 	}
-	
+
 	/**
 	 * Copies the order property from the sourceObject into the destinationObject.
-	 * 
+	 *
 	 * 
The destinationObject is required to provide a public setOrder(int) method to permit
 	 * mutation of the order property.
-	 * 
+	 *
 	 * @param sourceObject to copy the order from
 	 * @param destinationObject to copy the order into (must provide public setOrder(int) method)
 	 */
@@ -61,5 +61,5 @@ public abstract class OrderedUtils {
 		Assert.notNull(m, "Method setOrder(int) not found on " + destinationObject.getClass());
 		ReflectionUtils.invokeMethod(m, destinationObject, new Object[] {new Integer(sourceObject.getOrder())});
 	}
-	
+
 }
diff --git a/core/src/main/java/org/acegisecurity/util/PortMapper.java b/core/src/main/java/org/springframework/security/util/PortMapper.java
similarity index 97%
rename from core/src/main/java/org/acegisecurity/util/PortMapper.java
rename to core/src/main/java/org/springframework/security/util/PortMapper.java
index 003bb329ed..c2b791ed37 100644
--- a/core/src/main/java/org/acegisecurity/util/PortMapper.java
+++ b/core/src/main/java/org/springframework/security/util/PortMapper.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 /**
  * PortMapper implementations provide callers with information
diff --git a/core/src/main/java/org/acegisecurity/util/PortMapperImpl.java b/core/src/main/java/org/springframework/security/util/PortMapperImpl.java
similarity index 99%
rename from core/src/main/java/org/acegisecurity/util/PortMapperImpl.java
rename to core/src/main/java/org/springframework/security/util/PortMapperImpl.java
index de18f77a33..4a70b1f387 100644
--- a/core/src/main/java/org/acegisecurity/util/PortMapperImpl.java
+++ b/core/src/main/java/org/springframework/security/util/PortMapperImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/main/java/org/acegisecurity/util/PortResolver.java b/core/src/main/java/org/springframework/security/util/PortResolver.java
similarity index 97%
rename from core/src/main/java/org/acegisecurity/util/PortResolver.java
rename to core/src/main/java/org/springframework/security/util/PortResolver.java
index 99d924411f..b21fd71be3 100644
--- a/core/src/main/java/org/acegisecurity/util/PortResolver.java
+++ b/core/src/main/java/org/springframework/security/util/PortResolver.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import javax.servlet.ServletRequest;
 
diff --git a/core/src/main/java/org/acegisecurity/util/PortResolverImpl.java b/core/src/main/java/org/springframework/security/util/PortResolverImpl.java
similarity index 98%
rename from core/src/main/java/org/acegisecurity/util/PortResolverImpl.java
rename to core/src/main/java/org/springframework/security/util/PortResolverImpl.java
index 895e630563..a2dcc18866 100644
--- a/core/src/main/java/org/acegisecurity/util/PortResolverImpl.java
+++ b/core/src/main/java/org/springframework/security/util/PortResolverImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import org.springframework.beans.factory.InitializingBean;
 
diff --git a/core/src/main/java/org/acegisecurity/util/RedirectUtils.java b/core/src/main/java/org/springframework/security/util/RedirectUtils.java
similarity index 92%
rename from core/src/main/java/org/acegisecurity/util/RedirectUtils.java
rename to core/src/main/java/org/springframework/security/util/RedirectUtils.java
index ccebba9cb9..045dfaf9fd 100644
--- a/core/src/main/java/org/acegisecurity/util/RedirectUtils.java
+++ b/core/src/main/java/org/springframework/security/util/RedirectUtils.java
@@ -1,7 +1,7 @@
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
-import org.acegisecurity.ui.AbstractProcessingFilter;
-import org.acegisecurity.ui.logout.LogoutFilter;
+import org.springframework.security.ui.AbstractProcessingFilter;
+import org.springframework.security.ui.logout.LogoutFilter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/core/src/main/java/org/acegisecurity/util/SimpleMethodInvocation.java b/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java
similarity index 97%
rename from core/src/main/java/org/acegisecurity/util/SimpleMethodInvocation.java
rename to core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java
index 2a6aeeb878..9e31767fc9 100644
--- a/core/src/main/java/org/acegisecurity/util/SimpleMethodInvocation.java
+++ b/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/main/java/org/acegisecurity/util/StringSplitUtils.java b/core/src/main/java/org/springframework/security/util/StringSplitUtils.java
similarity index 99%
rename from core/src/main/java/org/acegisecurity/util/StringSplitUtils.java
rename to core/src/main/java/org/springframework/security/util/StringSplitUtils.java
index 9d344f3d1c..883ac8ce0e 100644
--- a/core/src/main/java/org/acegisecurity/util/StringSplitUtils.java
+++ b/core/src/main/java/org/springframework/security/util/StringSplitUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
diff --git a/core/src/main/java/org/acegisecurity/util/UrlUtils.java b/core/src/main/java/org/springframework/security/util/UrlUtils.java
similarity index 93%
rename from core/src/main/java/org/acegisecurity/util/UrlUtils.java
rename to core/src/main/java/org/springframework/security/util/UrlUtils.java
index ea5e33e024..9e2c65de07 100644
--- a/core/src/main/java/org/acegisecurity/util/UrlUtils.java
+++ b/core/src/main/java/org/springframework/security/util/UrlUtils.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
-import org.acegisecurity.intercept.web.FilterInvocation;
+import org.springframework.security.intercept.web.FilterInvocation;
 
-import org.acegisecurity.ui.savedrequest.SavedRequest;
+import org.springframework.security.ui.savedrequest.SavedRequest;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/core/src/main/java/org/acegisecurity/util/package.html b/core/src/main/java/org/springframework/security/util/package.html
similarity index 100%
rename from core/src/main/java/org/acegisecurity/util/package.html
rename to core/src/main/java/org/springframework/security/util/package.html
diff --git a/core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java b/core/src/main/java/org/springframework/security/vote/AbstractAccessDecisionManager.java
similarity index 94%
rename from core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java
rename to core/src/main/java/org/springframework/security/vote/AbstractAccessDecisionManager.java
index 9d46791249..f3af5b433d 100644
--- a/core/src/main/java/org/acegisecurity/vote/AbstractAccessDecisionManager.java
+++ b/core/src/main/java/org/springframework/security/vote/AbstractAccessDecisionManager.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.acegisecurity.AccessDecisionManager;
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.AcegiMessageSource;
-import org.acegisecurity.ConfigAttribute;
+import org.springframework.security.AccessDecisionManager;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.AcegiMessageSource;
+import org.springframework.security.ConfigAttribute;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceAware;
diff --git a/core/src/main/java/org/acegisecurity/vote/AbstractAclVoter.java b/core/src/main/java/org/springframework/security/vote/AbstractAclVoter.java
similarity index 96%
rename from core/src/main/java/org/acegisecurity/vote/AbstractAclVoter.java
rename to core/src/main/java/org/springframework/security/vote/AbstractAclVoter.java
index 3819df738e..3006b18f30 100644
--- a/core/src/main/java/org/acegisecurity/vote/AbstractAclVoter.java
+++ b/core/src/main/java/org/springframework/security/vote/AbstractAclVoter.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.AuthorizationServiceException;
+import org.springframework.security.AuthorizationServiceException;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java b/core/src/main/java/org/springframework/security/vote/AccessDecisionVoter.java
similarity index 90%
rename from core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java
rename to core/src/main/java/org/springframework/security/vote/AccessDecisionVoter.java
index b2f364aadd..0ad672258b 100644
--- a/core/src/main/java/org/acegisecurity/vote/AccessDecisionVoter.java
+++ b/core/src/main/java/org/springframework/security/vote/AccessDecisionVoter.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
 
 
 /**
@@ -26,7 +26,7 @@ import org.acegisecurity.ConfigAttributeDefinition;
  * 

  * The coordination of voting (ie polling AccessDecisionVoters,
  * tallying their responses, and making the final authorization decision) is
- * performed by an {@link org.acegisecurity.AccessDecisionManager}.
+ * performed by an {@link org.springframework.security.AccessDecisionManager}.
  * 

  *
  * @author Ben Alex
@@ -69,7 +69,7 @@ public interface AccessDecisionVoter {
      * 
The decision must be affirmative (ACCESS_GRANTED), negative (ACCESS_DENIED)
      * or the AccessDecisionVoter can abstain (ACCESS_ABSTAIN) from voting.
      * Under no circumstances should implementing classes return any other value. If a weighting of results is desired,
-     * this should be handled in a custom {@link org.acegisecurity.AccessDecisionManager} instead.
+     * this should be handled in a custom {@link org.springframework.security.AccessDecisionManager} instead.
      * 

      * 
Unless an AccessDecisionVoter is specifically intended to vote on an access control
      * decision due to a passed method invocation or configuration attribute parameter, it must return
diff --git a/core/src/main/java/org/acegisecurity/vote/AclEntryVoter.java b/core/src/main/java/org/springframework/security/vote/AclEntryVoter.java
similarity index 90%
rename from core/src/main/java/org/acegisecurity/vote/AclEntryVoter.java
rename to core/src/main/java/org/springframework/security/vote/AclEntryVoter.java
index f12c3b456a..5a79512b84 100644
--- a/core/src/main/java/org/acegisecurity/vote/AclEntryVoter.java
+++ b/core/src/main/java/org/springframework/security/vote/AclEntryVoter.java
@@ -12,26 +12,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Iterator;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthorizationServiceException;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.acls.Acl;
-import org.acegisecurity.acls.AclService;
-import org.acegisecurity.acls.NotFoundException;
-import org.acegisecurity.acls.Permission;
-import org.acegisecurity.acls.objectidentity.ObjectIdentity;
-import org.acegisecurity.acls.objectidentity.ObjectIdentityRetrievalStrategy;
-import org.acegisecurity.acls.objectidentity.ObjectIdentityRetrievalStrategyImpl;
-import org.acegisecurity.acls.sid.Sid;
-import org.acegisecurity.acls.sid.SidRetrievalStrategy;
-import org.acegisecurity.acls.sid.SidRetrievalStrategyImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthorizationServiceException;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.acls.Acl;
+import org.springframework.security.acls.AclService;
+import org.springframework.security.acls.NotFoundException;
+import org.springframework.security.acls.Permission;
+import org.springframework.security.acls.objectidentity.ObjectIdentity;
+import org.springframework.security.acls.objectidentity.ObjectIdentityRetrievalStrategy;
+import org.springframework.security.acls.objectidentity.ObjectIdentityRetrievalStrategyImpl;
+import org.springframework.security.acls.sid.Sid;
+import org.springframework.security.acls.sid.SidRetrievalStrategy;
+import org.springframework.security.acls.sid.SidRetrievalStrategyImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
@@ -45,10 +45,10 @@ import org.springframework.util.Assert;
  *  
The voter will vote if any  {@link ConfigAttribute#getAttribute()} matches the {@link
  * #processConfigAttribute}. The provider will then locate the first method argument of type {@link
  * #processDomainObjectClass}. Assuming that method argument is non-null, the provider will then lookup the ACLs from
- * the AclManager and ensure the principal is  {@link Acl#isGranted(org.acegisecurity.acls.Permission[],
- * org.acegisecurity.acls.sid.Sid[], boolean)}  when presenting the {@link #requirePermission} array to that method.

+ * the AclManager and ensure the principal is  {@link Acl#isGranted(org.springframework.security.acls.Permission[],
+ * org.springframework.security.acls.sid.Sid[], boolean)}  when presenting the {@link #requirePermission} array to that method.

  *  
If the method argument is null, the voter will abstain from voting. If the method argument
- * could not be found, an {@link org.acegisecurity.AuthorizationServiceException} will be thrown.

+ * could not be found, an {@link org.springframework.security.AuthorizationServiceException} will be thrown.

  *  
In practical terms users will typically setup a number of AclEntryVoters. Each will have a
  * different {@link #processDomainObjectClass}, {@link #processConfigAttribute} and {@link #requirePermission}
  * combination. For example, a small application might employ the following instances of AclEntryVoter:
diff --git a/core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java b/core/src/main/java/org/springframework/security/vote/AffirmativeBased.java
similarity index 88%
rename from core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java
rename to core/src/main/java/org/springframework/security/vote/AffirmativeBased.java
index d32cdaf961..7b8a5900ce 100644
--- a/core/src/main/java/org/acegisecurity/vote/AffirmativeBased.java
+++ b/core/src/main/java/org/springframework/security/vote/AffirmativeBased.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttributeDefinition;
 
 import java.util.Iterator;
 
 
 /**
- * Simple concrete implementation of  {@link org.acegisecurity.AccessDecisionManager} that grants access if any
+ * Simple concrete implementation of  {@link org.springframework.security.AccessDecisionManager} that grants access if any
  * AccessDecisionVoter returns an affirmative response.
  */
 public class AffirmativeBased extends AbstractAccessDecisionManager {
diff --git a/core/src/main/java/org/acegisecurity/vote/AuthenticatedVoter.java b/core/src/main/java/org/springframework/security/vote/AuthenticatedVoter.java
similarity index 89%
rename from core/src/main/java/org/acegisecurity/vote/AuthenticatedVoter.java
rename to core/src/main/java/org/springframework/security/vote/AuthenticatedVoter.java
index 97cec0dfef..3906ff98f6 100644
--- a/core/src/main/java/org/acegisecurity/vote/AuthenticatedVoter.java
+++ b/core/src/main/java/org/springframework/security/vote/AuthenticatedVoter.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationTrustResolver;
-import org.acegisecurity.AuthenticationTrustResolverImpl;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationTrustResolver;
+import org.springframework.security.AuthenticationTrustResolverImpl;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
 
 import org.springframework.util.Assert;
 
@@ -32,8 +32,8 @@ import java.util.Iterator;
  * order of most strict checking to least strict checking.

  *  
The current Authentication will be inspected to determine if the principal has a particular
  * level of authentication. The "FULLY" authenticated option means the user is authenticated fully (ie {@link
- * org.acegisecurity.AuthenticationTrustResolver#isAnonymous(Authentication)} is false and {@link
- * org.acegisecurity.AuthenticationTrustResolver#isRememberMe(Authentication)} is false. The "REMEMBERED" will grant
+ * org.springframework.security.AuthenticationTrustResolver#isAnonymous(Authentication)} is false and {@link
+ * org.springframework.security.AuthenticationTrustResolver#isRememberMe(Authentication)} is false. The "REMEMBERED" will grant
  * access if the principal was either authenticated via remember-me OR is fully authenticated. The "ANONYMOUSLY" will
  * grant access if the principal was authenticated via remember-me, OR anonymously, OR via full authentication.

  *  
All comparisons and prefixes are case sensitive.

@@ -50,7 +50,7 @@ public class AuthenticatedVoter implements AccessDecisionVoter {
     //~ Instance fields ================================================================================================
 
     private AuthenticationTrustResolver authenticationTrustResolver = new AuthenticationTrustResolverImpl();
-    
+
     //~ Methods ========================================================================================================
 
     private boolean isFullyAuthenticated(Authentication authentication) {
diff --git a/core/src/main/java/org/acegisecurity/vote/BasicAclEntryVoter.java b/core/src/main/java/org/springframework/security/vote/BasicAclEntryVoter.java
similarity index 92%
rename from core/src/main/java/org/acegisecurity/vote/BasicAclEntryVoter.java
rename to core/src/main/java/org/springframework/security/vote/BasicAclEntryVoter.java
index d89b3d7e7e..f0715651a1 100644
--- a/core/src/main/java/org/acegisecurity/vote/BasicAclEntryVoter.java
+++ b/core/src/main/java/org/springframework/security/vote/BasicAclEntryVoter.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthorizationServiceException;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthorizationServiceException;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
 
-import org.acegisecurity.acl.AclEntry;
-import org.acegisecurity.acl.AclManager;
-import org.acegisecurity.acl.basic.BasicAclEntry;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.springframework.security.acl.AclEntry;
+import org.springframework.security.acl.AclManager;
+import org.springframework.security.acl.basic.BasicAclEntry;
+import org.springframework.security.acl.basic.SimpleAclEntry;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,15 +43,15 @@ import java.util.Iterator;
  * as defined by the {@link AclManager}.

  *  
The AclManager is used to retrieve the access control list (ACL) permissions associated with a
  * domain object instance for the current Authentication object. This class is designed to process {@link
- * AclEntry}s that are subclasses of {@link org.acegisecurity.acl.basic.BasicAclEntry} only. Generally these are
- * obtained by using the {@link org.acegisecurity.acl.basic.BasicAclProvider}.

+ * AclEntry}s that are subclasses of {@link org.springframework.security.acl.basic.BasicAclEntry} only. Generally these are
+ * obtained by using the {@link org.springframework.security.acl.basic.BasicAclProvider}.

  *  
The voter will vote if any  {@link ConfigAttribute#getAttribute()} matches the {@link
  * #processConfigAttribute}. The provider will then locate the first method argument of type {@link
  * #processDomainObjectClass}. Assuming that method argument is non-null, the provider will then lookup the ACLs from
  * the AclManager and ensure the principal is {@link
- * org.acegisecurity.acl.basic.BasicAclEntry#isPermitted(int)} for at least one of the {@link #requirePermission}s.

+ * org.springframework.security.acl.basic.BasicAclEntry#isPermitted(int)} for at least one of the {@link #requirePermission}s.

  *  
If the method argument is null, the voter will abstain from voting. If the method argument
- * could not be found, an {@link org.acegisecurity.AuthorizationServiceException} will be thrown.

+ * could not be found, an {@link org.springframework.security.AuthorizationServiceException} will be thrown.

  *  
In practical terms users will typically setup a number of BasicAclEntryVoters. Each will have a
  * different {@link #processDomainObjectClass}, {@link #processConfigAttribute} and {@link #requirePermission}
  * combination. For example, a small application might employ the following instances of
@@ -146,7 +146,7 @@ public class BasicAclEntryVoter extends AbstractAclVoter implements Initializing
 
     /**
      * Allow setting permissions with String literals instead of integers as {@link #setRequirePermission(int[])}
-     * 
+     *
      * @param requirePermission Permission literals
      * @see SimpleAclEntry#parsePermissions(String[]) for valid values
      */
diff --git a/core/src/main/java/org/acegisecurity/vote/ConsensusBased.java b/core/src/main/java/org/springframework/security/vote/ConsensusBased.java
similarity index 91%
rename from core/src/main/java/org/acegisecurity/vote/ConsensusBased.java
rename to core/src/main/java/org/springframework/security/vote/ConsensusBased.java
index c8c821ab9e..2aa1bd628f 100644
--- a/core/src/main/java/org/acegisecurity/vote/ConsensusBased.java
+++ b/core/src/main/java/org/springframework/security/vote/ConsensusBased.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttributeDefinition;
 
 import java.util.Iterator;
 
 
 /**
- * Simple concrete implementation of  {@link org.acegisecurity.AccessDecisionManager} that uses a  consensus-based
+ * Simple concrete implementation of  {@link org.springframework.security.AccessDecisionManager} that uses a  consensus-based
  * approach.
  */
 public class ConsensusBased extends AbstractAccessDecisionManager {
diff --git a/core/src/main/java/org/acegisecurity/vote/InterfaceBasedLabelParameterStrategy.java b/core/src/main/java/org/springframework/security/vote/InterfaceBasedLabelParameterStrategy.java
similarity index 98%
rename from core/src/main/java/org/acegisecurity/vote/InterfaceBasedLabelParameterStrategy.java
rename to core/src/main/java/org/springframework/security/vote/InterfaceBasedLabelParameterStrategy.java
index 2521e84051..5edbaa2bf5 100644
--- a/core/src/main/java/org/acegisecurity/vote/InterfaceBasedLabelParameterStrategy.java
+++ b/core/src/main/java/org/springframework/security/vote/InterfaceBasedLabelParameterStrategy.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import java.lang.reflect.Method;
 
diff --git a/core/src/main/java/org/acegisecurity/vote/LabelBasedAclVoter.java b/core/src/main/java/org/springframework/security/vote/LabelBasedAclVoter.java
similarity index 93%
rename from core/src/main/java/org/acegisecurity/vote/LabelBasedAclVoter.java
rename to core/src/main/java/org/springframework/security/vote/LabelBasedAclVoter.java
index 3181cb3884..923220f187 100644
--- a/core/src/main/java/org/acegisecurity/vote/LabelBasedAclVoter.java
+++ b/core/src/main/java/org/springframework/security/vote/LabelBasedAclVoter.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
 
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -48,7 +48,7 @@ import java.util.Map;
  * @author Greg Turnquist
  * @version $Id$
  *
- * @see org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor
+ * @see org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor
  */
 public class LabelBasedAclVoter extends AbstractAclVoter {
     //~ Static fields/initializers =====================================================================================
@@ -90,12 +90,12 @@ public class LabelBasedAclVoter extends AbstractAclVoter {
      * labels. An example application context configuration of a labelMap:
      *
      * 
-     * <bean id="accessDecisionManager" class="org.acegisecurity.vote.UnanimousBased">
+     * <bean id="accessDecisionManager" class="org.springframework.security.vote.UnanimousBased">
      *     <property name="allowIfAllAbstainDecisions"><value>false</value></property>
      *     <property name="decisionVoters">
      *       <list>
-     *         <bean class="org.acegisecurity.vote.RoleVoter"/>
-     *         <bean class="org.acegisecurity.vote.LabelBasedAclVoter">
+     *         <bean class="org.springframework.security.vote.RoleVoter"/>
+     *         <bean class="org.springframework.security.vote.LabelBasedAclVoter">
      *           <property name="attributeIndicatingLabeledOperation">
      *             <value>LABELED_OPERATION</value>
      *           </property>
@@ -148,8 +148,8 @@ public class LabelBasedAclVoter extends AbstractAclVoter {
      *
      * @return DOCUMENT ME!
      *
-     * @see org.acegisecurity.vote.AbstractAclVoter
-     * @see org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor
+     * @see org.springframework.security.vote.AbstractAclVoter
+     * @see org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor
      */
     public boolean supports(ConfigAttribute attribute) {
         if (attribute.getAttribute().equals(attributeIndicatingLabeledOperation)) {
diff --git a/core/src/main/java/org/acegisecurity/vote/LabelParameterStrategy.java b/core/src/main/java/org/springframework/security/vote/LabelParameterStrategy.java
similarity index 97%
rename from core/src/main/java/org/acegisecurity/vote/LabelParameterStrategy.java
rename to core/src/main/java/org/springframework/security/vote/LabelParameterStrategy.java
index 6f98565f02..da4612dfbc 100644
--- a/core/src/main/java/org/acegisecurity/vote/LabelParameterStrategy.java
+++ b/core/src/main/java/org/springframework/security/vote/LabelParameterStrategy.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import java.lang.reflect.Method;
 
diff --git a/core/src/main/java/org/acegisecurity/vote/LabeledData.java b/core/src/main/java/org/springframework/security/vote/LabeledData.java
similarity index 96%
rename from core/src/main/java/org/acegisecurity/vote/LabeledData.java
rename to core/src/main/java/org/springframework/security/vote/LabeledData.java
index 6dd9d23869..cb5c9e7665 100644
--- a/core/src/main/java/org/acegisecurity/vote/LabeledData.java
+++ b/core/src/main/java/org/springframework/security/vote/LabeledData.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 /**
  * This interface indicates data objects that carry a label. The purpose is to support
diff --git a/core/src/main/java/org/acegisecurity/vote/RoleVoter.java b/core/src/main/java/org/springframework/security/vote/RoleVoter.java
similarity index 90%
rename from core/src/main/java/org/acegisecurity/vote/RoleVoter.java
rename to core/src/main/java/org/springframework/security/vote/RoleVoter.java
index fb5518c413..275e5176ba 100644
--- a/core/src/main/java/org/acegisecurity/vote/RoleVoter.java
+++ b/core/src/main/java/org/springframework/security/vote/RoleVoter.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import java.util.Iterator;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
 
 /**
  * 

@@ -32,7 +32,7 @@ import org.acegisecurity.ConfigAttributeDefinition;
  * 

  * Abstains from voting if no configuration attribute commences with the role
  * prefix. Votes to grant access if there is an exact matching
- * {@link org.acegisecurity.GrantedAuthority} to a ConfigAttribute
+ * {@link org.springframework.security.GrantedAuthority} to a ConfigAttribute
  * starting with the role prefix. Votes to deny access if there is no exact
  * matching GrantedAuthority to a ConfigAttribute
  * starting with the role prefix.
@@ -44,12 +44,12 @@ import org.acegisecurity.ConfigAttributeDefinition;
  * which do not represent roles. However, this option may be of some use when
  * using preexisting role names without a prefix, and no ability exists to
  * prefix them with a role prefix on reading them in, such as provided for
- * example in {@link org.acegisecurity.userdetails.jdbc.JdbcDaoImpl}.
+ * example in {@link org.springframework.security.userdetails.jdbc.JdbcDaoImpl}.
  * 

  * 

  * All comparisons and prefixes are case sensitive.
  * 

- * 
+ *
  * @author Ben Alex
  * @author colin sampaleanu
  * @version $Id$
@@ -70,7 +70,7 @@ public class RoleVoter implements AccessDecisionVoter {
 	/**
 	 * Allows the default role prefix of ROLE_ to be overriden.
 	 * May be set to an empty value, although this is usually not desireable.
-	 * 
+	 *
 	 * @param rolePrefix the new prefix
 	 */
 	public void setRolePrefix(String rolePrefix) {
@@ -89,9 +89,9 @@ public class RoleVoter implements AccessDecisionVoter {
 	/**
 	 * This implementation supports any type of class, because it does not query
 	 * the presented secure object.
-	 * 
+	 *
 	 * @param clazz the secure object
-	 * 
+	 *
 	 * @return always true
 	 */
 	public boolean supports(Class clazz) {
diff --git a/core/src/main/java/org/acegisecurity/vote/UnanimousBased.java b/core/src/main/java/org/springframework/security/vote/UnanimousBased.java
similarity index 89%
rename from core/src/main/java/org/acegisecurity/vote/UnanimousBased.java
rename to core/src/main/java/org/springframework/security/vote/UnanimousBased.java
index 6b723710c3..854a1309d0 100644
--- a/core/src/main/java/org/acegisecurity/vote/UnanimousBased.java
+++ b/core/src/main/java/org/springframework/security/vote/UnanimousBased.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
 
 import java.util.Iterator;
 
 
 /**
- * Simple concrete implementation of  {@link org.acegisecurity.AccessDecisionManager} that  requires all voters to
+ * Simple concrete implementation of  {@link org.springframework.security.AccessDecisionManager} that  requires all voters to
  * abstain or grant access.
  */
 public class UnanimousBased extends AbstractAccessDecisionManager {
diff --git a/core/src/main/java/org/acegisecurity/vote/package.html b/core/src/main/java/org/springframework/security/vote/package.html
similarity index 100%
rename from core/src/main/java/org/acegisecurity/vote/package.html
rename to core/src/main/java/org/springframework/security/vote/package.html
diff --git a/core/src/main/java/org/acegisecurity/wrapper/SavedRequestAwareWrapper.java b/core/src/main/java/org/springframework/security/wrapper/SavedRequestAwareWrapper.java
similarity index 92%
rename from core/src/main/java/org/acegisecurity/wrapper/SavedRequestAwareWrapper.java
rename to core/src/main/java/org/springframework/security/wrapper/SavedRequestAwareWrapper.java
index d5a4567443..d9a7b905c1 100644
--- a/core/src/main/java/org/acegisecurity/wrapper/SavedRequestAwareWrapper.java
+++ b/core/src/main/java/org/springframework/security/wrapper/SavedRequestAwareWrapper.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.wrapper;
+package org.springframework.security.wrapper;
 
-import org.acegisecurity.ui.AbstractProcessingFilter;
-import org.acegisecurity.ui.savedrequest.Enumerator;
-import org.acegisecurity.ui.savedrequest.FastHttpDateFormat;
-import org.acegisecurity.ui.savedrequest.SavedRequest;
+import org.springframework.security.ui.AbstractProcessingFilter;
+import org.springframework.security.ui.savedrequest.Enumerator;
+import org.springframework.security.ui.savedrequest.FastHttpDateFormat;
+import org.springframework.security.ui.savedrequest.SavedRequest;
 
-import org.acegisecurity.util.PortResolver;
+import org.springframework.security.util.PortResolver;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -47,7 +47,7 @@ import javax.servlet.http.HttpSession;
  * Nevertheless, the important data from the original request is emulated and this should prove
  * adequate for most purposes (in particular standard HTTP GET and POST operations).

  *
- * 
Added into a request by {@link org.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter}.

+ * 
Added into a request by {@link org.springframework.security.wrapper.SecurityContextHolderAwareRequestFilter}.

  *
  *
  * @see SecurityContextHolderAwareRequestFilter
diff --git a/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilter.java b/core/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilter.java
similarity index 93%
rename from core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilter.java
rename to core/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilter.java
index e62c2c5037..fe56ddfee6 100644
--- a/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilter.java
+++ b/core/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilter.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.wrapper;
+package org.springframework.security.wrapper;
 
-import org.acegisecurity.util.PortResolver;
-import org.acegisecurity.util.PortResolverImpl;
+import org.springframework.security.util.PortResolver;
+import org.springframework.security.util.PortResolverImpl;
 
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletRequest;
  * A Filter which populates the ServletRequest with a new request wrapper.
Several
  * request wrappers are included with the framework. The simplest version is {@link
  * SecurityContextHolderAwareRequestWrapper}. A more complex and powerful request wrapper is {@link
- * org.acegisecurity.wrapper.SavedRequestAwareWrapper}. The latter is also the default.

+ * org.springframework.security.wrapper.SavedRequestAwareWrapper}. The latter is also the default.

  *  
To modify the wrapper used, call {@link #setWrapperClass(Class)}.

  *  
Any request wrapper configured for instantiation by this class must provide a public constructor that
  * accepts two arguments, being a HttpServletRequest and a PortResolver.

diff --git a/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapper.java b/core/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapper.java
similarity index 90%
rename from core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapper.java
rename to core/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapper.java
index 9fbc169b75..1b73c90432 100644
--- a/core/src/main/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapper.java
+++ b/core/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapper.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.wrapper;
+package org.springframework.security.wrapper;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationTrustResolver;
-import org.acegisecurity.AuthenticationTrustResolverImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationTrustResolver;
+import org.springframework.security.AuthenticationTrustResolverImpl;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.util.PortResolver;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.util.PortResolver;
 
 import java.security.Principal;
 
@@ -138,7 +138,7 @@ public class SecurityContextHolderAwareRequestWrapper extends HttpServletRequest
     }
 
     /**
-     * Simple searches for an exactly matching {@link org.acegisecurity.GrantedAuthority#getAuthority()}.
Will
+     * Simple searches for an exactly matching {@link org.springframework.security.GrantedAuthority#getAuthority()}.
Will
      * always return false if the SecurityContextHolder contains an
      * Authentication with nullprincipal and/or GrantedAuthority[]
      * objects.

diff --git a/core/src/main/java/org/acegisecurity/wrapper/package.html b/core/src/main/java/org/springframework/security/wrapper/package.html
similarity index 100%
rename from core/src/main/java/org/acegisecurity/wrapper/package.html
rename to core/src/main/java/org/springframework/security/wrapper/package.html
diff --git a/core/src/main/resources/META-INF/spring.handlers b/core/src/main/resources/META-INF/spring.handlers
index 3ed1602939..8b8a95982f 100644
--- a/core/src/main/resources/META-INF/spring.handlers
+++ b/core/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://www.springframework.org/schema/security=org.acegisecurity.config.SecurityNamespaceHandler
+http\://www.springframework.org/schema/security=org.springframework.security.config.SecurityNamespaceHandler
diff --git a/core/src/main/resources/META-INF/spring.schemas b/core/src/main/resources/META-INF/spring.schemas
index 91ab095477..e240aa1e00 100644
--- a/core/src/main/resources/META-INF/spring.schemas
+++ b/core/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/security/spring-security-2.0.xsd=org/acegisecurity/config/spring-security-2.0.xsd
+http\://www.springframework.org/schema/security/spring-security-2.0.xsd=org/springframework/security/config/spring-security-2.0.xsd
 
diff --git a/core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-derby.sql b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-derby.sql
similarity index 70%
rename from core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-derby.sql
rename to core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-derby.sql
index cab2783d93..b424776272 100644
--- a/core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-derby.sql
+++ b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-derby.sql
@@ -18,12 +18,12 @@ CREATE TABLE acl_permission (
      FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id) ON DELETE CASCADE
 );
 
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');
 
 --INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (1, 'ROLE_ADMIN', 1);
 --INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'ROLE_ADMIN', 0);
diff --git a/core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-hsql.sql b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-hsql.sql
similarity index 69%
rename from core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-hsql.sql
rename to core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-hsql.sql
index 19bfc7a86c..4fd6e1f6fa 100644
--- a/core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-hsql.sql
+++ b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-hsql.sql
@@ -16,12 +16,12 @@ CREATE TABLE acl_permission (
      FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id) ON DELETE CASCADE
 );
 
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');
 
 --INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (1, 'ROLE_ADMIN', 1);
 --INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'ROLE_ADMIN', 0);
diff --git a/core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-mysql.sql b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-mysql.sql
similarity index 69%
rename from core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-mysql.sql
rename to core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-mysql.sql
index 524db167dd..3e14e1ee0e 100644
--- a/core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-mysql.sql
+++ b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-mysql.sql
@@ -16,12 +16,12 @@ CREATE TABLE acl_permission (
      FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id) ON DELETE CASCADE
 );
 
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');
 
 --INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (1, 'ROLE_ADMIN', 1);
 --INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'ROLE_ADMIN', 0);
diff --git a/core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-postgres.sql b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-postgres.sql
similarity index 71%
rename from core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-postgres.sql
rename to core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-postgres.sql
index 85ba3db402..3fa69c5815 100644
--- a/core/src/main/resources/org/acegisecurity/acl/basic/jdbc/acegi-acl-postgres.sql
+++ b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-postgres.sql
@@ -20,12 +20,12 @@ CREATE TABLE acl_permission (
      FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id) ON DELETE CASCADE
 );
 
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');
+--INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');
 
 --INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (1, 'ROLE_ADMIN', 1);
 --INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'ROLE_ADMIN', 0);
diff --git a/core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml b/core/src/main/resources/org/springframework/security/adapters/acegisecurity.xml
similarity index 82%
rename from core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml
rename to core/src/main/resources/org/springframework/security/adapters/acegisecurity.xml
index 87e1f1b7bd..44e1e91de5 100644
--- a/core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml
+++ b/core/src/main/resources/org/springframework/security/adapters/acegisecurity.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -32,15 +32,15 @@
 			
 		
 	
-	
+
 	
-	
+	
      	
      	true
 	
 
 	
-	
+	
 		
 		  
 		    
diff --git a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml b/core/src/main/resources/org/springframework/security/adapters/adaptertest-invalid.xml
similarity index 91%
rename from core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml
rename to core/src/main/resources/org/springframework/security/adapters/adaptertest-invalid.xml
index 8bcb630628..ac3349a77e 100644
--- a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml
+++ b/core/src/main/resources/org/springframework/security/adapters/adaptertest-invalid.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -32,7 +32,7 @@
 			
 		
 	
-	
+
 	
 
 
diff --git a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml b/core/src/main/resources/org/springframework/security/adapters/adaptertest-valid.xml
similarity index 82%
rename from core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml
rename to core/src/main/resources/org/springframework/security/adapters/adaptertest-valid.xml
index 87e1f1b7bd..44e1e91de5 100644
--- a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml
+++ b/core/src/main/resources/org/springframework/security/adapters/adaptertest-valid.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -32,15 +32,15 @@
 			
 		
 	
-	
+
 	
-	
+	
      	
      	true
 	
 
 	
-	
+	
 		
 		  
 		    
diff --git a/core/src/main/resources/org/acegisecurity/messages.properties b/core/src/main/resources/org/springframework/security/messages.properties
similarity index 100%
rename from core/src/main/resources/org/acegisecurity/messages.properties
rename to core/src/main/resources/org/springframework/security/messages.properties
diff --git a/core/src/main/resources/org/acegisecurity/messages_cs_CZ.properties b/core/src/main/resources/org/springframework/security/messages_cs_CZ.properties
similarity index 100%
rename from core/src/main/resources/org/acegisecurity/messages_cs_CZ.properties
rename to core/src/main/resources/org/springframework/security/messages_cs_CZ.properties
diff --git a/core/src/main/resources/org/acegisecurity/messages_de.properties b/core/src/main/resources/org/springframework/security/messages_de.properties
similarity index 100%
rename from core/src/main/resources/org/acegisecurity/messages_de.properties
rename to core/src/main/resources/org/springframework/security/messages_de.properties
diff --git a/core/src/main/resources/org/acegisecurity/messages_fr.properties b/core/src/main/resources/org/springframework/security/messages_fr.properties
similarity index 100%
rename from core/src/main/resources/org/acegisecurity/messages_fr.properties
rename to core/src/main/resources/org/springframework/security/messages_fr.properties
diff --git a/core/src/main/resources/org/acegisecurity/messages_zh_CN.properties b/core/src/main/resources/org/springframework/security/messages_zh_CN.properties
similarity index 100%
rename from core/src/main/resources/org/acegisecurity/messages_zh_CN.properties
rename to core/src/main/resources/org/springframework/security/messages_zh_CN.properties
diff --git a/core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml b/core/src/main/resources/org/springframework/security/providers/dao/jdbc/acegisecurity-jdbc.xml
similarity index 80%
rename from core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml
rename to core/src/main/resources/org/springframework/security/providers/dao/jdbc/acegisecurity-jdbc.xml
index c8340425c1..34cd583fe9 100644
--- a/core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml
+++ b/core/src/main/resources/org/springframework/security/providers/dao/jdbc/acegisecurity-jdbc.xml
@@ -9,7 +9,7 @@
 
 
 	
-	
+
 	
 		org.hsqldb.jdbcDriver
 		jdbc:hsqldb:hsql://localhost:9001
@@ -18,17 +18,17 @@
 	
 
 	
-	
+	
   		
 	
-	
+
 	
-	
+	
      	
 	
 
 	
-	
+	
 		
 		  
 		    
diff --git a/core/src/main/resources/org/acegisecurity/taglibs/authz.tld b/core/src/main/resources/org/springframework/security/taglibs/authz.tld
similarity index 86%
rename from core/src/main/resources/org/acegisecurity/taglibs/authz.tld
rename to core/src/main/resources/org/springframework/security/taglibs/authz.tld
index ca44f27dac..b4f29a7ca8 100644
--- a/core/src/main/resources/org/acegisecurity/taglibs/authz.tld
+++ b/core/src/main/resources/org/springframework/security/taglibs/authz.tld
@@ -14,7 +14,7 @@
 
 	
 		authorize
-		org.acegisecurity.taglibs.authz.AuthorizeTag
+		org.springframework.security.taglibs.authz.AuthorizeTag
 		
             A simple tag to output or not the body of the tag if the principal
             has or doesn't have certain authorities.
@@ -53,7 +53,7 @@
 
 	
 		authentication
-		org.acegisecurity.taglibs.authz.AuthenticationTag
+		org.springframework.security.taglibs.authz.AuthenticationTag
 		
             Allows access to the current Authentication object.
 		
@@ -63,27 +63,27 @@
 			true
 			true
 			
-                Must be one of the methods of an instance that implements the UserDetails 
-                interface. Use the JavaBean style property, you can provide a custom prefix 
+                Must be one of the methods of an instance that implements the UserDetails
+                interface. Use the JavaBean style property, you can provide a custom prefix
                 for the method to call.
 			
 		
-		
+
 		
 			methodPrefix
 			false
 			true
 			
-                Must be get or is. This is used to determine the name of the 
+                Must be get or is. This is used to determine the name of the
                 method to be called. The default is get.
 			
-				
+		
 	
 
 
 	
 		acl
-		org.acegisecurity.taglibs.authz.AclTag
+		org.springframework.security.taglibs.authz.AclTag
 		
             Allows inclusion of a tag body if the current Authentication
 			has one of the specified permissions to the presented
@@ -99,8 +99,8 @@
 			
                 A comma separated list of integers, each representing a
 				required bit mask permission from a subclass of
-				org.acegisecurity.acl.basic.AbstractBasicAclEntry.
-			
+                org.springframework.security.acl.basic.AbstractBasicAclEntry.
+            
 		
 		
 			domainObject
@@ -115,7 +115,7 @@
 
 	
 		accesscontrollist
-		org.acegisecurity.taglibs.authz.AccessControlListTag
+		org.springframework.security.taglibs.authz.AccessControlListTag
 		
             Allows inclusion of a tag body if the current Authentication
 			has one of the specified permissions to the presented
@@ -129,8 +129,8 @@
 			
                 A comma separated list of integers, each representing a
 				required bit mask permission from a subclass of
-				org.acegisecurity.acl.basic.AbstractBasicAclEntry.
-			
+                org.springframework.security.acl.basic.AbstractBasicAclEntry.
+            
 		
 		
 			domainObject
@@ -142,5 +142,5 @@
 			
 		
 	
-	
+
 
diff --git a/core/src/test/java/org/acegisecurity/AbstractAuthenticationManagerTests.java b/core/src/test/java/org/springframework/security/AbstractAuthenticationManagerTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/AbstractAuthenticationManagerTests.java
rename to core/src/test/java/org/springframework/security/AbstractAuthenticationManagerTests.java
index 143c632402..1b19284323 100644
--- a/core/src/test/java/org/acegisecurity/AbstractAuthenticationManagerTests.java
+++ b/core/src/test/java/org/springframework/security/AbstractAuthenticationManagerTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/AcegiMessageSourceTests.java b/core/src/test/java/org/springframework/security/AcegiMessageSourceTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/AcegiMessageSourceTests.java
rename to core/src/test/java/org/springframework/security/AcegiMessageSourceTests.java
index 792366638f..4241fc74a7 100644
--- a/core/src/test/java/org/acegisecurity/AcegiMessageSourceTests.java
+++ b/core/src/test/java/org/springframework/security/AcegiMessageSourceTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import junit.framework.TestCase;
 
@@ -24,7 +24,7 @@ import java.util.Locale;
 
 
 /**
- * Tests {@link org.acegisecurity.AcegiMessageSource}.
+ * Tests {@link org.springframework.security.AcegiMessageSource}.
  */
 public class AcegiMessageSourceTests extends TestCase {
     //~ Constructors ===================================================================================================
diff --git a/core/src/test/java/org/acegisecurity/AuthenticationTrustResolverImplTests.java b/core/src/test/java/org/springframework/security/AuthenticationTrustResolverImplTests.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/AuthenticationTrustResolverImplTests.java
rename to core/src/test/java/org/springframework/security/AuthenticationTrustResolverImplTests.java
index d2c1856df0..ea4ceb09a1 100644
--- a/core/src/test/java/org/acegisecurity/AuthenticationTrustResolverImplTests.java
+++ b/core/src/test/java/org/springframework/security/AuthenticationTrustResolverImplTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
-import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
-import org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken;
+import org.springframework.security.providers.rememberme.RememberMeAuthenticationToken;
 
 
 /**
- * Tests {@link org.acegisecurity.AuthenticationTrustResolverImpl}.
+ * Tests {@link org.springframework.security.AuthenticationTrustResolverImpl}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/ConfigAttributeEditorTests.java b/core/src/test/java/org/springframework/security/ConfigAttributeEditorTests.java
similarity index 99%
rename from core/src/test/java/org/acegisecurity/ConfigAttributeEditorTests.java
rename to core/src/test/java/org/springframework/security/ConfigAttributeEditorTests.java
index e071ec2afb..bb2ca6e8db 100644
--- a/core/src/test/java/org/acegisecurity/ConfigAttributeEditorTests.java
+++ b/core/src/test/java/org/springframework/security/ConfigAttributeEditorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/GrantedAuthorityImplTests.java b/core/src/test/java/org/springframework/security/GrantedAuthorityImplTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/GrantedAuthorityImplTests.java
rename to core/src/test/java/org/springframework/security/GrantedAuthorityImplTests.java
index 46c5a571b8..75219162af 100644
--- a/core/src/test/java/org/acegisecurity/GrantedAuthorityImplTests.java
+++ b/core/src/test/java/org/springframework/security/GrantedAuthorityImplTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/ITargetObject.java b/core/src/test/java/org/springframework/security/ITargetObject.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/ITargetObject.java
rename to core/src/test/java/org/springframework/security/ITargetObject.java
index b2ce565416..0c073ec078 100644
--- a/core/src/test/java/org/acegisecurity/ITargetObject.java
+++ b/core/src/test/java/org/springframework/security/ITargetObject.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 /**
  * Represents the interface of a secured object.
diff --git a/core/src/test/java/org/acegisecurity/MockAccessDecisionManager.java b/core/src/test/java/org/springframework/security/MockAccessDecisionManager.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/MockAccessDecisionManager.java
rename to core/src/test/java/org/springframework/security/MockAccessDecisionManager.java
index d78d68d105..e60eb62b70 100644
--- a/core/src/test/java/org/acegisecurity/MockAccessDecisionManager.java
+++ b/core/src/test/java/org/springframework/security/MockAccessDecisionManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/MockAclManager.java b/core/src/test/java/org/springframework/security/MockAclManager.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/MockAclManager.java
rename to core/src/test/java/org/springframework/security/MockAclManager.java
index 6f8d3cc7e4..041af871f4 100644
--- a/core/src/test/java/org/acegisecurity/MockAclManager.java
+++ b/core/src/test/java/org/springframework/security/MockAclManager.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
-import org.acegisecurity.acl.AclEntry;
-import org.acegisecurity.acl.AclManager;
+import org.springframework.security.acl.AclEntry;
+import org.springframework.security.acl.AclManager;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/MockAfterInvocationManager.java b/core/src/test/java/org/springframework/security/MockAfterInvocationManager.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/MockAfterInvocationManager.java
rename to core/src/test/java/org/springframework/security/MockAfterInvocationManager.java
index 5817bff90e..181af38605 100644
--- a/core/src/test/java/org/acegisecurity/MockAfterInvocationManager.java
+++ b/core/src/test/java/org/springframework/security/MockAfterInvocationManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/MockApplicationContext.java b/core/src/test/java/org/springframework/security/MockApplicationContext.java
similarity index 88%
rename from core/src/test/java/org/acegisecurity/MockApplicationContext.java
rename to core/src/test/java/org/springframework/security/MockApplicationContext.java
index 71a310b894..398750ee84 100644
--- a/core/src/test/java/org/acegisecurity/MockApplicationContext.java
+++ b/core/src/test/java/org/springframework/security/MockApplicationContext.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -29,6 +29,6 @@ public class MockApplicationContext {
     //~ Methods ========================================================================================================
 
     public static ConfigurableApplicationContext getContext() {
-        return new ClassPathXmlApplicationContext("org/acegisecurity/applicationContext.xml");
+        return new ClassPathXmlApplicationContext("org/springframework/security/applicationContext.xml");
     }
 }
diff --git a/core/src/test/java/org/acegisecurity/MockAuthenticationEntryPoint.java b/core/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/MockAuthenticationEntryPoint.java
rename to core/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java
index 46f570d66d..965d864ff1 100644
--- a/core/src/test/java/org/acegisecurity/MockAuthenticationEntryPoint.java
+++ b/core/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import java.io.IOException;
 
@@ -23,7 +23,7 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.acegisecurity.ui.AuthenticationEntryPoint;
+import org.springframework.security.ui.AuthenticationEntryPoint;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/MockFilterChain.java b/core/src/test/java/org/springframework/security/MockFilterChain.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/MockFilterChain.java
rename to core/src/test/java/org/springframework/security/MockFilterChain.java
index ce8ba514a0..0644ba70f6 100644
--- a/core/src/test/java/org/acegisecurity/MockFilterChain.java
+++ b/core/src/test/java/org/springframework/security/MockFilterChain.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/MockFilterConfig.java b/core/src/test/java/org/springframework/security/MockFilterConfig.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/MockFilterConfig.java
rename to core/src/test/java/org/springframework/security/MockFilterConfig.java
index 662f57af9d..70181e31da 100644
--- a/core/src/test/java/org/acegisecurity/MockFilterConfig.java
+++ b/core/src/test/java/org/springframework/security/MockFilterConfig.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import java.util.Enumeration;
 import java.util.HashMap;
diff --git a/core/src/test/java/org/acegisecurity/MockJoinPoint.java b/core/src/test/java/org/springframework/security/MockJoinPoint.java
similarity index 99%
rename from core/src/test/java/org/acegisecurity/MockJoinPoint.java
rename to core/src/test/java/org/springframework/security/MockJoinPoint.java
index 0c185f5382..e402bbbb80 100644
--- a/core/src/test/java/org/acegisecurity/MockJoinPoint.java
+++ b/core/src/test/java/org/springframework/security/MockJoinPoint.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
diff --git a/core/src/test/java/org/acegisecurity/MockPortResolver.java b/core/src/test/java/org/springframework/security/MockPortResolver.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/MockPortResolver.java
rename to core/src/test/java/org/springframework/security/MockPortResolver.java
index c99db0f92b..e4f67240d5 100644
--- a/core/src/test/java/org/acegisecurity/MockPortResolver.java
+++ b/core/src/test/java/org/springframework/security/MockPortResolver.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
-import org.acegisecurity.util.PortResolver;
+import org.springframework.security.util.PortResolver;
 
 import javax.servlet.ServletRequest;
 
diff --git a/core/src/test/java/org/acegisecurity/MockRunAsAuthenticationToken.java b/core/src/test/java/org/springframework/security/MockRunAsAuthenticationToken.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/MockRunAsAuthenticationToken.java
rename to core/src/test/java/org/springframework/security/MockRunAsAuthenticationToken.java
index 035cbe7ebe..0bd42c3657 100644
--- a/core/src/test/java/org/acegisecurity/MockRunAsAuthenticationToken.java
+++ b/core/src/test/java/org/springframework/security/MockRunAsAuthenticationToken.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
-import org.acegisecurity.providers.AbstractAuthenticationToken;
+import org.springframework.security.providers.AbstractAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/MockRunAsManager.java b/core/src/test/java/org/springframework/security/MockRunAsManager.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/MockRunAsManager.java
rename to core/src/test/java/org/springframework/security/MockRunAsManager.java
index 4e6f6f1f45..a4cdc642ae 100644
--- a/core/src/test/java/org/acegisecurity/MockRunAsManager.java
+++ b/core/src/test/java/org/springframework/security/MockRunAsManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/OtherTargetObject.java b/core/src/test/java/org/springframework/security/OtherTargetObject.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/OtherTargetObject.java
rename to core/src/test/java/org/springframework/security/OtherTargetObject.java
index 6b54b7b995..c003698fe4 100644
--- a/core/src/test/java/org/acegisecurity/OtherTargetObject.java
+++ b/core/src/test/java/org/springframework/security/OtherTargetObject.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 /**
  * Simply extends {@link TargetObject} so we have a different object to put configuration attributes against.
There
diff --git a/core/src/test/java/org/acegisecurity/PopulatedDatabase.java b/core/src/test/java/org/springframework/security/PopulatedDatabase.java
similarity index 84%
rename from core/src/test/java/org/acegisecurity/PopulatedDatabase.java
rename to core/src/test/java/org/springframework/security/PopulatedDatabase.java
index d01bcfd74f..488b2fa988 100644
--- a/core/src/test/java/org/acegisecurity/PopulatedDatabase.java
+++ b/core/src/test/java/org/springframework/security/PopulatedDatabase.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
@@ -29,7 +29,7 @@ import javax.sql.DataSource;
  */
 public class PopulatedDatabase {
     //~ Static fields/initializers =====================================================================================
-                                        
+
     private static DriverManagerDataSource dataSource = null;
 
     //~ Constructors ===================================================================================================
@@ -76,21 +76,21 @@ public class PopulatedDatabase {
         template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_TELLER')");
         template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_TELLER')");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (1, 'org.acegisecurity.acl.DomainObject:1', null, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (1, 'org.springframework.security.acl.DomainObject:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry');");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (2, 'org.acegisecurity.acl.DomainObject:2', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (2, 'org.springframework.security.acl.DomainObject:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (3, 'org.acegisecurity.acl.DomainObject:3', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (3, 'org.springframework.security.acl.DomainObject:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (4, 'org.acegisecurity.acl.DomainObject:4', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (4, 'org.springframework.security.acl.DomainObject:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (5, 'org.acegisecurity.acl.DomainObject:5', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (5, 'org.springframework.security.acl.DomainObject:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');");
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (6, 'org.acegisecurity.acl.DomainObject:6', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');");
+            "INSERT INTO acl_object_identity VALUES (6, 'org.springframework.security.acl.DomainObject:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');");
 
         // ----- BEGIN deviation from normal sample data load script -----
         template.execute(
-            "INSERT INTO acl_object_identity VALUES (7, 'org.acegisecurity.acl.DomainObject:7', 3, 'some.invalid.acl.entry.class');");
+            "INSERT INTO acl_object_identity VALUES (7, 'org.springframework.security.acl.DomainObject:7', 3, 'some.invalid.acl.entry.class');");
 
         // ----- FINISH deviation from normal sample data load script -----
         template.execute("INSERT INTO acl_permission VALUES (null, 1, 'ROLE_SUPERVISOR', 1);");
diff --git a/core/src/test/java/org/acegisecurity/SecurityConfigTests.java b/core/src/test/java/org/springframework/security/SecurityConfigTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/SecurityConfigTests.java
rename to core/src/test/java/org/springframework/security/SecurityConfigTests.java
index 2bd4677a5c..6d636421d7 100644
--- a/core/src/test/java/org/acegisecurity/SecurityConfigTests.java
+++ b/core/src/test/java/org/springframework/security/SecurityConfigTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/TargetObject.java b/core/src/test/java/org/springframework/security/TargetObject.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/TargetObject.java
rename to core/src/test/java/org/springframework/security/TargetObject.java
index 637485dfc1..86b9d0fa98 100644
--- a/core/src/test/java/org/acegisecurity/TargetObject.java
+++ b/core/src/test/java/org/springframework/security/TargetObject.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity;
+package org.springframework.security;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/acl/AclProviderManagerTests.java b/core/src/test/java/org/springframework/security/acl/AclProviderManagerTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/acl/AclProviderManagerTests.java
rename to core/src/test/java/org/springframework/security/acl/AclProviderManagerTests.java
index 987ba8a5f9..10fbd69f06 100644
--- a/core/src/test/java/org/acegisecurity/acl/AclProviderManagerTests.java
+++ b/core/src/test/java/org/springframework/security/acl/AclProviderManagerTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl;
+package org.springframework.security.acl;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.springframework.security.acl.basic.NamedEntityObjectIdentity;
+import org.springframework.security.acl.basic.SimpleAclEntry;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/BasicAclProviderTests.java b/core/src/test/java/org/springframework/security/acl/basic/BasicAclProviderTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/acl/basic/BasicAclProviderTests.java
rename to core/src/test/java/org/springframework/security/acl/basic/BasicAclProviderTests.java
index ff73886367..b8fc223e8b 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/BasicAclProviderTests.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/BasicAclProviderTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic;
+package org.springframework.security.acl.basic;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.PopulatedDatabase;
+import org.springframework.security.Authentication;
+import org.springframework.security.PopulatedDatabase;
 
-import org.acegisecurity.acl.AclEntry;
-import org.acegisecurity.acl.basic.cache.BasicAclEntryHolder;
-import org.acegisecurity.acl.basic.cache.NullAclEntryCache;
-import org.acegisecurity.acl.basic.jdbc.JdbcDaoImpl;
+import org.springframework.security.acl.AclEntry;
+import org.springframework.security.acl.basic.cache.BasicAclEntryHolder;
+import org.springframework.security.acl.basic.cache.NullAclEntryCache;
+import org.springframework.security.acl.basic.jdbc.JdbcDaoImpl;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -40,7 +40,7 @@ import java.util.Map;
 public class BasicAclProviderTests extends TestCase {
     //~ Static fields/initializers =====================================================================================
 
-    public static final String OBJECT_IDENTITY = "org.acegisecurity.acl.DomainObject";
+    public static final String OBJECT_IDENTITY = "org.springframework.security.acl.DomainObject";
 
     //~ Constructors ===================================================================================================
 
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolverTests.java b/core/src/test/java/org/springframework/security/acl/basic/GrantedAuthorityEffectiveAclsResolverTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolverTests.java
rename to core/src/test/java/org/springframework/security/acl/basic/GrantedAuthorityEffectiveAclsResolverTests.java
index cd69e3cdbf..340d26dd81 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/GrantedAuthorityEffectiveAclsResolverTests.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/GrantedAuthorityEffectiveAclsResolverTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic;
+package org.springframework.security.acl.basic;
 
 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.acl.AclEntry;
+import org.springframework.security.acl.AclEntry;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.userdetails.User;
+import org.springframework.security.userdetails.User;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/MockAclObjectIdentity.java b/core/src/test/java/org/springframework/security/acl/basic/MockAclObjectIdentity.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/acl/basic/MockAclObjectIdentity.java
rename to core/src/test/java/org/springframework/security/acl/basic/MockAclObjectIdentity.java
index f9320cdd83..65520b9ef3 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/MockAclObjectIdentity.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/MockAclObjectIdentity.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic;
+package org.springframework.security.acl.basic;
 
 /**
  * Implements AclObjectIdentity but is incompatible with BasicAclProvider because it
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentityTests.java b/core/src/test/java/org/springframework/security/acl/basic/NamedEntityObjectIdentityTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentityTests.java
rename to core/src/test/java/org/springframework/security/acl/basic/NamedEntityObjectIdentityTests.java
index a893706427..b8598054e9 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/NamedEntityObjectIdentityTests.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/NamedEntityObjectIdentityTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic;
+package org.springframework.security.acl.basic;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/SimpleAclEntryTests.java b/core/src/test/java/org/springframework/security/acl/basic/SimpleAclEntryTests.java
similarity index 99%
rename from core/src/test/java/org/acegisecurity/acl/basic/SimpleAclEntryTests.java
rename to core/src/test/java/org/springframework/security/acl/basic/SimpleAclEntryTests.java
index f6bd59de71..9b11c7d2b0 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/SimpleAclEntryTests.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/SimpleAclEntryTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic;
+package org.springframework.security.acl.basic;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/SomeDomain.java b/core/src/test/java/org/springframework/security/acl/basic/SomeDomain.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/acl/basic/SomeDomain.java
rename to core/src/test/java/org/springframework/security/acl/basic/SomeDomain.java
index 1672a372c8..709c8b4838 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/SomeDomain.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/SomeDomain.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic;
+package org.springframework.security.acl.basic;
 
 /**
  * Simple object to use when testing NamedEntityObjectIdentity.
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolderTests.java b/core/src/test/java/org/springframework/security/acl/basic/cache/BasicAclEntryHolderTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolderTests.java
rename to core/src/test/java/org/springframework/security/acl/basic/cache/BasicAclEntryHolderTests.java
index 22ec190778..8d1d76157f 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/cache/BasicAclEntryHolderTests.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/cache/BasicAclEntryHolderTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic.cache;
+package org.springframework.security.acl.basic.cache;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.acl.basic.BasicAclEntry;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.springframework.security.acl.basic.BasicAclEntry;
+import org.springframework.security.acl.basic.SimpleAclEntry;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCacheTests.java b/core/src/test/java/org/springframework/security/acl/basic/cache/EhCacheBasedAclEntryCacheTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCacheTests.java
rename to core/src/test/java/org/springframework/security/acl/basic/cache/EhCacheBasedAclEntryCacheTests.java
index 404549df8b..cda694064b 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/cache/EhCacheBasedAclEntryCacheTests.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/cache/EhCacheBasedAclEntryCacheTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic.cache;
+package org.springframework.security.acl.basic.cache;
 
 import junit.framework.TestCase;
 
 import net.sf.ehcache.Ehcache;
 
-import org.acegisecurity.MockApplicationContext;
+import org.springframework.security.MockApplicationContext;
 
-import org.acegisecurity.acl.basic.AclObjectIdentity;
-import org.acegisecurity.acl.basic.BasicAclEntry;
-import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.springframework.security.acl.basic.AclObjectIdentity;
+import org.springframework.security.acl.basic.BasicAclEntry;
+import org.springframework.security.acl.basic.NamedEntityObjectIdentity;
+import org.springframework.security.acl.basic.SimpleAclEntry;
 
 import org.springframework.context.ApplicationContext;
 
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/cache/NullAclEntryCacheTests.java b/core/src/test/java/org/springframework/security/acl/basic/cache/NullAclEntryCacheTests.java
similarity index 87%
rename from core/src/test/java/org/acegisecurity/acl/basic/cache/NullAclEntryCacheTests.java
rename to core/src/test/java/org/springframework/security/acl/basic/cache/NullAclEntryCacheTests.java
index bd528d6e08..5111317ab5 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/cache/NullAclEntryCacheTests.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/cache/NullAclEntryCacheTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic.cache;
+package org.springframework.security.acl.basic.cache;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.acl.basic.BasicAclEntry;
-import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.springframework.security.acl.basic.BasicAclEntry;
+import org.springframework.security.acl.basic.NamedEntityObjectIdentity;
+import org.springframework.security.acl.basic.SimpleAclEntry;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImplTests.java b/core/src/test/java/org/springframework/security/acl/basic/jdbc/JdbcDaoImplTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImplTests.java
rename to core/src/test/java/org/springframework/security/acl/basic/jdbc/JdbcDaoImplTests.java
index 0e2ed96b6b..28bd2b0f77 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcDaoImplTests.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/jdbc/JdbcDaoImplTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic.jdbc;
+package org.springframework.security.acl.basic.jdbc;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.PopulatedDatabase;
+import org.springframework.security.PopulatedDatabase;
 
-import org.acegisecurity.acl.basic.AclObjectIdentity;
-import org.acegisecurity.acl.basic.BasicAclEntry;
-import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
+import org.springframework.security.acl.basic.AclObjectIdentity;
+import org.springframework.security.acl.basic.BasicAclEntry;
+import org.springframework.security.acl.basic.NamedEntityObjectIdentity;
 
 import org.springframework.jdbc.object.MappingSqlQuery;
 
@@ -38,7 +38,7 @@ import java.sql.SQLException;
 public class JdbcDaoImplTests extends TestCase {
     //~ Static fields/initializers =====================================================================================
 
-    public static final String OBJECT_IDENTITY = "org.acegisecurity.acl.DomainObject";
+    public static final String OBJECT_IDENTITY = "org.springframework.security.acl.DomainObject";
 
     //~ Constructors ===================================================================================================
 
diff --git a/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImplTests.java b/core/src/test/java/org/springframework/security/acl/basic/jdbc/JdbcExtendedDaoImplTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImplTests.java
rename to core/src/test/java/org/springframework/security/acl/basic/jdbc/JdbcExtendedDaoImplTests.java
index a4e4bed5e8..a45adc99d4 100644
--- a/core/src/test/java/org/acegisecurity/acl/basic/jdbc/JdbcExtendedDaoImplTests.java
+++ b/core/src/test/java/org/springframework/security/acl/basic/jdbc/JdbcExtendedDaoImplTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.acl.basic.jdbc;
+package org.springframework.security.acl.basic.jdbc;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.PopulatedDatabase;
+import org.springframework.security.PopulatedDatabase;
 
-import org.acegisecurity.acl.basic.AclObjectIdentity;
-import org.acegisecurity.acl.basic.BasicAclEntry;
-import org.acegisecurity.acl.basic.NamedEntityObjectIdentity;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.springframework.security.acl.basic.AclObjectIdentity;
+import org.springframework.security.acl.basic.BasicAclEntry;
+import org.springframework.security.acl.basic.NamedEntityObjectIdentity;
+import org.springframework.security.acl.basic.SimpleAclEntry;
 
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DataRetrievalFailureException;
@@ -42,7 +42,7 @@ import java.sql.SQLException;
 public class JdbcExtendedDaoImplTests extends TestCase {
     //~ Static fields/initializers =====================================================================================
 
-    public static final String OBJECT_IDENTITY = "org.acegisecurity.acl.DomainObject";
+    public static final String OBJECT_IDENTITY = "org.springframework.security.acl.DomainObject";
 
     //~ Constructors ===================================================================================================
 
diff --git a/core/src/test/java/org/acegisecurity/acls/domain/PermissionTests.java b/core/src/test/java/org/springframework/security/acls/domain/PermissionTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/acls/domain/PermissionTests.java
rename to core/src/test/java/org/springframework/security/acls/domain/PermissionTests.java
index ba4639fd1d..ad87f86bb5 100644
--- a/core/src/test/java/org/acegisecurity/acls/domain/PermissionTests.java
+++ b/core/src/test/java/org/springframework/security/acls/domain/PermissionTests.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.acls.domain;
+package org.springframework.security.acls.domain;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.acls.Permission;
+import org.springframework.security.acls.Permission;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/acls/jdbc/DatabaseSeeder.java b/core/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/acls/jdbc/DatabaseSeeder.java
rename to core/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java
index aebf9ef38f..3384a41804 100644
--- a/core/src/test/java/org/acegisecurity/acls/jdbc/DatabaseSeeder.java
+++ b/core/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.acls.jdbc;
+package org.springframework.security.acls.jdbc;
 
 import org.springframework.core.io.Resource;
 
diff --git a/core/src/test/java/org/acegisecurity/acls/jdbc/JdbcAclServiceTests.java b/core/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java
similarity index 87%
rename from core/src/test/java/org/acegisecurity/acls/jdbc/JdbcAclServiceTests.java
rename to core/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java
index c9f20d9315..28814f89b3 100644
--- a/core/src/test/java/org/acegisecurity/acls/jdbc/JdbcAclServiceTests.java
+++ b/core/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java
@@ -12,25 +12,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.acls.jdbc;
+package org.springframework.security.acls.jdbc;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.acls.AccessControlEntry;
-import org.acegisecurity.acls.MutableAcl;
-import org.acegisecurity.acls.NotFoundException;
-import org.acegisecurity.acls.Permission;
-import org.acegisecurity.acls.domain.BasePermission;
-import org.acegisecurity.acls.objectidentity.ObjectIdentity;
-import org.acegisecurity.acls.objectidentity.ObjectIdentityImpl;
-import org.acegisecurity.acls.sid.PrincipalSid;
-import org.acegisecurity.acls.sid.Sid;
+import org.springframework.security.acls.AccessControlEntry;
+import org.springframework.security.acls.MutableAcl;
+import org.springframework.security.acls.NotFoundException;
+import org.springframework.security.acls.Permission;
+import org.springframework.security.acls.domain.BasePermission;
+import org.springframework.security.acls.objectidentity.ObjectIdentity;
+import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
+import org.springframework.security.acls.sid.PrincipalSid;
+import org.springframework.security.acls.sid.Sid;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
 
@@ -51,7 +51,7 @@ public class JdbcAclServiceTests extends AbstractTransactionalDataSourceSpringCo
     //~ Methods ========================================================================================================
 
     protected String[] getConfigLocations() {
-        return new String[] {"classpath:org/acegisecurity/acls/jdbc/applicationContext-test.xml"};
+        return new String[] {"classpath:org/springframework/security/acls/jdbc/applicationContext-test.xml"};
     }
 
     public void setJdbcMutableAclService(JdbcMutableAclService jdbcAclService) {
@@ -72,9 +72,9 @@ public class JdbcAclServiceTests extends AbstractTransactionalDataSourceSpringCo
         auth.setAuthenticated(true);
         SecurityContextHolder.getContext().setAuthentication(auth);
 
-        ObjectIdentity topParentOid = new ObjectIdentityImpl("org.acegisecurity.TargetObject", new Long(100));
-        ObjectIdentity middleParentOid = new ObjectIdentityImpl("org.acegisecurity.TargetObject", new Long(101));
-        ObjectIdentity childOid = new ObjectIdentityImpl("org.acegisecurity.TargetObject", new Long(102));
+        ObjectIdentity topParentOid = new ObjectIdentityImpl("org.springframework.security.TargetObject", new Long(100));
+        ObjectIdentity middleParentOid = new ObjectIdentityImpl("org.springframework.security.TargetObject", new Long(101));
+        ObjectIdentity childOid = new ObjectIdentityImpl("org.springframework.security.TargetObject", new Long(102));
 
         MutableAcl topParent = jdbcMutableAclService.createAcl(topParentOid);
         MutableAcl middleParent = jdbcMutableAclService.createAcl(middleParentOid);
@@ -206,7 +206,7 @@ public class JdbcAclServiceTests extends AbstractTransactionalDataSourceSpringCo
    auth.setAuthenticated(true);
    SecurityContextHolder.getContext().setAuthentication(auth);
 
-   ObjectIdentity topParentOid = new ObjectIdentityImpl("org.acegisecurity.TargetObject", new Long(110));
+   ObjectIdentity topParentOid = new ObjectIdentityImpl("org.springframework.security.TargetObject", new Long(110));
    MutableAcl topParent = jdbcMutableAclService.createAcl(topParentOid);
 
    // Add an ACE permission entry
diff --git a/core/src/test/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/adapters/AbstractAdapterAuthenticationTokenTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationTokenTests.java
rename to core/src/test/java/org/springframework/security/adapters/AbstractAdapterAuthenticationTokenTests.java
index 5a4632ae68..56e84e0bdc 100644
--- a/core/src/test/java/org/acegisecurity/adapters/AbstractAdapterAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/adapters/AbstractAdapterAuthenticationTokenTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters;
+package org.springframework.security.adapters;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java b/core/src/test/java/org/springframework/security/adapters/AuthByAdapterTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java
rename to core/src/test/java/org/springframework/security/adapters/AuthByAdapterTests.java
index 30a5c6599a..23ce6d770a 100644
--- a/core/src/test/java/org/acegisecurity/adapters/AuthByAdapterTests.java
+++ b/core/src/test/java/org/springframework/security/adapters/AuthByAdapterTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters;
+package org.springframework.security.adapters;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.Arrays;
 
diff --git a/core/src/test/java/org/acegisecurity/adapters/HttpRequestIntegrationFilterTests.java b/core/src/test/java/org/springframework/security/adapters/HttpRequestIntegrationFilterTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/adapters/HttpRequestIntegrationFilterTests.java
rename to core/src/test/java/org/springframework/security/adapters/HttpRequestIntegrationFilterTests.java
index ef7c5979bc..cb6039700b 100644
--- a/core/src/test/java/org/acegisecurity/adapters/HttpRequestIntegrationFilterTests.java
+++ b/core/src/test/java/org/springframework/security/adapters/HttpRequestIntegrationFilterTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters;
+package org.springframework.security.adapters;
 
 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.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.util.MockFilterChain;
+import org.springframework.security.util.MockFilterChain;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/adapters/MockPrincipal.java b/core/src/test/java/org/springframework/security/adapters/MockPrincipal.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/adapters/MockPrincipal.java
rename to core/src/test/java/org/springframework/security/adapters/MockPrincipal.java
index d7185196af..114d0598d2 100644
--- a/core/src/test/java/org/acegisecurity/adapters/MockPrincipal.java
+++ b/core/src/test/java/org/springframework/security/adapters/MockPrincipal.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters;
+package org.springframework.security.adapters;
 
 import java.security.Principal;
 
diff --git a/core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java b/core/src/test/java/org/springframework/security/adapters/PrincipalAcegiUserTokenTests.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java
rename to core/src/test/java/org/springframework/security/adapters/PrincipalAcegiUserTokenTests.java
index c9a96c387d..15b3036fdc 100644
--- a/core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java
+++ b/core/src/test/java/org/springframework/security/adapters/PrincipalAcegiUserTokenTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.adapters;
+package org.springframework.security.adapters;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManagerTests.java b/core/src/test/java/org/springframework/security/afterinvocation/AfterInvocationProviderManagerTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManagerTests.java
rename to core/src/test/java/org/springframework/security/afterinvocation/AfterInvocationProviderManagerTests.java
index 2dc69ea9be..5eb6ea8ba1 100644
--- a/core/src/test/java/org/acegisecurity/afterinvocation/AfterInvocationProviderManagerTests.java
+++ b/core/src/test/java/org/springframework/security/afterinvocation/AfterInvocationProviderManagerTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.afterinvocation;
+package org.springframework.security.afterinvocation;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.intercept.web.FilterInvocation;
+import org.springframework.security.intercept.web.FilterInvocation;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProviderTests.java b/core/src/test/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProviderTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProviderTests.java
rename to core/src/test/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProviderTests.java
index e640771765..047f53d4b3 100644
--- a/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProviderTests.java
+++ b/core/src/test/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationCollectionFilteringProviderTests.java
@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.afterinvocation;
+package org.springframework.security.afterinvocation;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AuthorizationServiceException;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockAclManager;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.AuthorizationServiceException;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockAclManager;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.acl.AclEntry;
-import org.acegisecurity.acl.AclManager;
-import org.acegisecurity.acl.basic.MockAclObjectIdentity;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.springframework.security.acl.AclEntry;
+import org.springframework.security.acl.AclManager;
+import org.springframework.security.acl.basic.MockAclObjectIdentity;
+import org.springframework.security.acl.basic.SimpleAclEntry;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProviderTests.java b/core/src/test/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationProviderTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProviderTests.java
rename to core/src/test/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationProviderTests.java
index 08c4420a1f..09f94aacef 100644
--- a/core/src/test/java/org/acegisecurity/afterinvocation/BasicAclEntryAfterInvocationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/afterinvocation/BasicAclEntryAfterInvocationProviderTests.java
@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.afterinvocation;
+package org.springframework.security.afterinvocation;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockAclManager;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockAclManager;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.acl.AclEntry;
-import org.acegisecurity.acl.AclManager;
-import org.acegisecurity.acl.basic.MockAclObjectIdentity;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.springframework.security.acl.AclEntry;
+import org.springframework.security.acl.AclManager;
+import org.springframework.security.acl.basic.MockAclObjectIdentity;
+import org.springframework.security.acl.basic.SimpleAclEntry;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java b/core/src/test/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
rename to core/src/test/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
index 12d3582508..b5c670db84 100644
--- a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
+++ b/core/src/test/java/org/springframework/security/captcha/AlwaysTestAfterMaxRequestsCaptchaChannelProcessorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.captcha;
+package org.springframework.security.captcha;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java b/core/src/test/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
rename to core/src/test/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
index 350aa69ce2..a3e65d3450 100644
--- a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
+++ b/core/src/test/java/org/springframework/security/captcha/AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.captcha;
+package org.springframework.security.captcha;
 
 import junit.framework.*;
 
-import org.acegisecurity.captcha.AlwaysTestAfterTimeInMillisCaptchaChannelProcessor;
+import org.springframework.security.captcha.AlwaysTestAfterTimeInMillisCaptchaChannelProcessor;
 
 
 /**
@@ -53,7 +53,7 @@ public class AlwaysTestAfterTimeInMillisCaptchaChannelProcessorTests extends Tes
     }
 /* Commented out as it makes assumptions about the speed of the build server and fails intermittently on
    build.springframework.org - L.T.
-   
+
     public void testIsContextValidConcerningHumanity()
         throws Exception {
         CaptchaSecurityContext context = new CaptchaSecurityContextImpl();
diff --git a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java b/core/src/test/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
similarity index 99%
rename from core/src/test/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
rename to core/src/test/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
index 66b0c93fb0..1ff5b0dfa4 100644
--- a/core/src/test/java/org/acegisecurity/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
+++ b/core/src/test/java/org/springframework/security/captcha/AlwaysTestBelowAverageTimeInMillisBetweenRequestsChannelProcessorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.captcha;
+package org.springframework.security.captcha;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplateTests.java b/core/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplateTests.java
rename to core/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java
index 260bd74438..6657b5690e 100644
--- a/core/src/test/java/org/acegisecurity/captcha/CaptchaChannelProcessorTemplateTests.java
+++ b/core/src/test/java/org/springframework/security/captcha/CaptchaChannelProcessorTemplateTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.captcha;
+package org.springframework.security.captcha;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockFilterChain;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockFilterChain;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.intercept.web.FilterInvocation;
+import org.springframework.security.intercept.web.FilterInvocation;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -34,7 +34,7 @@ import javax.servlet.ServletException;
 
 
 /**
- * Tests {@link org.acegisecurity.captcha.CaptchaChannelProcessorTemplate}
+ * Tests {@link org.springframework.security.captcha.CaptchaChannelProcessorTemplate}
  *
  * @author marc antoine Garrigue
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/captcha/CaptchaEntryPointTests.java b/core/src/test/java/org/springframework/security/captcha/CaptchaEntryPointTests.java
similarity index 99%
rename from core/src/test/java/org/acegisecurity/captcha/CaptchaEntryPointTests.java
rename to core/src/test/java/org/springframework/security/captcha/CaptchaEntryPointTests.java
index 238c55bfd6..680b7c8cae 100644
--- a/core/src/test/java/org/acegisecurity/captcha/CaptchaEntryPointTests.java
+++ b/core/src/test/java/org/springframework/security/captcha/CaptchaEntryPointTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.captcha;
+package org.springframework.security.captcha;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.MockPortResolver;
+import org.springframework.security.MockPortResolver;
 
-import org.acegisecurity.util.PortMapperImpl;
+import org.springframework.security.util.PortMapperImpl;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/captcha/CaptchaSecurityContextImplTests.java b/core/src/test/java/org/springframework/security/captcha/CaptchaSecurityContextImplTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/captcha/CaptchaSecurityContextImplTests.java
rename to core/src/test/java/org/springframework/security/captcha/CaptchaSecurityContextImplTests.java
index 0dccdfa1e3..d920e18574 100644
--- a/core/src/test/java/org/acegisecurity/captcha/CaptchaSecurityContextImplTests.java
+++ b/core/src/test/java/org/springframework/security/captcha/CaptchaSecurityContextImplTests.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.captcha;
+package org.springframework.security.captcha;
 
-import org.acegisecurity.context.SecurityContextImplTests;
+import org.springframework.security.context.SecurityContextImplTests;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilterTests.java b/core/src/test/java/org/springframework/security/captcha/CaptchaValidationProcessingFilterTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/captcha/CaptchaValidationProcessingFilterTests.java
index 819689a206..ef3477a474 100644
--- a/core/src/test/java/org/acegisecurity/captcha/CaptchaValidationProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/captcha/CaptchaValidationProcessingFilterTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.captcha;
+package org.springframework.security.captcha;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.util.MockFilterChain;
+import org.springframework.security.util.MockFilterChain;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
@@ -61,7 +61,7 @@ public class CaptchaValidationProcessingFilterTests extends TestCase {
 
     /*
      * Test method for
-     * 'org.acegisecurity.captcha.CaptchaValidationProcessingFilter.doFilter(ServletRequest,
+     * 'org.springframework.security.captcha.CaptchaValidationProcessingFilter.doFilter(ServletRequest,
      * ServletResponse, FilterChain)'
      */
     public void testDoFilterWithRequestParameter() throws Exception {
@@ -89,7 +89,7 @@ public class CaptchaValidationProcessingFilterTests extends TestCase {
 
     /*
      * Test method for
-     * 'org.acegisecurity.captcha.CaptchaValidationProcessingFilter.doFilter(ServletRequest,
+     * 'org.springframework.security.captcha.CaptchaValidationProcessingFilter.doFilter(ServletRequest,
      * ServletResponse, FilterChain)'
      */
     public void testDoFilterWithoutRequestParameter() throws Exception {
diff --git a/core/src/test/java/org/acegisecurity/captcha/MockCaptchaServiceProxy.java b/core/src/test/java/org/springframework/security/captcha/MockCaptchaServiceProxy.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/captcha/MockCaptchaServiceProxy.java
rename to core/src/test/java/org/springframework/security/captcha/MockCaptchaServiceProxy.java
index 4e9676f0ad..1919929d32 100644
--- a/core/src/test/java/org/acegisecurity/captcha/MockCaptchaServiceProxy.java
+++ b/core/src/test/java/org/springframework/security/captcha/MockCaptchaServiceProxy.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.captcha;
+package org.springframework.security.captcha;
 
 /**
  * DOCUMENT ME!
diff --git a/core/src/test/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java b/core/src/test/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java
rename to core/src/test/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java
index c68e04831b..08649e3888 100644
--- a/core/src/test/java/org/acegisecurity/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java
+++ b/core/src/test/java/org/springframework/security/captcha/TestOnceAfterMaxRequestsCaptchaChannelProcessorTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.captcha;
+package org.springframework.security.captcha;
 
 import junit.framework.*;
 
-import org.acegisecurity.captcha.TestOnceAfterMaxRequestsCaptchaChannelProcessor;
+import org.springframework.security.captcha.TestOnceAfterMaxRequestsCaptchaChannelProcessor;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImplTests.java b/core/src/test/java/org/springframework/security/concurrent/ConcurrentSessionControllerImplTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImplTests.java
rename to core/src/test/java/org/springframework/security/concurrent/ConcurrentSessionControllerImplTests.java
index 127592181b..6ddc7d451e 100644
--- a/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImplTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/ConcurrentSessionControllerImplTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.concurrent;
+package org.springframework.security.concurrent;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
+import org.springframework.security.Authentication;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.ui.WebAuthenticationDetails;
+import org.springframework.security.ui.WebAuthenticationDetails;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;
diff --git a/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionFilterTests.java b/core/src/test/java/org/springframework/security/concurrent/ConcurrentSessionFilterTests.java
similarity index 99%
rename from core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionFilterTests.java
rename to core/src/test/java/org/springframework/security/concurrent/ConcurrentSessionFilterTests.java
index ec408425c9..bca3a21e66 100644
--- a/core/src/test/java/org/acegisecurity/concurrent/ConcurrentSessionFilterTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/ConcurrentSessionFilterTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.concurrent;
+package org.springframework.security.concurrent;
 
 import junit.framework.TestCase;
 import org.springframework.mock.web.MockFilterConfig;
diff --git a/core/src/test/java/org/acegisecurity/concurrent/SessionInformationTests.java b/core/src/test/java/org/springframework/security/concurrent/SessionInformationTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/concurrent/SessionInformationTests.java
rename to core/src/test/java/org/springframework/security/concurrent/SessionInformationTests.java
index 5bde73b6b9..d2a1d685b0 100644
--- a/core/src/test/java/org/acegisecurity/concurrent/SessionInformationTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/SessionInformationTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.concurrent;
+package org.springframework.security.concurrent;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/concurrent/SessionRegistryImplMultithreadedTests.java b/core/src/test/java/org/springframework/security/concurrent/SessionRegistryImplMultithreadedTests.java
similarity index 99%
rename from core/src/test/java/org/acegisecurity/concurrent/SessionRegistryImplMultithreadedTests.java
rename to core/src/test/java/org/springframework/security/concurrent/SessionRegistryImplMultithreadedTests.java
index b228e80cf1..5ab112d01b 100644
--- a/core/src/test/java/org/acegisecurity/concurrent/SessionRegistryImplMultithreadedTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/SessionRegistryImplMultithreadedTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.concurrent;
+package org.springframework.security.concurrent;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/concurrent/SessionRegistryImplTests.java b/core/src/test/java/org/springframework/security/concurrent/SessionRegistryImplTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/concurrent/SessionRegistryImplTests.java
rename to core/src/test/java/org/springframework/security/concurrent/SessionRegistryImplTests.java
index 2e24195ed9..6766b2b8e5 100644
--- a/core/src/test/java/org/acegisecurity/concurrent/SessionRegistryImplTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/SessionRegistryImplTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.concurrent;
+package org.springframework.security.concurrent;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ui.session.HttpSessionDestroyedEvent;
+import org.springframework.security.ui.session.HttpSessionDestroyedEvent;
 
 import org.springframework.mock.web.MockHttpSession;
 
diff --git a/core/src/test/java/org/acegisecurity/context/HttpSessionContextIntegrationFilterTests.java b/core/src/test/java/org/springframework/security/context/HttpSessionContextIntegrationFilterTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/context/HttpSessionContextIntegrationFilterTests.java
rename to core/src/test/java/org/springframework/security/context/HttpSessionContextIntegrationFilterTests.java
index bc9f398c6e..93b90c315c 100644
--- a/core/src/test/java/org/acegisecurity/context/HttpSessionContextIntegrationFilterTests.java
+++ b/core/src/test/java/org/springframework/security/context/HttpSessionContextIntegrationFilterTests.java
@@ -13,17 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.context;
+package org.springframework.security.context;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.MockFilterConfig;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.MockFilterConfig;
 
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
-import org.jmock.Mock;
+import org.springframework.security.adapters.PrincipalAcegiUserToken;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/context/SecurityContextHolderTests.java b/core/src/test/java/org/springframework/security/context/SecurityContextHolderTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/context/SecurityContextHolderTests.java
rename to core/src/test/java/org/springframework/security/context/SecurityContextHolderTests.java
index c069c385e0..41b99c7e2b 100644
--- a/core/src/test/java/org/acegisecurity/context/SecurityContextHolderTests.java
+++ b/core/src/test/java/org/springframework/security/context/SecurityContextHolderTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.context;
+package org.springframework.security.context;
 
 import junit.framework.ComparisonFailure;
 import junit.framework.TestCase;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.Random;
 
@@ -244,7 +244,7 @@ public class SecurityContextHolderTests extends TestCase {
     public void testSynchronizationCustomStrategyLoading() {
         SecurityContextHolder.setStrategyName(InheritableThreadLocalSecurityContextHolderStrategy.class.getName());
         assertTrue(new SecurityContextHolder().toString()
-                                              .lastIndexOf("SecurityContextHolder[strategy='org.acegisecurity.context.InheritableThreadLocalSecurityContextHolderStrategy'") != -1);
+                                              .lastIndexOf("SecurityContextHolder[strategy='org.springframework.security.context.InheritableThreadLocalSecurityContextHolderStrategy'") != -1);
         loadStartAndWaitForThreads(true, "Main_", NUM_THREADS, false, true);
         assertEquals("Thread errors detected; review log output for details", 0, errors);
     }
diff --git a/core/src/test/java/org/acegisecurity/context/SecurityContextImplTests.java b/core/src/test/java/org/springframework/security/context/SecurityContextImplTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/context/SecurityContextImplTests.java
rename to core/src/test/java/org/springframework/security/context/SecurityContextImplTests.java
index 6c004e6a94..626535e90c 100644
--- a/core/src/test/java/org/acegisecurity/context/SecurityContextImplTests.java
+++ b/core/src/test/java/org/springframework/security/context/SecurityContextImplTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.context;
+package org.springframework.security.context;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
+import org.springframework.security.Authentication;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java b/core/src/test/java/org/springframework/security/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
rename to core/src/test/java/org/springframework/security/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
index 51ccb7f41e..0b7d2e2646 100644
--- a/core/src/test/java/org/acegisecurity/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/context/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.context.httpinvoker;
+package org.springframework.security.context.httpinvoker;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
+import org.springframework.security.Authentication;
 
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.context.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.context.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java b/core/src/test/java/org/springframework/security/context/rmi/ContextPropagatingRemoteInvocationTests.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java
rename to core/src/test/java/org/springframework/security/context/rmi/ContextPropagatingRemoteInvocationTests.java
index cad5eaaceb..322795d63e 100644
--- a/core/src/test/java/org/acegisecurity/context/rmi/ContextPropagatingRemoteInvocationTests.java
+++ b/core/src/test/java/org/springframework/security/context/rmi/ContextPropagatingRemoteInvocationTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.context.rmi;
+package org.springframework.security.context.rmi;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.TargetObject;
+import org.springframework.security.Authentication;
+import org.springframework.security.TargetObject;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -100,7 +100,7 @@ public class ContextPropagatingRemoteInvocationTests extends TestCase {
 
         // The result from invoking the TargetObject should contain the
         // Authentication class delivered via the SecurityContextHolder
-        assertEquals("some_string org.acegisecurity.providers.UsernamePasswordAuthenticationToken false",
+        assertEquals("some_string org.springframework.security.providers.UsernamePasswordAuthenticationToken false",
             remoteInvocation.invoke(new TargetObject()));
     }
 
diff --git a/core/src/test/java/org/acegisecurity/event/authentication/AuthenticationEventTests.java b/core/src/test/java/org/springframework/security/event/authentication/AuthenticationEventTests.java
similarity index 90%
rename from core/src/test/java/org/acegisecurity/event/authentication/AuthenticationEventTests.java
rename to core/src/test/java/org/springframework/security/event/authentication/AuthenticationEventTests.java
index cd11c15b66..47ed47bac9 100644
--- a/core/src/test/java/org/acegisecurity/event/authentication/AuthenticationEventTests.java
+++ b/core/src/test/java/org/springframework/security/event/authentication/AuthenticationEventTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.event.authentication;
+package org.springframework.security.event.authentication;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.DisabledException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.DisabledException;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/event/authentication/LoggerListenerTests.java b/core/src/test/java/org/springframework/security/event/authentication/LoggerListenerTests.java
similarity index 87%
rename from core/src/test/java/org/acegisecurity/event/authentication/LoggerListenerTests.java
rename to core/src/test/java/org/springframework/security/event/authentication/LoggerListenerTests.java
index f2b0744a39..4788b8e5e9 100644
--- a/core/src/test/java/org/acegisecurity/event/authentication/LoggerListenerTests.java
+++ b/core/src/test/java/org/springframework/security/event/authentication/LoggerListenerTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.event.authentication;
+package org.springframework.security.event.authentication;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.LockedException;
+import org.springframework.security.Authentication;
+import org.springframework.security.LockedException;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEventTests.java b/core/src/test/java/org/springframework/security/event/authorization/AuthenticationCredentialsNotFoundEventTests.java
similarity index 90%
rename from core/src/test/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEventTests.java
rename to core/src/test/java/org/springframework/security/event/authorization/AuthenticationCredentialsNotFoundEventTests.java
index be388ac8e3..4215b040ed 100644
--- a/core/src/test/java/org/acegisecurity/event/authorization/AuthenticationCredentialsNotFoundEventTests.java
+++ b/core/src/test/java/org/springframework/security/event/authorization/AuthenticationCredentialsNotFoundEventTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.event.authorization;
+package org.springframework.security.event.authorization;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AuthenticationCredentialsNotFoundException;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.AuthenticationCredentialsNotFoundException;
+import org.springframework.security.ConfigAttributeDefinition;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/event/authorization/AuthorizationFailureEventTests.java b/core/src/test/java/org/springframework/security/event/authorization/AuthorizationFailureEventTests.java
similarity index 87%
rename from core/src/test/java/org/acegisecurity/event/authorization/AuthorizationFailureEventTests.java
rename to core/src/test/java/org/springframework/security/event/authorization/AuthorizationFailureEventTests.java
index 1194dca494..0123502755 100644
--- a/core/src/test/java/org/acegisecurity/event/authorization/AuthorizationFailureEventTests.java
+++ b/core/src/test/java/org/springframework/security/event/authorization/AuthorizationFailureEventTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.event.authorization;
+package org.springframework.security.event.authorization;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.ConfigAttributeDefinition;
 
-import org.acegisecurity.event.authorization.AuthorizationFailureEvent;
+import org.springframework.security.event.authorization.AuthorizationFailureEvent;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/event/authorization/AuthorizedEventTests.java b/core/src/test/java/org/springframework/security/event/authorization/AuthorizedEventTests.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/event/authorization/AuthorizedEventTests.java
rename to core/src/test/java/org/springframework/security/event/authorization/AuthorizedEventTests.java
index 23598cb85f..ea8e6a60bb 100644
--- a/core/src/test/java/org/acegisecurity/event/authorization/AuthorizedEventTests.java
+++ b/core/src/test/java/org/springframework/security/event/authorization/AuthorizedEventTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.event.authorization;
+package org.springframework.security.event.authorization;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.ConfigAttributeDefinition;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/intercept/AbstractSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/intercept/AbstractSecurityInterceptorTests.java
similarity index 90%
rename from core/src/test/java/org/acegisecurity/intercept/AbstractSecurityInterceptorTests.java
rename to core/src/test/java/org/springframework/security/intercept/AbstractSecurityInterceptorTests.java
index 94c49a940d..901ee85bec 100644
--- a/core/src/test/java/org/acegisecurity/intercept/AbstractSecurityInterceptorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/AbstractSecurityInterceptorTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept;
+package org.springframework.security.intercept;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.MockAccessDecisionManager;
-import org.acegisecurity.MockAfterInvocationManager;
-import org.acegisecurity.MockAuthenticationManager;
-import org.acegisecurity.MockRunAsManager;
+import org.springframework.security.MockAccessDecisionManager;
+import org.springframework.security.MockAfterInvocationManager;
+import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.MockRunAsManager;
 
-import org.acegisecurity.intercept.method.MockMethodDefinitionSource;
+import org.springframework.security.intercept.method.MockMethodDefinitionSource;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/intercept/InterceptorStatusTokenTests.java b/core/src/test/java/org/springframework/security/intercept/InterceptorStatusTokenTests.java
similarity index 88%
rename from core/src/test/java/org/acegisecurity/intercept/InterceptorStatusTokenTests.java
rename to core/src/test/java/org/springframework/security/intercept/InterceptorStatusTokenTests.java
index df1f63c9f8..7547cc26d8 100644
--- a/core/src/test/java/org/acegisecurity/intercept/InterceptorStatusTokenTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/InterceptorStatusTokenTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept;
+package org.springframework.security.intercept;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSourceTests.java b/core/src/test/java/org/springframework/security/intercept/method/AbstractMethodDefinitionSourceTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSourceTests.java
rename to core/src/test/java/org/springframework/security/intercept/method/AbstractMethodDefinitionSourceTests.java
index 9565ef03c0..f4635d6b14 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/AbstractMethodDefinitionSourceTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/AbstractMethodDefinitionSourceTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.method;
+package org.springframework.security.intercept.method;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 import org.aopalliance.intercept.MethodInvocation;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionAttributesTests.java b/core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionAttributesTests.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionAttributesTests.java
rename to core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionAttributesTests.java
index 79f44787bf..e8c91db1e9 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionAttributesTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionAttributesTests.java
@@ -13,26 +13,26 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.method;
+package org.springframework.security.intercept.method;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.ITargetObject;
-import org.acegisecurity.OtherTargetObject;
-import org.acegisecurity.SecurityConfig;
-import org.acegisecurity.TargetObject;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.ITargetObject;
+import org.springframework.security.OtherTargetObject;
+import org.springframework.security.SecurityConfig;
+import org.springframework.security.TargetObject;
 
-import org.acegisecurity.acl.basic.SomeDomain;
+import org.springframework.security.acl.basic.SomeDomain;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.util.SimpleMethodInvocation;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -87,7 +87,7 @@ public class MethodDefinitionAttributesTests extends TestCase {
 
     private ITargetObject makeInterceptedTarget() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "org/acegisecurity/intercept/method/applicationContext.xml");
+                "org/springframework/security/intercept/method/applicationContext.xml");
 
         return (ITargetObject) context.getBean("target");
     }
@@ -187,7 +187,7 @@ public class MethodDefinitionAttributesTests extends TestCase {
 
         ITargetObject target = makeInterceptedTarget();
         String result = target.makeUpperCase("hello");
-        assertEquals("HELLO org.acegisecurity.MockRunAsAuthenticationToken true", result);
+        assertEquals("HELLO org.springframework.security.MockRunAsAuthenticationToken true", result);
     }
 
     public void testMethodCallWithoutRunAsReplacement()
@@ -199,7 +199,7 @@ public class MethodDefinitionAttributesTests extends TestCase {
         ITargetObject target = makeInterceptedTarget();
         String result = target.makeLowerCase("HELLO");
 
-        assertEquals("hello org.acegisecurity.providers.UsernamePasswordAuthenticationToken true", result);
+        assertEquals("hello org.springframework.security.providers.UsernamePasswordAuthenticationToken true", result);
     }
 
     public void testNullReturnedIfZeroAttributesDefinedForMethodInvocation()
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditorTests.java b/core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditorTests.java
similarity index 84%
rename from core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditorTests.java
rename to core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditorTests.java
index af1e02c7b2..076482f740 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/MethodDefinitionSourceEditorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditorTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.method;
+package org.springframework.security.intercept.method;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockJoinPoint;
-import org.acegisecurity.SecurityConfig;
-import org.acegisecurity.TargetObject;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockJoinPoint;
+import org.springframework.security.SecurityConfig;
+import org.springframework.security.TargetObject;
 
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -40,7 +40,6 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
     //~ Constructors ===================================================================================================
 
     public MethodDefinitionSourceEditorTests() {
-        super();
     }
 
     public MethodDefinitionSourceEditorTests(String arg0) {
@@ -49,17 +48,13 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
 
     //~ Methods ========================================================================================================
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(MethodDefinitionSourceEditorTests.class);
-    }
-
     public final void setUp() throws Exception {
         super.setUp();
     }
 
     public void testAspectJJointPointLookup() throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
-        editor.setAsText("org.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
+        editor.setAsText("org.springframework.security.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
 
@@ -80,7 +75,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
 
         try {
-            editor.setAsText("org.acegisecurity.DOES_NOT_EXIST_NAME=FOO,BAR");
+            editor.setAsText("org.springframework.security.DOES_NOT_EXIST_NAME=FOO,BAR");
             fail("Should have given IllegalArgumentException");
         } catch (IllegalArgumentException expected) {
             assertTrue(true);
@@ -102,7 +97,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
 
         try {
-            editor.setAsText("org.acegisecurity.TargetObject.INVALID_METHOD=FOO,BAR");
+            editor.setAsText("org.springframework.security.TargetObject.INVALID_METHOD=FOO,BAR");
             fail("Should have given IllegalArgumentException");
         } catch (IllegalArgumentException expected) {
             assertTrue(true);
@@ -113,7 +108,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
         throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "org.acegisecurity.ITargetObject.makeLower*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.ITargetObject.makeUpper*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.TargetObject.makeUpper*=ROLE_FROM_IMPLEMENTATION");
+            "org.springframework.security.ITargetObject.makeLower*=ROLE_FROM_INTERFACE\r\norg.springframework.security.ITargetObject.makeUpper*=ROLE_FROM_INTERFACE\r\norg.springframework.security.TargetObject.makeUpper*=ROLE_FROM_IMPLEMENTATION");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         assertEquals(3, map.getMethodMapSize());
@@ -143,7 +138,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
     public void testIterator() {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "org.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY\r\norg.acegisecurity.TargetObject.make*=ROLE_NINE,ROLE_SUPERVISOR");
+            "org.springframework.security.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY\r\norg.springframework.security.TargetObject.make*=ROLE_NINE,ROLE_SUPERVISOR");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         Iterator iter = map.getConfigAttributeDefinitions();
@@ -160,17 +155,16 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
     public void testMultiMethodParsing() {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "org.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY\r\norg.acegisecurity.TargetObject.make*=ROLE_NINE,ROLE_SUPERVISOR");
+            "org.springframework.security.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY\r\norg.springframework.security.TargetObject.make*=ROLE_NINE,ROLE_SUPERVISOR");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         assertEquals(3, map.getMethodMapSize());
     }
 
-    public void testMultiMethodParsingWhereLaterMethodsOverrideEarlierMethods()
-        throws Exception {
+    public void testMultiMethodParsingWhereLaterMethodsOverrideEarlierMethods() throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
         editor.setAsText(
-            "org.acegisecurity.TargetObject.*=ROLE_GENERAL\r\norg.acegisecurity.TargetObject.makeLower*=ROLE_LOWER\r\norg.acegisecurity.TargetObject.make*=ROLE_MAKE\r\norg.acegisecurity.TargetObject.makeUpper*=ROLE_UPPER");
+            "org.springframework.security.TargetObject.*=ROLE_GENERAL\r\norg.springframework.security.TargetObject.makeLower*=ROLE_LOWER\r\norg.springframework.security.TargetObject.make*=ROLE_MAKE\r\norg.springframework.security.TargetObject.makeUpper*=ROLE_UPPER");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         assertEquals(5, map.getMethodMapSize());
@@ -194,10 +188,9 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
         assertEquals(expectedCountLength, returnedCountLength);
     }
 
-    public void testNullIsReturnedByMethodDefinitionSourceWhenMethodInvocationNotDefined()
-        throws Exception {
+    public void testNullIsReturnedByMethodDefinitionSourceWhenMethodInvocationNotDefined() throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
-        editor.setAsText("org.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
+        editor.setAsText("org.springframework.security.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
 
@@ -216,7 +209,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
 
     public void testSingleMethodParsing() throws Exception {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
-        editor.setAsText("org.acegisecurity.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
+        editor.setAsText("org.springframework.security.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
 
@@ -234,10 +227,6 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
     private class MockMethodInvocation implements MethodInvocation {
         Method method;
 
-        private MockMethodInvocation() {
-            super();
-        }
-
         public MockMethodInvocation(Class clazz, String methodName, Class[] parameterTypes)
             throws NoSuchMethodException {
             method = clazz.getMethod(methodName, parameterTypes);
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java b/core/src/test/java/org/springframework/security/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
similarity index 86%
rename from core/src/test/java/org/acegisecurity/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
rename to core/src/test/java/org/springframework/security/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
index 7ba9ef04a6..a9ee9fdd12 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.method;
+package org.springframework.security.intercept.method;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.ITargetObject;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.ITargetObject;
 
-import org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor;
+import org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.util.MethodInvocationUtils;
+import org.springframework.security.util.MethodInvocationUtils;
 
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -34,7 +34,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 
 /**
- * Tests {@link org.acegisecurity.intercept.method.MethodInvocationPrivilegeEvaluator}.
+ * Tests {@link org.springframework.security.intercept.method.MethodInvocationPrivilegeEvaluator}.
  *
  * @author Ben Alex
  * @version $Id$
@@ -54,7 +54,7 @@ public class MethodInvocationPrivilegeEvaluatorTests extends TestCase {
 
     private Object lookupTargetObject() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "org/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
+                "org/springframework/security/intercept/method/aopalliance/applicationContext.xml");
 
         return context.getBean("target");
     }
@@ -65,7 +65,7 @@ public class MethodInvocationPrivilegeEvaluatorTests extends TestCase {
 
     private MethodSecurityInterceptor makeSecurityInterceptor() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "org/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
+                "org/springframework/security/intercept/method/aopalliance/applicationContext.xml");
 
         return (MethodSecurityInterceptor) context.getBean("securityInterceptor");
     }
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/MockAttributes.java b/core/src/test/java/org/springframework/security/intercept/method/MockAttributes.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/intercept/method/MockAttributes.java
rename to core/src/test/java/org/springframework/security/intercept/method/MockAttributes.java
index 6b95df9bc9..9d776fadb9 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/MockAttributes.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/MockAttributes.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.method;
+package org.springframework.security.intercept.method;
 
-import org.acegisecurity.ITargetObject;
-import org.acegisecurity.OtherTargetObject;
-import org.acegisecurity.SecurityConfig;
-import org.acegisecurity.TargetObject;
+import org.springframework.security.ITargetObject;
+import org.springframework.security.OtherTargetObject;
+import org.springframework.security.SecurityConfig;
+import org.springframework.security.TargetObject;
 
 import org.springframework.metadata.Attributes;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/MockMethodDefinitionSource.java b/core/src/test/java/org/springframework/security/intercept/method/MockMethodDefinitionSource.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/intercept/method/MockMethodDefinitionSource.java
rename to core/src/test/java/org/springframework/security/intercept/method/MockMethodDefinitionSource.java
index 4553e03c2f..e7c75cf308 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/MockMethodDefinitionSource.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/MockMethodDefinitionSource.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.method;
+package org.springframework.security.intercept.method;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.SecurityConfig;
 
 import java.lang.reflect.Method;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisorTests.java b/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodDefinitionSourceAdvisorTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisorTests.java
rename to core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodDefinitionSourceAdvisorTests.java
index 5d61882747..a16e3aeb59 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodDefinitionSourceAdvisorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodDefinitionSourceAdvisorTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.method.aopalliance;
+package org.springframework.security.intercept.method.aopalliance;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.TargetObject;
+import org.springframework.security.TargetObject;
 
-import org.acegisecurity.intercept.method.MethodDefinitionMap;
-import org.acegisecurity.intercept.method.MethodDefinitionSourceEditor;
+import org.springframework.security.intercept.method.MethodDefinitionMap;
+import org.springframework.security.intercept.method.MethodDefinitionSourceEditor;
 
 import org.springframework.aop.framework.AopConfigException;
 
@@ -48,7 +48,7 @@ public class MethodDefinitionSourceAdvisorTests extends TestCase {
 
     private MethodSecurityInterceptor getInterceptor() {
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
-        editor.setAsText("org.acegisecurity.TargetObject.countLength=ROLE_NOT_USED");
+        editor.setAsText("org.springframework.security.TargetObject.countLength=ROLE_NOT_USED");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
similarity index 90%
rename from core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
rename to core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
index 0b4cec31bb..465f95338e 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
@@ -13,35 +13,35 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.method.aopalliance;
+package org.springframework.security.intercept.method.aopalliance;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDecisionManager;
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.AfterInvocationManager;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationCredentialsNotFoundException;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.ITargetObject;
-import org.acegisecurity.MockAccessDecisionManager;
-import org.acegisecurity.MockAfterInvocationManager;
-import org.acegisecurity.MockAuthenticationManager;
-import org.acegisecurity.MockRunAsManager;
-import org.acegisecurity.RunAsManager;
+import org.springframework.security.AccessDecisionManager;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.AfterInvocationManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationCredentialsNotFoundException;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.ITargetObject;
+import org.springframework.security.MockAccessDecisionManager;
+import org.springframework.security.MockAfterInvocationManager;
+import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.MockRunAsManager;
+import org.springframework.security.RunAsManager;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.intercept.method.AbstractMethodDefinitionSource;
-import org.acegisecurity.intercept.method.MockMethodDefinitionSource;
+import org.springframework.security.intercept.method.AbstractMethodDefinitionSource;
+import org.springframework.security.intercept.method.MockMethodDefinitionSource;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.runas.RunAsManagerImpl;
+import org.springframework.security.runas.RunAsManagerImpl;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -82,14 +82,14 @@ public class MethodSecurityInterceptorTests extends TestCase {
 
     private ITargetObject makeInterceptedTarget() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "org/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
+                "org/springframework/security/intercept/method/aopalliance/applicationContext.xml");
 
         return (ITargetObject) context.getBean("target");
     }
 
     private ITargetObject makeInterceptedTargetRejectsAuthentication() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "org/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
+                "org/springframework/security/intercept/method/aopalliance/applicationContext.xml");
 
         MockAuthenticationManager authenticationManager = new MockAuthenticationManager(false);
         MethodSecurityInterceptor si = (MethodSecurityInterceptor) context.getBean("securityInterceptor");
@@ -100,7 +100,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
 
     private ITargetObject makeInterceptedTargetWithoutAnAfterInvocationManager() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "org/acegisecurity/intercept/method/aopalliance/applicationContext.xml");
+                "org/springframework/security/intercept/method/aopalliance/applicationContext.xml");
 
         MethodSecurityInterceptor si = (MethodSecurityInterceptor) context.getBean("securityInterceptor");
         si.setAfterInvocationManager(null);
@@ -124,7 +124,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
         // The associated MockAuthenticationManager WILL accept the above UsernamePasswordAuthenticationToken
         ITargetObject target = makeInterceptedTarget();
         String result = target.publicMakeLowerCase("HELLO");
-        assertEquals("hello org.acegisecurity.providers.UsernamePasswordAuthenticationToken false", result);
+        assertEquals("hello org.springframework.security.providers.UsernamePasswordAuthenticationToken false", result);
     }
 
     public void testDeniesWhenAppropriate() throws Exception {
@@ -170,7 +170,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
 
         ITargetObject target = makeInterceptedTarget();
         String result = target.makeUpperCase("hello");
-        assertEquals("HELLO org.acegisecurity.MockRunAsAuthenticationToken true", result);
+        assertEquals("HELLO org.springframework.security.MockRunAsAuthenticationToken true", result);
     }
 
     public void testMethodCallWithoutRunAsReplacement()
@@ -184,7 +184,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
         String result = target.makeLowerCase("HELLO");
 
         // Note we check the isAuthenticated remained true in following line
-        assertEquals("hello org.acegisecurity.providers.UsernamePasswordAuthenticationToken true", result);
+        assertEquals("hello org.springframework.security.providers.UsernamePasswordAuthenticationToken true", result);
     }
 
     public void testRejectionOfEmptySecurityContext() throws Exception {
diff --git a/core/src/test/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
similarity index 81%
rename from core/src/test/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
rename to core/src/test/java/org/springframework/security/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
index 0a4d379071..bafdc1c5e8 100644
--- a/core/src/test/java/org/acegisecurity/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
@@ -13,26 +13,26 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.method.aspectj;
+package org.springframework.security.intercept.method.aspectj;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.MockAccessDecisionManager;
-import org.acegisecurity.MockApplicationContext;
-import org.acegisecurity.MockAuthenticationManager;
-import org.acegisecurity.MockJoinPoint;
-import org.acegisecurity.MockRunAsManager;
-import org.acegisecurity.TargetObject;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.MockAccessDecisionManager;
+import org.springframework.security.MockApplicationContext;
+import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.MockJoinPoint;
+import org.springframework.security.MockRunAsManager;
+import org.springframework.security.TargetObject;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.intercept.method.MethodDefinitionMap;
-import org.acegisecurity.intercept.method.MethodDefinitionSourceEditor;
+import org.springframework.security.intercept.method.MethodDefinitionMap;
+import org.springframework.security.intercept.method.MethodDefinitionSourceEditor;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import java.lang.reflect.Method;
 
@@ -62,7 +62,7 @@ public class AspectJSecurityInterceptorTests extends TestCase {
     protected void tearDown() throws Exception {
         super.tearDown();
         SecurityContextHolder.clearContext();
-    }    
+    }
 
     public void testCallbackIsInvokedWhenPermissionGranted()
         throws Exception {
@@ -73,7 +73,7 @@ public class AspectJSecurityInterceptorTests extends TestCase {
         si.setRunAsManager(new MockRunAsManager());
 
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
-        editor.setAsText("org.acegisecurity.TargetObject.countLength=MOCK_ONE,MOCK_TWO");
+        editor.setAsText("org.springframework.security.TargetObject.countLength=MOCK_ONE,MOCK_TWO");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         si.setObjectDefinitionSource(map);
@@ -105,7 +105,7 @@ public class AspectJSecurityInterceptorTests extends TestCase {
         si.setRunAsManager(new MockRunAsManager());
 
         MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
-        editor.setAsText("org.acegisecurity.TargetObject.countLength=MOCK_ONE,MOCK_TWO");
+        editor.setAsText("org.springframework.security.TargetObject.countLength=MOCK_ONE,MOCK_TWO");
 
         MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
         si.setObjectDefinitionSource(map);
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java b/core/src/test/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
rename to core/src/test/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
index 8e6a9d48e4..4f3408fb20 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/AbstractFilterInvocationDefinitionSourceTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionDecoratorTest.java b/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionDecoratorTest.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionDecoratorTest.java
rename to core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionDecoratorTest.java
index 43aeedf28c..5a6770e1bc 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionDecoratorTest.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionDecoratorTest.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.SecurityConfig;
 
 import junit.framework.TestCase;
 
 /**
  * Test for {@link FilterInvocationDefinitionDecorator}
- * 
+ *
  * @author Carlos Sanchez
  * @version $Id$
  */
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorTests.java b/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
rename to core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
index af154e4bc5..8413320b49 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockFilterChain;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockFilterChain;
+import org.springframework.security.SecurityConfig;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorWithPathsTests.java b/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorWithPathsTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorWithPathsTests.java
rename to core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorWithPathsTests.java
index dcf9e27514..b91c93d459 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationDefinitionSourceEditorWithPathsTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorWithPathsTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockFilterChain;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockFilterChain;
+import org.springframework.security.SecurityConfig;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationTests.java b/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationTests.java
rename to core/src/test/java/org/springframework/security/intercept/web/FilterInvocationTests.java
index aff4287d45..02a4160bbc 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/FilterInvocationTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/FilterInvocationTests.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
-import org.acegisecurity.MockFilterChain;
+import org.springframework.security.MockFilterChain;
 
 import org.jmock.MockObjectTestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/FilterSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/intercept/web/FilterSecurityInterceptorTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/intercept/web/FilterSecurityInterceptorTests.java
rename to core/src/test/java/org/springframework/security/intercept/web/FilterSecurityInterceptorTests.java
index 0711ad94ce..daff155cff 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/FilterSecurityInterceptorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/FilterSecurityInterceptorTests.java
@@ -13,25 +13,25 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDecisionManager;
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.MockAccessDecisionManager;
-import org.acegisecurity.MockApplicationContext;
-import org.acegisecurity.MockAuthenticationManager;
-import org.acegisecurity.MockRunAsManager;
-import org.acegisecurity.RunAsManager;
-import org.acegisecurity.SecurityConfig;
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.AccessDecisionManager;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.MockAccessDecisionManager;
+import org.springframework.security.MockApplicationContext;
+import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.MockRunAsManager;
+import org.springframework.security.RunAsManager;
+import org.springframework.security.SecurityConfig;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
@@ -101,7 +101,7 @@ public class FilterSecurityInterceptorTests extends TestCase {
             interceptor.afterPropertiesSet();
             fail("Should have thrown IllegalArgumentException");
         } catch (IllegalArgumentException expected) {
-            assertEquals("AccessDecisionManager does not support secure object class: class org.acegisecurity.intercept.web.FilterInvocation",
+            assertEquals("AccessDecisionManager does not support secure object class: class org.springframework.security.intercept.web.FilterInvocation",
                 expected.getMessage());
         }
     }
@@ -132,7 +132,7 @@ public class FilterSecurityInterceptorTests extends TestCase {
             interceptor.afterPropertiesSet();
             fail("Should have thrown IllegalArgumentException");
         } catch (IllegalArgumentException expected) {
-            assertEquals("RunAsManager does not support secure object class: class org.acegisecurity.intercept.web.FilterInvocation",
+            assertEquals("RunAsManager does not support secure object class: class org.springframework.security.intercept.web.FilterInvocation",
                 expected.getMessage());
         }
     }
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/MockFilterInvocationDefinition.java b/core/src/test/java/org/springframework/security/intercept/web/MockFilterInvocationDefinition.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/intercept/web/MockFilterInvocationDefinition.java
rename to core/src/test/java/org/springframework/security/intercept/web/MockFilterInvocationDefinition.java
index 40449ecdc8..bbbfc3673a 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/MockFilterInvocationDefinition.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/MockFilterInvocationDefinition.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.ConfigAttributeDefinition;
 
 /**
  * Mock for {@link FilterInvocationDefinitionMap}
- * 
+ *
  * @author Carlos Sanchez
  * @version $Id: MockFilterInvocationDefinitionSource.java 1496 2006-05-23
  *          13:38:33Z benalex $
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/MockFilterInvocationDefinitionSource.java b/core/src/test/java/org/springframework/security/intercept/web/MockFilterInvocationDefinitionSource.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/intercept/web/MockFilterInvocationDefinitionSource.java
rename to core/src/test/java/org/springframework/security/intercept/web/MockFilterInvocationDefinitionSource.java
index 0aac36a9b7..f2b32813f5 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/MockFilterInvocationDefinitionSource.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/MockFilterInvocationDefinitionSource.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.SecurityConfig;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/PathBasedFilterDefinitionMapTests.java b/core/src/test/java/org/springframework/security/intercept/web/PathBasedFilterDefinitionMapTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/intercept/web/PathBasedFilterDefinitionMapTests.java
rename to core/src/test/java/org/springframework/security/intercept/web/PathBasedFilterDefinitionMapTests.java
index af30f6f08e..4f9df9a942 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/PathBasedFilterDefinitionMapTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/PathBasedFilterDefinitionMapTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockFilterChain;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockFilterChain;
+import org.springframework.security.SecurityConfig;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/RegExpBasedFilterDefinitionMapTests.java b/core/src/test/java/org/springframework/security/intercept/web/RegExpBasedFilterDefinitionMapTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/intercept/web/RegExpBasedFilterDefinitionMapTests.java
rename to core/src/test/java/org/springframework/security/intercept/web/RegExpBasedFilterDefinitionMapTests.java
index 507d3f9835..dcfafaf8c0 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/RegExpBasedFilterDefinitionMapTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/RegExpBasedFilterDefinitionMapTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockFilterChain;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockFilterChain;
+import org.springframework.security.SecurityConfig;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/intercept/web/WebInvocationPrivilegeEvaluatorTests.java b/core/src/test/java/org/springframework/security/intercept/web/WebInvocationPrivilegeEvaluatorTests.java
similarity index 88%
rename from core/src/test/java/org/acegisecurity/intercept/web/WebInvocationPrivilegeEvaluatorTests.java
rename to core/src/test/java/org/springframework/security/intercept/web/WebInvocationPrivilegeEvaluatorTests.java
index 7365b8d9d9..376638b2f7 100644
--- a/core/src/test/java/org/acegisecurity/intercept/web/WebInvocationPrivilegeEvaluatorTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/web/WebInvocationPrivilegeEvaluatorTests.java
@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.intercept.web;
+package org.springframework.security.intercept.web;
 
 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.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.util.FilterInvocationUtils;
+import org.springframework.security.util.FilterInvocationUtils;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 
 /**
- * Tests {@link org.acegisecurity.intercept.web.WebInvocationPrivilegeEvaluator}.
+ * Tests {@link org.springframework.security.intercept.web.WebInvocationPrivilegeEvaluator}.
  *
  * @author Ben Alex
  * @version $Id$
@@ -53,7 +53,7 @@ public class WebInvocationPrivilegeEvaluatorTests extends TestCase {
 
     private FilterSecurityInterceptor makeFilterSecurityInterceptor() {
         ApplicationContext context = new ClassPathXmlApplicationContext(
-                "org/acegisecurity/intercept/web/applicationContext.xml");
+                "org/springframework/security/intercept/web/applicationContext.xml");
 
         return (FilterSecurityInterceptor) context.getBean("securityInterceptor");
     }
diff --git a/core/src/test/java/org/acegisecurity/ldap/AbstractLdapIntegrationTests.java b/core/src/test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java
similarity index 85%
rename from core/src/test/java/org/acegisecurity/ldap/AbstractLdapIntegrationTests.java
rename to core/src/test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java
index 7c6f7b4312..3f12d29eda 100644
--- a/core/src/test/java/org/acegisecurity/ldap/AbstractLdapIntegrationTests.java
+++ b/core/src/test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java
@@ -12,14 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ldap;
+package org.springframework.security.ldap;
 
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.core.io.ClassPathResource;
 
-import java.io.File;
-
 /**
  * Based on class borrowed from Spring Ldap project.
  *
@@ -36,14 +34,18 @@ public abstract class AbstractLdapIntegrationTests extends AbstractDependencyInj
     }
 
     protected String[] getConfigLocations() {
-        return new String[] {"/org/acegisecurity/ldap/ldapIntegrationTestContext.xml"};
+        return new String[] {"/org/springframework/security/ldap/ldapIntegrationTestContext.xml"};
     }
 
 
     protected void onSetUp() throws Exception {
         super.onSetUp();
 
-        ClassPathResource ldifs = new ClassPathResource("org/acegisecurity/ldap/setup_data.ldif");
+        ClassPathResource ldifs = new ClassPathResource("org/springframework/security/ldap/setup_data.ldif");
+
+        if (!ldifs.getFile().exists()) {
+            throw new IllegalStateException("Ldif file not found: " + ldifs.getFile().getAbsolutePath());
+        }
 
         ldapServerManager.cleanAndSetup(ldifs.getFile().getAbsolutePath());
     }
diff --git a/core/src/test/java/org/acegisecurity/ldap/ConfigEnvHelper.java b/core/src/test/java/org/springframework/security/ldap/ConfigEnvHelper.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/ldap/ConfigEnvHelper.java
rename to core/src/test/java/org/springframework/security/ldap/ConfigEnvHelper.java
index e9bba25746..fd0766d34f 100644
--- a/core/src/test/java/org/acegisecurity/ldap/ConfigEnvHelper.java
+++ b/core/src/test/java/org/springframework/security/ldap/ConfigEnvHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.ldap;
+package org.springframework.security.ldap;
 
 import java.io.File;
 import java.util.Hashtable;
diff --git a/core/src/test/java/org/acegisecurity/ldap/DefaultInitialDirContextFactoryTests.java b/core/src/test/java/org/springframework/security/ldap/DefaultInitialDirContextFactoryTests.java
similarity index 90%
rename from core/src/test/java/org/acegisecurity/ldap/DefaultInitialDirContextFactoryTests.java
rename to core/src/test/java/org/springframework/security/ldap/DefaultInitialDirContextFactoryTests.java
index cc87a4a9dd..895f8c15ea 100644
--- a/core/src/test/java/org/acegisecurity/ldap/DefaultInitialDirContextFactoryTests.java
+++ b/core/src/test/java/org/springframework/security/ldap/DefaultInitialDirContextFactoryTests.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ldap;
+package org.springframework.security.ldap;
 
-import org.acegisecurity.AcegiMessageSource;
-import org.acegisecurity.BadCredentialsException;
+import org.springframework.security.AcegiMessageSource;
+import org.springframework.security.BadCredentialsException;
 import org.springframework.ldap.UncategorizedLdapException;
 
 import java.util.Hashtable;
@@ -26,7 +26,7 @@ import javax.naming.directory.DirContext;
 
 
 /**
- * Tests {@link org.acegisecurity.ldap.DefaultInitialDirContextFactory}.
+ * Tests {@link org.springframework.security.ldap.DefaultInitialDirContextFactory}.
  *
  * @author Luke Taylor
  * @version $Id$
@@ -127,9 +127,9 @@ public class DefaultInitialDirContextFactoryTests extends AbstractLdapIntegratio
         assertNull(env.get(Context.SECURITY_CREDENTIALS));
 
         // Ctx factory.
-        idf.setInitialContextFactory("org.acegisecurity.NonExistentCtxFactory");
+        idf.setInitialContextFactory("org.springframework.security.NonExistentCtxFactory");
         env = idf.getEnvironment();
-        assertEquals("org.acegisecurity.NonExistentCtxFactory", env.get(Context.INITIAL_CONTEXT_FACTORY));
+        assertEquals("org.springframework.security.NonExistentCtxFactory", env.get(Context.INITIAL_CONTEXT_FACTORY));
 
         // Auth type
         idf.setAuthenticationType("myauthtype");
@@ -160,13 +160,13 @@ public class DefaultInitialDirContextFactoryTests extends AbstractLdapIntegratio
     }
 
     public void testMultipleProviderUrlsAreAccepted() {
-        idf = new DefaultInitialDirContextFactory("ldaps://acegisecurity.org/dc=acegisecurity,dc=org "
+        idf = new DefaultInitialDirContextFactory("ldaps://security.org/dc=acegisecurity,dc=org "
                 + "ldap://monkeymachine.co.uk/dc=acegisecurity,dc=org");
     }
 
     public void testMultipleProviderUrlsWithDifferentRootsAreRejected() {
         try {
-            idf = new DefaultInitialDirContextFactory("ldap://acegisecurity.org/dc=acegisecurity,dc=org "
+            idf = new DefaultInitialDirContextFactory("ldap://security.org/dc=acegisecurity,dc=org "
                     + "ldap://monkeymachine.co.uk/dc=someotherplace,dc=org");
             fail("Different root DNs should cause an exception");
         } catch (IllegalArgumentException expected) {}
@@ -180,7 +180,7 @@ public class DefaultInitialDirContextFactoryTests extends AbstractLdapIntegratio
 //    public void testNonLdapUrlIsRejected() throws Exception {
 //        DefaultInitialDirContextFactory idf = new DefaultInitialDirContextFactory();
 //
-//        idf.setUrl("http://acegisecurity.org/dc=acegisecurity,dc=org");
+//        idf.setUrl("http://security.org/dc=acegisecurity,dc=org");
 //        idf.setInitialContextFactory(CoreContextFactory.class.getName());
 //
 //        try {
diff --git a/core/src/test/java/org/acegisecurity/ldap/LdapServerManager.java b/core/src/test/java/org/springframework/security/ldap/LdapServerManager.java
similarity index 99%
rename from core/src/test/java/org/acegisecurity/ldap/LdapServerManager.java
rename to core/src/test/java/org/springframework/security/ldap/LdapServerManager.java
index aebd5b0c73..cfe59848cf 100644
--- a/core/src/test/java/org/acegisecurity/ldap/LdapServerManager.java
+++ b/core/src/test/java/org/springframework/security/ldap/LdapServerManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ldap;
+package org.springframework.security.ldap;
 
 import java.util.Properties;
 
diff --git a/core/src/test/java/org/acegisecurity/ldap/LdapUtilsTests.java b/core/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/ldap/LdapUtilsTests.java
rename to core/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java
index c4bfa2e964..c54b148710 100644
--- a/core/src/test/java/org/acegisecurity/ldap/LdapUtilsTests.java
+++ b/core/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ldap;
+package org.springframework.security.ldap;
 
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
diff --git a/core/src/test/java/org/acegisecurity/ldap/MockInitialDirContextFactory.java b/core/src/test/java/org/springframework/security/ldap/MockInitialDirContextFactory.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/ldap/MockInitialDirContextFactory.java
rename to core/src/test/java/org/springframework/security/ldap/MockInitialDirContextFactory.java
index 7715500487..944166dcf7 100644
--- a/core/src/test/java/org/acegisecurity/ldap/MockInitialDirContextFactory.java
+++ b/core/src/test/java/org/springframework/security/ldap/MockInitialDirContextFactory.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ldap;
+package org.springframework.security.ldap;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/core/src/test/java/org/acegisecurity/ldap/SpringSecurityLdapTemplateTests.java b/core/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/ldap/SpringSecurityLdapTemplateTests.java
rename to core/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java
index 02a595a67e..4aa514401e 100644
--- a/core/src/test/java/org/acegisecurity/ldap/SpringSecurityLdapTemplateTests.java
+++ b/core/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ldap;
+package org.springframework.security.ldap;
 
 import org.springframework.ldap.UncategorizedLdapException;
 import org.springframework.ldap.core.ContextExecutor;
diff --git a/core/src/test/java/org/acegisecurity/ldap/search/FilterBasedLdapUserSearchTests.java b/core/src/test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/ldap/search/FilterBasedLdapUserSearchTests.java
rename to core/src/test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java
index 24f253259d..6ff1230dd9 100644
--- a/core/src/test/java/org/acegisecurity/ldap/search/FilterBasedLdapUserSearchTests.java
+++ b/core/src/test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java
@@ -13,13 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ldap.search;
+package org.springframework.security.ldap.search;
 
-import org.acegisecurity.ldap.DefaultInitialDirContextFactory;
-import org.acegisecurity.ldap.AbstractLdapIntegrationTests;
+import org.springframework.security.ldap.DefaultInitialDirContextFactory;
+import org.springframework.security.ldap.AbstractLdapIntegrationTests;
 
-import org.acegisecurity.userdetails.UsernameNotFoundException;
-import org.acegisecurity.userdetails.ldap.LdapUserDetails;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.ldap.core.DirContextOperations;
diff --git a/core/src/test/java/org/acegisecurity/providers/AbstractAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/providers/AbstractAuthenticationTokenTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/providers/AbstractAuthenticationTokenTests.java
rename to core/src/test/java/org/springframework/security/providers/AbstractAuthenticationTokenTests.java
index 3d834ddb09..b5609dfdc4 100644
--- a/core/src/test/java/org/acegisecurity/providers/AbstractAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/providers/AbstractAuthenticationTokenTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers;
+package org.springframework.security.providers;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/ProviderManagerTests.java b/core/src/test/java/org/springframework/security/providers/ProviderManagerTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/providers/ProviderManagerTests.java
rename to core/src/test/java/org/springframework/security/providers/ProviderManagerTests.java
index 3fd943b57e..7c74da347a 100644
--- a/core/src/test/java/org/acegisecurity/providers/ProviderManagerTests.java
+++ b/core/src/test/java/org/springframework/security/providers/ProviderManagerTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers;
+package org.springframework.security.providers;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationServiceException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.AuthenticationServiceException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.concurrent.ConcurrentSessionControllerImpl;
-import org.acegisecurity.concurrent.NullConcurrentSessionController;
+import org.springframework.security.concurrent.ConcurrentSessionControllerImpl;
+import org.springframework.security.concurrent.NullConcurrentSessionController;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/TestingAuthenticationProviderTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/providers/TestingAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/providers/TestingAuthenticationProviderTests.java
index 142fe8b7eb..07c3e0a55e 100644
--- a/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/TestingAuthenticationProviderTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers;
+package org.springframework.security.providers;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/providers/TestingAuthenticationTokenTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/providers/TestingAuthenticationTokenTests.java
rename to core/src/test/java/org/springframework/security/providers/TestingAuthenticationTokenTests.java
index 8247b57a40..638121edab 100644
--- a/core/src/test/java/org/acegisecurity/providers/TestingAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/providers/TestingAuthenticationTokenTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers;
+package org.springframework.security.providers;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/providers/UsernamePasswordAuthenticationTokenTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java
rename to core/src/test/java/org/springframework/security/providers/UsernamePasswordAuthenticationTokenTests.java
index e1a315fe98..d43ffaf804 100644
--- a/core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/providers/UsernamePasswordAuthenticationTokenTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers;
+package org.springframework.security.providers;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationProviderTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationProviderTests.java
index d94a513b39..32a9207466 100644
--- a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationProviderTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.anonymous;
+package org.springframework.security.providers.anonymous;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationTokenTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationTokenTests.java
rename to core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationTokenTests.java
index 61b14cb7c2..76e457cc6c 100644
--- a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationTokenTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.anonymous;
+package org.springframework.security.providers.anonymous;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousProcessingFilterTests.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/providers/anonymous/AnonymousProcessingFilterTests.java
index 097823d501..9e55031071 100644
--- a/core/src/test/java/org/acegisecurity/providers/anonymous/AnonymousProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousProcessingFilterTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.anonymous;
+package org.springframework.security.providers.anonymous;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.MockFilterConfig;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.MockFilterConfig;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
-import org.acegisecurity.userdetails.memory.UserAttribute;
+import org.springframework.security.userdetails.memory.UserAttribute;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java
index 67b8f37adc..36f8cf9297 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/cas/CasAuthenticationProviderTests.java
@@ -13,24 +13,24 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.cas;
+package org.springframework.security.providers.cas;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.acegisecurity.providers.cas.ticketvalidator.AbstractTicketValidator;
+import org.springframework.security.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.cas.ticketvalidator.AbstractTicketValidator;
 
-import org.acegisecurity.ui.cas.CasProcessingFilter;
+import org.springframework.security.ui.cas.CasProcessingFilter;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationTokenTests.java
rename to core/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java
index 62dd821979..3f623a9ab0 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/CasAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/providers/cas/CasAuthenticationTokenTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.cas;
+package org.springframework.security.providers.cas;
 
 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.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/TicketResponseTests.java b/core/src/test/java/org/springframework/security/providers/cas/TicketResponseTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/providers/cas/TicketResponseTests.java
rename to core/src/test/java/org/springframework/security/providers/cas/TicketResponseTests.java
index 96beb43f6f..6f4016a096 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/TicketResponseTests.java
+++ b/core/src/test/java/org/springframework/security/providers/cas/TicketResponseTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.cas;
+package org.springframework.security.providers.cas;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCacheTests.java b/core/src/test/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCacheTests.java
similarity index 90%
rename from core/src/test/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCacheTests.java
rename to core/src/test/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCacheTests.java
index fe9e53260f..173ebaec18 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/cache/EhCacheBasedTicketCacheTests.java
+++ b/core/src/test/java/org/springframework/security/providers/cas/cache/EhCacheBasedTicketCacheTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.cas.cache;
+package org.springframework.security.providers.cas.cache;
 
 import junit.framework.TestCase;
 
 import net.sf.ehcache.Ehcache;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.MockApplicationContext;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.MockApplicationContext;
 
-import org.acegisecurity.providers.cas.CasAuthenticationToken;
+import org.springframework.security.providers.cas.CasAuthenticationToken;
 
-import org.acegisecurity.userdetails.User;
+import org.springframework.security.userdetails.User;
 
 import org.springframework.context.ApplicationContext;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java b/core/src/test/java/org/springframework/security/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java
rename to core/src/test/java/org/springframework/security/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java
index 1e47d837b6..11c33ff5a5 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java
+++ b/core/src/test/java/org/springframework/security/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.cas.populator;
+package org.springframework.security.providers.cas.populator;
 
 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.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataRetrievalFailureException;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxyTests.java b/core/src/test/java/org/springframework/security/providers/cas/proxy/AcceptAnyCasProxyTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxyTests.java
rename to core/src/test/java/org/springframework/security/providers/cas/proxy/AcceptAnyCasProxyTests.java
index 56753b15ce..b4b775a7fd 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/proxy/AcceptAnyCasProxyTests.java
+++ b/core/src/test/java/org/springframework/security/providers/cas/proxy/AcceptAnyCasProxyTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.cas.proxy;
+package org.springframework.security.providers.cas.proxy;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDeciderTests.java b/core/src/test/java/org/springframework/security/providers/cas/proxy/NamedCasProxyDeciderTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDeciderTests.java
rename to core/src/test/java/org/springframework/security/providers/cas/proxy/NamedCasProxyDeciderTests.java
index 657e699171..4b1abe5dd3 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/proxy/NamedCasProxyDeciderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/cas/proxy/NamedCasProxyDeciderTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.cas.proxy;
+package org.springframework.security.providers.cas.proxy;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.providers.cas.ProxyUntrustedException;
+import org.springframework.security.providers.cas.ProxyUntrustedException;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/proxy/RejectProxyTicketsTests.java b/core/src/test/java/org/springframework/security/providers/cas/proxy/RejectProxyTicketsTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/providers/cas/proxy/RejectProxyTicketsTests.java
rename to core/src/test/java/org/springframework/security/providers/cas/proxy/RejectProxyTicketsTests.java
index 5d82a825c6..b897255d8d 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/proxy/RejectProxyTicketsTests.java
+++ b/core/src/test/java/org/springframework/security/providers/cas/proxy/RejectProxyTicketsTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.cas.proxy;
+package org.springframework.security.providers.cas.proxy;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.providers.cas.ProxyUntrustedException;
+import org.springframework.security.providers.cas.ProxyUntrustedException;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidatorTests.java b/core/src/test/java/org/springframework/security/providers/cas/ticketvalidator/AbstractTicketValidatorTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidatorTests.java
rename to core/src/test/java/org/springframework/security/providers/cas/ticketvalidator/AbstractTicketValidatorTests.java
index 54edc1f5a1..0b365808b6 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/AbstractTicketValidatorTests.java
+++ b/core/src/test/java/org/springframework/security/providers/cas/ticketvalidator/AbstractTicketValidatorTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.cas.ticketvalidator;
+package org.springframework.security.providers.cas.ticketvalidator;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.BadCredentialsException;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.BadCredentialsException;
 
-import org.acegisecurity.providers.cas.TicketResponse;
+import org.springframework.security.providers.cas.TicketResponse;
 
-import org.acegisecurity.ui.cas.ServiceProperties;
+import org.springframework.security.ui.cas.ServiceProperties;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ClassPathResource;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidatorTests.java b/core/src/test/java/org/springframework/security/providers/cas/ticketvalidator/CasProxyTicketValidatorTests.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidatorTests.java
rename to core/src/test/java/org/springframework/security/providers/cas/ticketvalidator/CasProxyTicketValidatorTests.java
index ee954baf24..172fa0b8b8 100644
--- a/core/src/test/java/org/acegisecurity/providers/cas/ticketvalidator/CasProxyTicketValidatorTests.java
+++ b/core/src/test/java/org/springframework/security/providers/cas/ticketvalidator/CasProxyTicketValidatorTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.cas.ticketvalidator;
+package org.springframework.security.providers.cas.ticketvalidator;
 
 import edu.yale.its.tp.cas.client.ProxyTicketValidator;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AuthenticationServiceException;
-import org.acegisecurity.BadCredentialsException;
+import org.springframework.security.AuthenticationServiceException;
+import org.springframework.security.BadCredentialsException;
 
-import org.acegisecurity.providers.cas.TicketResponse;
+import org.springframework.security.providers.cas.TicketResponse;
 
-import org.acegisecurity.ui.cas.ServiceProperties;
+import org.springframework.security.ui.cas.ServiceProperties;
 
 import java.util.Vector;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/dao/DaoAuthenticationProviderTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/providers/dao/DaoAuthenticationProviderTests.java
index b5cbe19b3f..36b0450f54 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/dao/DaoAuthenticationProviderTests.java
@@ -13,31 +13,31 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.dao;
+package org.springframework.security.providers.dao;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccountExpiredException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationServiceException;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.CredentialsExpiredException;
-import org.acegisecurity.DisabledException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.LockedException;
+import org.springframework.security.AccountExpiredException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationServiceException;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.CredentialsExpiredException;
+import org.springframework.security.DisabledException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.LockedException;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.acegisecurity.providers.dao.cache.EhCacheBasedUserCache;
-import org.acegisecurity.providers.dao.cache.NullUserCache;
-import org.acegisecurity.providers.dao.salt.SystemWideSaltSource;
-import org.acegisecurity.providers.encoding.ShaPasswordEncoder;
+import org.springframework.security.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.dao.cache.EhCacheBasedUserCache;
+import org.springframework.security.providers.dao.cache.NullUserCache;
+import org.springframework.security.providers.dao.salt.SystemWideSaltSource;
+import org.springframework.security.providers.encoding.ShaPasswordEncoder;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataRetrievalFailureException;
@@ -92,7 +92,7 @@ public class DaoAuthenticationProviderTests extends TestCase {
     		assertTrue(true);
     	}
     }
-    
+
     public void testAuthenticateFailsIfAccountExpired() {
         UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("peter", "opal");
 
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCacheTests.java b/core/src/test/java/org/springframework/security/providers/dao/cache/EhCacheBasedUserCacheTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCacheTests.java
rename to core/src/test/java/org/springframework/security/providers/dao/cache/EhCacheBasedUserCacheTests.java
index 39ded460f6..f4ae7af3c0 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCacheTests.java
+++ b/core/src/test/java/org/springframework/security/providers/dao/cache/EhCacheBasedUserCacheTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.dao.cache;
+package org.springframework.security.providers.dao.cache;
 
 import junit.framework.TestCase;
 
 import net.sf.ehcache.Ehcache;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.MockApplicationContext;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.MockApplicationContext;
 
-import org.acegisecurity.userdetails.User;
+import org.springframework.security.userdetails.User;
 
 import org.springframework.context.ApplicationContext;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/cache/NullUserCacheTests.java b/core/src/test/java/org/springframework/security/providers/dao/cache/NullUserCacheTests.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/providers/dao/cache/NullUserCacheTests.java
rename to core/src/test/java/org/springframework/security/providers/dao/cache/NullUserCacheTests.java
index f1577a7b0b..d2c9191a82 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/cache/NullUserCacheTests.java
+++ b/core/src/test/java/org/springframework/security/providers/dao/cache/NullUserCacheTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.dao.cache;
+package org.springframework.security.providers.dao.cache;
 
 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.userdetails.User;
+import org.springframework.security.userdetails.User;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSourceTests.java b/core/src/test/java/org/springframework/security/providers/dao/salt/ReflectionSaltSourceTests.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSourceTests.java
rename to core/src/test/java/org/springframework/security/providers/dao/salt/ReflectionSaltSourceTests.java
index e7efc2173b..857c9765c4 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSourceTests.java
+++ b/core/src/test/java/org/springframework/security/providers/dao/salt/ReflectionSaltSourceTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.dao.salt;
+package org.springframework.security.providers.dao.salt;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AuthenticationServiceException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.AuthenticationServiceException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSourceTests.java b/core/src/test/java/org/springframework/security/providers/dao/salt/SystemWideSaltSourceTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSourceTests.java
rename to core/src/test/java/org/springframework/security/providers/dao/salt/SystemWideSaltSourceTests.java
index 703f00b4c3..69c6105b2e 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSourceTests.java
+++ b/core/src/test/java/org/springframework/security/providers/dao/salt/SystemWideSaltSourceTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.dao.salt;
+package org.springframework.security.providers.dao.salt;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/BasePasswordEncoderTests.java b/core/src/test/java/org/springframework/security/providers/encoding/BasePasswordEncoderTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/providers/encoding/BasePasswordEncoderTests.java
rename to core/src/test/java/org/springframework/security/providers/encoding/BasePasswordEncoderTests.java
index bb6819c58f..0187e359bc 100644
--- a/core/src/test/java/org/acegisecurity/providers/encoding/BasePasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/encoding/BasePasswordEncoderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.encoding;
+package org.springframework.security.providers.encoding;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/Md4PasswordEncoderTests.java b/core/src/test/java/org/springframework/security/providers/encoding/Md4PasswordEncoderTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/providers/encoding/Md4PasswordEncoderTests.java
rename to core/src/test/java/org/springframework/security/providers/encoding/Md4PasswordEncoderTests.java
index a3230f45a7..359c82fb7a 100644
--- a/core/src/test/java/org/acegisecurity/providers/encoding/Md4PasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/encoding/Md4PasswordEncoderTests.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.providers.encoding;
+package org.springframework.security.providers.encoding;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTests.java b/core/src/test/java/org/springframework/security/providers/encoding/Md5PasswordEncoderTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTests.java
rename to core/src/test/java/org/springframework/security/providers/encoding/Md5PasswordEncoderTests.java
index 1ee0d2d95d..e1ab646631 100644
--- a/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/encoding/Md5PasswordEncoderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.encoding;
+package org.springframework.security.providers.encoding;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTests.java b/core/src/test/java/org/springframework/security/providers/encoding/PlaintextPasswordEncoderTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTests.java
rename to core/src/test/java/org/springframework/security/providers/encoding/PlaintextPasswordEncoderTests.java
index e84018198e..d42f79b7a7 100644
--- a/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/encoding/PlaintextPasswordEncoderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.encoding;
+package org.springframework.security.providers.encoding;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTests.java b/core/src/test/java/org/springframework/security/providers/encoding/ShaPasswordEncoderTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTests.java
rename to core/src/test/java/org/springframework/security/providers/encoding/ShaPasswordEncoderTests.java
index 5e2f96eb9c..4636601cdb 100644
--- a/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/encoding/ShaPasswordEncoderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.encoding;
+package org.springframework.security.providers.encoding;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/jaas/JaasAuthenticationProviderTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/providers/jaas/JaasAuthenticationProviderTests.java
index 3027ef9924..2a54ae82fd 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/jaas/JaasAuthenticationProviderTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.jaas;
+package org.springframework.security.providers.jaas;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.*;
+import org.springframework.security.*;
 
-import org.acegisecurity.context.HttpSessionContextIntegrationFilter;
-import org.acegisecurity.context.SecurityContextImpl;
+import org.springframework.security.context.HttpSessionContextIntegrationFilter;
+import org.springframework.security.context.SecurityContextImpl;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.ui.session.HttpSessionDestroyedEvent;
+import org.springframework.security.ui.session.HttpSessionDestroyedEvent;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -192,7 +192,7 @@ public class JaasAuthenticationProviderTests extends TestCase {
     public void testLoginExceptionResolver() {
         assertNotNull(jaasProvider.getLoginExceptionResolver());
         jaasProvider.setLoginExceptionResolver(new LoginExceptionResolver() {
-                public AcegiSecurityException resolveException(LoginException e) {
+                public SpringSecurityException resolveException(LoginException e) {
                     return new LockedException("This is just a test!");
                 }
             });
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/JaasEventCheck.java b/core/src/test/java/org/springframework/security/providers/jaas/JaasEventCheck.java
similarity index 87%
rename from core/src/test/java/org/acegisecurity/providers/jaas/JaasEventCheck.java
rename to core/src/test/java/org/springframework/security/providers/jaas/JaasEventCheck.java
index 014e8db687..ad6330e806 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/JaasEventCheck.java
+++ b/core/src/test/java/org/springframework/security/providers/jaas/JaasEventCheck.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.jaas;
+package org.springframework.security.providers.jaas;
 
-import org.acegisecurity.providers.jaas.event.JaasAuthenticationFailedEvent;
-import org.acegisecurity.providers.jaas.event.JaasAuthenticationSuccessEvent;
+import org.springframework.security.providers.jaas.event.JaasAuthenticationFailedEvent;
+import org.springframework.security.providers.jaas.event.JaasAuthenticationSuccessEvent;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/SecurityContextLoginModuleTests.java b/core/src/test/java/org/springframework/security/providers/jaas/SecurityContextLoginModuleTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/providers/jaas/SecurityContextLoginModuleTests.java
rename to core/src/test/java/org/springframework/security/providers/jaas/SecurityContextLoginModuleTests.java
index 78edff174f..d2d8df4a4a 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/SecurityContextLoginModuleTests.java
+++ b/core/src/test/java/org/springframework/security/providers/jaas/SecurityContextLoginModuleTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.jaas;
+package org.springframework.security.providers.jaas;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java b/core/src/test/java/org/springframework/security/providers/jaas/TestAuthorityGranter.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java
rename to core/src/test/java/org/springframework/security/providers/jaas/TestAuthorityGranter.java
index d529dd7a42..d96ff445a6 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java
+++ b/core/src/test/java/org/springframework/security/providers/jaas/TestAuthorityGranter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.jaas;
+package org.springframework.security.providers.jaas;
 
 import java.security.Principal;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java b/core/src/test/java/org/springframework/security/providers/jaas/TestCallbackHandler.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java
rename to core/src/test/java/org/springframework/security/providers/jaas/TestCallbackHandler.java
index d840e986a5..b728045ed1 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java
+++ b/core/src/test/java/org/springframework/security/providers/jaas/TestCallbackHandler.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.jaas;
+package org.springframework.security.providers.jaas;
 
-import org.acegisecurity.Authentication;
+import org.springframework.security.Authentication;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java b/core/src/test/java/org/springframework/security/providers/jaas/TestLoginModule.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java
rename to core/src/test/java/org/springframework/security/providers/jaas/TestLoginModule.java
index a1599b817a..23e4a3c4a4 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java
+++ b/core/src/test/java/org/springframework/security/providers/jaas/TestLoginModule.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.jaas;
+package org.springframework.security.providers.jaas;
 
 import java.security.Principal;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/LdapAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/ldap/LdapAuthenticationProviderTests.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/providers/ldap/LdapAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/providers/ldap/LdapAuthenticationProviderTests.java
index 173959d1c3..5bf62001b2 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/LdapAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/ldap/LdapAuthenticationProviderTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap;
+package org.springframework.security.providers.ldap;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.Authentication;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.ldap.LdapUserDetailsMapper;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.ldap.LdapUserDetailsMapper;
 import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;
@@ -121,7 +121,7 @@ public class LdapAuthenticationProviderTests extends TestCase {
         LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(new MockAuthenticator());
         LdapUserDetailsMapper userMapper = new LdapUserDetailsMapper();
         userMapper.setRoleAttributes(new String[] {"ou"});
-        ldapProvider.setUserDetailsContextMapper(userMapper);        
+        ldapProvider.setUserDetailsContextMapper(userMapper);
         UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken("ben", "benspassword");
         UserDetails user = ldapProvider.retrieveUser("ben", authRequest);
         assertEquals(1, user.getAuthorities().length);
diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/BindAuthenticatorTests.java b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/BindAuthenticatorTests.java
similarity index 88%
rename from core/src/test/java/org/acegisecurity/providers/ldap/authenticator/BindAuthenticatorTests.java
rename to core/src/test/java/org/springframework/security/providers/ldap/authenticator/BindAuthenticatorTests.java
index 9d229a742f..591a7c6c0f 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/BindAuthenticatorTests.java
+++ b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/BindAuthenticatorTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap.authenticator;
+package org.springframework.security.providers.ldap.authenticator;
 
-import org.acegisecurity.AcegiMessageSource;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.AcegiMessageSource;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.Authentication;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.ldap.AbstractLdapIntegrationTests;
-import org.acegisecurity.ldap.InitialDirContextFactory;
+import org.springframework.security.ldap.AbstractLdapIntegrationTests;
+import org.springframework.security.ldap.InitialDirContextFactory;
 
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;
@@ -49,7 +49,7 @@ public class BindAuthenticatorTests extends AbstractLdapIntegrationTests {
         authenticator.setMessageSource(new AcegiMessageSource());
         bob = new UsernamePasswordAuthenticationToken("bob", "bobspassword");
         ben = new UsernamePasswordAuthenticationToken("ben", "benspassword");
-        
+
     }
 
     public void testAuthenticationWithCorrectPasswordSucceeds() {
diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/LdapShaPasswordEncoderTests.java b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/LdapShaPasswordEncoderTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/providers/ldap/authenticator/LdapShaPasswordEncoderTests.java
rename to core/src/test/java/org/springframework/security/providers/ldap/authenticator/LdapShaPasswordEncoderTests.java
index 7fc35ea1b9..9ea43f0603 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/LdapShaPasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/LdapShaPasswordEncoderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap.authenticator;
+package org.springframework.security.providers.ldap.authenticator;
 
 import junit.framework.TestCase;
 
@@ -82,7 +82,7 @@ public class LdapShaPasswordEncoderTests extends TestCase {
 
         sha.setForceLowerCasePrefix(true);
         assertEquals("{sha}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", sha.encodePassword("boabspasswurd", null));
-        assertTrue(sha.encodePassword("somepassword", "salt".getBytes()).startsWith("{ssha}"));        
+        assertTrue(sha.encodePassword("somepassword", "salt".getBytes()).startsWith("{ssha}"));
 
     }
 }
diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/MockUserSearch.java b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/MockUserSearch.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/providers/ldap/authenticator/MockUserSearch.java
rename to core/src/test/java/org/springframework/security/providers/ldap/authenticator/MockUserSearch.java
index f24223ac75..6e7d6ddad9 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/MockUserSearch.java
+++ b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/MockUserSearch.java
@@ -13,11 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap.authenticator;
+package org.springframework.security.providers.ldap.authenticator;
 
-import org.acegisecurity.ldap.LdapUserSearch;
+import org.springframework.security.ldap.LdapUserSearch;
 
-import org.acegisecurity.userdetails.ldap.LdapUserDetails;
 import org.springframework.ldap.core.DirContextOperations;
 
 
diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/PasswordComparisonAuthenticatorMockTests.java b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/PasswordComparisonAuthenticatorMockTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/providers/ldap/authenticator/PasswordComparisonAuthenticatorMockTests.java
rename to core/src/test/java/org/springframework/security/providers/ldap/authenticator/PasswordComparisonAuthenticatorMockTests.java
index ff181d83a9..0eb10c2b35 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/PasswordComparisonAuthenticatorMockTests.java
+++ b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/PasswordComparisonAuthenticatorMockTests.java
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap.authenticator;
+package org.springframework.security.providers.ldap.authenticator;
 
-import org.acegisecurity.ldap.MockInitialDirContextFactory;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.ldap.MockInitialDirContextFactory;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/PasswordComparisonAuthenticatorTests.java b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/PasswordComparisonAuthenticatorTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/providers/ldap/authenticator/PasswordComparisonAuthenticatorTests.java
rename to core/src/test/java/org/springframework/security/providers/ldap/authenticator/PasswordComparisonAuthenticatorTests.java
index a1d05e7c30..2ad0064c92 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/PasswordComparisonAuthenticatorTests.java
+++ b/core/src/test/java/org/springframework/security/providers/ldap/authenticator/PasswordComparisonAuthenticatorTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap.authenticator;
+package org.springframework.security.providers.ldap.authenticator;
 
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.Authentication;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.Authentication;
 
-import org.acegisecurity.ldap.AbstractLdapIntegrationTests;
-import org.acegisecurity.ldap.InitialDirContextFactory;
+import org.springframework.security.ldap.AbstractLdapIntegrationTests;
+import org.springframework.security.ldap.InitialDirContextFactory;
 
-import org.acegisecurity.providers.encoding.PlaintextPasswordEncoder;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.encoding.PlaintextPasswordEncoder;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.DirContextOperations;
diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java b/core/src/test/java/org/springframework/security/providers/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java
rename to core/src/test/java/org/springframework/security/providers/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java
index 356e4381b0..4b4e11cac3 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java
+++ b/core/src/test/java/org/springframework/security/providers/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java
@@ -13,22 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.ldap.populator;
+package org.springframework.security.providers.ldap.populator;
 
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.GrantedAuthority;
 
-import org.acegisecurity.ldap.AbstractLdapIntegrationTests;
-import org.acegisecurity.ldap.InitialDirContextFactory;
+import org.springframework.security.ldap.AbstractLdapIntegrationTests;
+import org.springframework.security.ldap.InitialDirContextFactory;
 
-import org.acegisecurity.userdetails.ldap.LdapUserDetailsImpl;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.naming.directory.BasicAttributes;
-
 
 /**
  * DOCUMENT ME!
diff --git a/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImplTests.java b/core/src/test/java/org/springframework/security/providers/rcp/RemoteAuthenticationManagerImplTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImplTests.java
rename to core/src/test/java/org/springframework/security/providers/rcp/RemoteAuthenticationManagerImplTests.java
index 7b4dfe7688..c2f6ff0bf6 100644
--- a/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationManagerImplTests.java
+++ b/core/src/test/java/org/springframework/security/providers/rcp/RemoteAuthenticationManagerImplTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.rcp;
+package org.springframework.security.providers.rcp;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.MockAuthenticationManager;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.MockAuthenticationManager;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/rcp/RemoteAuthenticationProviderTests.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/providers/rcp/RemoteAuthenticationProviderTests.java
index 324ac4745a..c695a69769 100644
--- a/core/src/test/java/org/acegisecurity/providers/rcp/RemoteAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/rcp/RemoteAuthenticationProviderTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.rcp;
+package org.springframework.security.providers.rcp;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationProviderTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationProviderTests.java
index 4cfe96eff2..80591c4f2d 100644
--- a/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationProviderTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.rememberme;
+package org.springframework.security.providers.rememberme;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationTokenTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationTokenTests.java
rename to core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationTokenTests.java
index 63d00b8c5f..4898fdbba3 100644
--- a/core/src/test/java/org/acegisecurity/providers/rememberme/RememberMeAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationTokenTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.rememberme;
+package org.springframework.security.providers.rememberme;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/siteminder/SiteminderAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/siteminder/SiteminderAuthenticationProviderTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/providers/siteminder/SiteminderAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/providers/siteminder/SiteminderAuthenticationProviderTests.java
index a8df07ec39..b6b1b32569 100644
--- a/core/src/test/java/org/acegisecurity/providers/siteminder/SiteminderAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/siteminder/SiteminderAuthenticationProviderTests.java
@@ -13,31 +13,31 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.siteminder;
+package org.springframework.security.providers.siteminder;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccountExpiredException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationServiceException;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.CredentialsExpiredException;
-import org.acegisecurity.DisabledException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.LockedException;
-import org.acegisecurity.providers.TestingAuthenticationToken;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.acegisecurity.providers.dao.UserCache;
-import org.acegisecurity.providers.dao.cache.EhCacheBasedUserCache;
-import org.acegisecurity.providers.dao.cache.NullUserCache;
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.AccountExpiredException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationServiceException;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.CredentialsExpiredException;
+import org.springframework.security.DisabledException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.LockedException;
+import org.springframework.security.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.dao.UserCache;
+import org.springframework.security.providers.dao.cache.EhCacheBasedUserCache;
+import org.springframework.security.providers.dao.cache.NullUserCache;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataRetrievalFailureException;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/x509/X509AuthenticationProviderTests.java
similarity index 88%
rename from core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/providers/x509/X509AuthenticationProviderTests.java
index 4e025c660c..e5bb761570 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/x509/X509AuthenticationProviderTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.x509;
+package org.springframework.security.providers.x509;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
 
 import java.security.cert.X509Certificate;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/providers/x509/X509AuthenticationTokenTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java
rename to core/src/test/java/org/springframework/security/providers/x509/X509AuthenticationTokenTests.java
index 84b1df057b..4e816f3e7e 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/providers/x509/X509AuthenticationTokenTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.x509;
+package org.springframework.security.providers.x509;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java b/core/src/test/java/org/springframework/security/providers/x509/X509TestUtils.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java
rename to core/src/test/java/org/springframework/security/providers/x509/X509TestUtils.java
index 71f9f92649..251df4c72c 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java
+++ b/core/src/test/java/org/springframework/security/providers/x509/X509TestUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.x509;
+package org.springframework.security.providers.x509;
 
 import java.io.ByteArrayInputStream;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java b/core/src/test/java/org/springframework/security/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
similarity index 86%
rename from core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
rename to core/src/test/java/org/springframework/security/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
index 98cff61404..144c1c9f0c 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
+++ b/core/src/test/java/org/springframework/security/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.x509.cache;
+package org.springframework.security.providers.x509.cache;
 
 import junit.framework.TestCase;
 
 import net.sf.ehcache.Ehcache;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.MockApplicationContext;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.MockApplicationContext;
 
-import org.acegisecurity.providers.x509.X509TestUtils;
+import org.springframework.security.providers.x509.X509TestUtils;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
 
 import org.springframework.context.ApplicationContext;
 
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java b/core/src/test/java/org/springframework/security/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
similarity index 90%
rename from core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
rename to core/src/test/java/org/springframework/security/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
index a84f3d7619..84966f44fe 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
+++ b/core/src/test/java/org/springframework/security/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.providers.x509.populator;
+package org.springframework.security.providers.x509.populator;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.providers.x509.X509TestUtils;
+import org.springframework.security.providers.x509.X509TestUtils;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/core/src/test/java/org/acegisecurity/runas/NullRunAsManagerTests.java b/core/src/test/java/org/springframework/security/runas/NullRunAsManagerTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/runas/NullRunAsManagerTests.java
rename to core/src/test/java/org/springframework/security/runas/NullRunAsManagerTests.java
index 0e589ea9f7..68d50d7208 100644
--- a/core/src/test/java/org/acegisecurity/runas/NullRunAsManagerTests.java
+++ b/core/src/test/java/org/springframework/security/runas/NullRunAsManagerTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.runas;
+package org.springframework.security.runas;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.SecurityConfig;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/runas/RunAsImplAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/runas/RunAsImplAuthenticationProviderTests.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/runas/RunAsImplAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/runas/RunAsImplAuthenticationProviderTests.java
index 98eb8183ef..a739f77fa5 100644
--- a/core/src/test/java/org/acegisecurity/runas/RunAsImplAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/runas/RunAsImplAuthenticationProviderTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.runas;
+package org.springframework.security.runas;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/runas/RunAsManagerImplTests.java b/core/src/test/java/org/springframework/security/runas/RunAsManagerImplTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/runas/RunAsManagerImplTests.java
rename to core/src/test/java/org/springframework/security/runas/RunAsManagerImplTests.java
index 1cb1889ea3..b395dbfe31 100644
--- a/core/src/test/java/org/acegisecurity/runas/RunAsManagerImplTests.java
+++ b/core/src/test/java/org/springframework/security/runas/RunAsManagerImplTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.runas;
+package org.springframework.security.runas;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.RunAsManager;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.RunAsManager;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/runas/RunAsUserTokenTests.java b/core/src/test/java/org/springframework/security/runas/RunAsUserTokenTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/runas/RunAsUserTokenTests.java
rename to core/src/test/java/org/springframework/security/runas/RunAsUserTokenTests.java
index dd57dd0f1e..ebcc61ca19 100644
--- a/core/src/test/java/org/acegisecurity/runas/RunAsUserTokenTests.java
+++ b/core/src/test/java/org/springframework/security/runas/RunAsUserTokenTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.runas;
+package org.springframework.security.runas;
 
 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.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/securechannel/ChannelDecisionManagerImplTests.java b/core/src/test/java/org/springframework/security/securechannel/ChannelDecisionManagerImplTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/securechannel/ChannelDecisionManagerImplTests.java
rename to core/src/test/java/org/springframework/security/securechannel/ChannelDecisionManagerImplTests.java
index 72789e0dbb..2f19c82b79 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/ChannelDecisionManagerImplTests.java
+++ b/core/src/test/java/org/springframework/security/securechannel/ChannelDecisionManagerImplTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.securechannel;
+package org.springframework.security.securechannel;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockFilterChain;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockFilterChain;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.intercept.web.FilterInvocation;
+import org.springframework.security.intercept.web.FilterInvocation;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/securechannel/ChannelProcessingFilterTests.java b/core/src/test/java/org/springframework/security/securechannel/ChannelProcessingFilterTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/securechannel/ChannelProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/securechannel/ChannelProcessingFilterTests.java
index 41bc62ad91..bbf7236355 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/ChannelProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/securechannel/ChannelProcessingFilterTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.securechannel;
+package org.springframework.security.securechannel;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.intercept.web.FilterInvocation;
-import org.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
+import org.springframework.security.intercept.web.FilterInvocation;
+import org.springframework.security.intercept.web.FilterInvocationDefinitionSource;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/securechannel/InsecureChannelProcessorTests.java b/core/src/test/java/org/springframework/security/securechannel/InsecureChannelProcessorTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/securechannel/InsecureChannelProcessorTests.java
rename to core/src/test/java/org/springframework/security/securechannel/InsecureChannelProcessorTests.java
index 06720ff726..db8855038c 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/InsecureChannelProcessorTests.java
+++ b/core/src/test/java/org/springframework/security/securechannel/InsecureChannelProcessorTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.securechannel;
+package org.springframework.security.securechannel;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockFilterChain;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockFilterChain;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.intercept.web.FilterInvocation;
+import org.springframework.security.intercept.web.FilterInvocation;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java b/core/src/test/java/org/springframework/security/securechannel/RetryWithHttpEntryPointTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java
rename to core/src/test/java/org/springframework/security/securechannel/RetryWithHttpEntryPointTests.java
index 1b4a386d1e..0a275b6468 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpEntryPointTests.java
+++ b/core/src/test/java/org/springframework/security/securechannel/RetryWithHttpEntryPointTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.securechannel;
+package org.springframework.security.securechannel;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.MockPortResolver;
+import org.springframework.security.MockPortResolver;
 
-import org.acegisecurity.util.PortMapperImpl;
+import org.springframework.security.util.PortMapperImpl;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java b/core/src/test/java/org/springframework/security/securechannel/RetryWithHttpsEntryPointTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java
rename to core/src/test/java/org/springframework/security/securechannel/RetryWithHttpsEntryPointTests.java
index 0b45e448e4..d84b1bab2d 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/RetryWithHttpsEntryPointTests.java
+++ b/core/src/test/java/org/springframework/security/securechannel/RetryWithHttpsEntryPointTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.securechannel;
+package org.springframework.security.securechannel;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.MockPortResolver;
+import org.springframework.security.MockPortResolver;
 
-import org.acegisecurity.util.PortMapperImpl;
+import org.springframework.security.util.PortMapperImpl;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/securechannel/SecureChannelProcessorTests.java b/core/src/test/java/org/springframework/security/securechannel/SecureChannelProcessorTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/securechannel/SecureChannelProcessorTests.java
rename to core/src/test/java/org/springframework/security/securechannel/SecureChannelProcessorTests.java
index 8edd45f56b..c6a30c1fef 100644
--- a/core/src/test/java/org/acegisecurity/securechannel/SecureChannelProcessorTests.java
+++ b/core/src/test/java/org/springframework/security/securechannel/SecureChannelProcessorTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.securechannel;
+package org.springframework.security.securechannel;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockFilterChain;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockFilterChain;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.intercept.web.FilterInvocation;
+import org.springframework.security.intercept.web.FilterInvocation;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AclTagTests.java b/core/src/test/java/org/springframework/security/taglibs/authz/AclTagTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/taglibs/authz/AclTagTests.java
rename to core/src/test/java/org/springframework/security/taglibs/authz/AclTagTests.java
index 87ded28b57..6f36006e90 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AclTagTests.java
+++ b/core/src/test/java/org/springframework/security/taglibs/authz/AclTagTests.java
@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.taglibs.authz;
+package org.springframework.security.taglibs.authz;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.MockAclManager;
-import org.acegisecurity.MockApplicationContext;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.MockAclManager;
+import org.springframework.security.MockApplicationContext;
 
-import org.acegisecurity.acl.AclEntry;
-import org.acegisecurity.acl.AclManager;
-import org.acegisecurity.acl.basic.MockAclObjectIdentity;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.springframework.security.acl.AclEntry;
+import org.springframework.security.acl.AclManager;
+import org.springframework.security.acl.basic.MockAclObjectIdentity;
+import org.springframework.security.acl.basic.SimpleAclEntry;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthenticationTagTests.java b/core/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/taglibs/authz/AuthenticationTagTests.java
rename to core/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java
index 98cf72003e..fce738f520 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthenticationTagTests.java
+++ b/core/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.taglibs.authz;
+package org.springframework.security.taglibs.authz;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
-import org.acegisecurity.userdetails.User;
+import org.springframework.security.userdetails.User;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java b/core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java
rename to core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java
index 1e75ec8631..be7337001d 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagAttributeTests.java
+++ b/core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.taglibs.authz;
+package org.springframework.security.taglibs.authz;
 
 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.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java b/core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java
rename to core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java
index d03a86be08..abacd7c74c 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java
+++ b/core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagCustomGrantedAuthorityTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.taglibs.authz;
+package org.springframework.security.taglibs.authz;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.GrantedAuthority;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagExpressionLanguageTests.java b/core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
similarity index 90%
rename from core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
rename to core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
index 2d9a42c84a..64b49adea3 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
+++ b/core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.taglibs.authz;
+package org.springframework.security.taglibs.authz;
 
 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.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import org.springframework.mock.web.MockPageContext;
 
diff --git a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java b/core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java
rename to core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java
index f2b8a427bc..b3a84e6972 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/authz/AuthorizeTagTests.java
+++ b/core/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.taglibs.authz;
+package org.springframework.security.taglibs.authz;
 
 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.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
diff --git a/core/src/test/java/org/acegisecurity/taglibs/velocity/AuthzImplAttributeTest.java b/core/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/taglibs/velocity/AuthzImplAttributeTest.java
rename to core/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java
index 508b6b47a4..c27977ca19 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/velocity/AuthzImplAttributeTest.java
+++ b/core/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.taglibs.velocity;
+package org.springframework.security.taglibs.velocity;
 
 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.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import javax.servlet.jsp.JspException;
 
diff --git a/core/src/test/java/org/acegisecurity/taglibs/velocity/AuthzImplAuthorizeTagTest.java b/core/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/taglibs/velocity/AuthzImplAuthorizeTagTest.java
rename to core/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java
index 00ea581993..234e2f83dd 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/velocity/AuthzImplAuthorizeTagTest.java
+++ b/core/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java
@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.taglibs.velocity;
+package org.springframework.security.taglibs.velocity;
 
 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.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/taglibs/velocity/AuthzImplTest.java b/core/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplTest.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/taglibs/velocity/AuthzImplTest.java
rename to core/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplTest.java
index 9ce925c68f..fbf5119308 100644
--- a/core/src/test/java/org/acegisecurity/taglibs/velocity/AuthzImplTest.java
+++ b/core/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplTest.java
@@ -13,24 +13,24 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.taglibs.velocity;
+package org.springframework.security.taglibs.velocity;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.MockAclManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.MockAclManager;
 
-import org.acegisecurity.acl.AclEntry;
-import org.acegisecurity.acl.AclManager;
-import org.acegisecurity.acl.basic.MockAclObjectIdentity;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
+import org.springframework.security.acl.AclEntry;
+import org.springframework.security.acl.AclManager;
+import org.springframework.security.acl.basic.MockAclObjectIdentity;
+import org.springframework.security.acl.basic.SimpleAclEntry;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
-import org.acegisecurity.userdetails.User;
+import org.springframework.security.userdetails.User;
 
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.StaticApplicationContext;
diff --git a/core/src/test/java/org/acegisecurity/ui/AbstractProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/AbstractProcessingFilterTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/ui/AbstractProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/ui/AbstractProcessingFilterTests.java
index 2097a5c98b..2ad3371229 100644
--- a/core/src/test/java/org/acegisecurity/ui/AbstractProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/AbstractProcessingFilterTests.java
@@ -13,21 +13,21 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui;
+package org.springframework.security.ui;
 
 import junit.framework.TestCase;
-import org.acegisecurity.AccountExpiredException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.MockAuthenticationManager;
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices;
-import org.acegisecurity.ui.savedrequest.SavedRequest;
-import org.acegisecurity.util.PortResolverImpl;
+import org.springframework.security.AccountExpiredException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.ui.rememberme.TokenBasedRememberMeServices;
+import org.springframework.security.ui.savedrequest.SavedRequest;
+import org.springframework.security.util.PortResolverImpl;
 import org.springframework.mock.web.MockFilterConfig;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/ui/ExceptionTranslationFilterTests.java b/core/src/test/java/org/springframework/security/ui/ExceptionTranslationFilterTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/ui/ExceptionTranslationFilterTests.java
rename to core/src/test/java/org/springframework/security/ui/ExceptionTranslationFilterTests.java
index 3238e8b106..92f743788a 100644
--- a/core/src/test/java/org/acegisecurity/ui/ExceptionTranslationFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/ExceptionTranslationFilterTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui;
+package org.springframework.security.ui;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.MockAuthenticationEntryPoint;
-import org.acegisecurity.MockPortResolver;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.MockAuthenticationEntryPoint;
+import org.springframework.security.MockPortResolver;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
+import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -40,7 +40,7 @@ import javax.servlet.ServletResponse;
 
 /**
  * Tests {@link ExceptionTranslationFilter}.
- * 
+ *
  * @author Ben Alex
  * @version $Id: ExceptionTranslationFilterTests.java 1496 2006-05-23 13:38:33Z
  * benalex $
diff --git a/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPointTests.java b/core/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPointTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPointTests.java
rename to core/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPointTests.java
index 66a201e4a5..c7cbeb3a68 100644
--- a/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterEntryPointTests.java
+++ b/core/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPointTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.basicauth;
+package org.springframework.security.ui.basicauth;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.DisabledException;
+import org.springframework.security.DisabledException;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
@@ -68,14 +68,14 @@ public class BasicProcessingFilterEntryPointTests extends TestCase {
 
     public void testNormalOperation() throws Exception {
         BasicProcessingFilterEntryPoint ep = new BasicProcessingFilterEntryPoint();
-        
+
         ep.setRealmName("hello");
 
         MockHttpServletRequest request = new MockHttpServletRequest();
         request.setRequestURI("/some_path");
 
         MockHttpServletResponse response = new MockHttpServletResponse();
-        
+
         //ep.afterPropertiesSet();
 
         String msg = "These are the jokes kid";
diff --git a/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterTests.java
index 8f23854f68..5f888b84ef 100644
--- a/core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterTests.java
@@ -13,22 +13,22 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.basicauth;
+package org.springframework.security.ui.basicauth;
 
-import org.acegisecurity.MockAuthenticationEntryPoint;
-import org.acegisecurity.MockAuthenticationManager;
-import org.acegisecurity.MockFilterChain;
-import org.acegisecurity.MockFilterConfig;
+import org.springframework.security.MockAuthenticationEntryPoint;
+import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.MockFilterChain;
+import org.springframework.security.MockFilterConfig;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.ProviderManager;
-import org.acegisecurity.providers.dao.DaoAuthenticationProvider;
+import org.springframework.security.providers.ProviderManager;
+import org.springframework.security.providers.dao.DaoAuthenticationProvider;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.memory.InMemoryDaoImpl;
-import org.acegisecurity.userdetails.memory.UserMap;
-import org.acegisecurity.userdetails.memory.UserMapEditor;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.memory.InMemoryDaoImpl;
+import org.springframework.security.userdetails.memory.UserMap;
+import org.springframework.security.userdetails.memory.UserMapEditor;
 
 import org.apache.commons.codec.binary.Base64;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPointTests.java b/core/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java
similarity index 99%
rename from core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPointTests.java
rename to core/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java
index c202858bf1..ae17cf2c7d 100644
--- a/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterEntryPointTests.java
+++ b/core/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPointTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.cas;
+package org.springframework.security.ui.cas;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java
index 62131f5708..b0a42d2efe 100644
--- a/core/src/test/java/org/acegisecurity/ui/cas/CasProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/cas/CasProcessingFilterTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.cas;
+package org.springframework.security.ui.cas;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.MockAuthenticationManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.MockAuthenticationManager;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/cas/ServicePropertiesTests.java b/core/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/ui/cas/ServicePropertiesTests.java
rename to core/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java
index 944b2e267a..3b6c4e0f3f 100644
--- a/core/src/test/java/org/acegisecurity/ui/cas/ServicePropertiesTests.java
+++ b/core/src/test/java/org/springframework/security/ui/cas/ServicePropertiesTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.cas;
+package org.springframework.security.ui.cas;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPointTests.java b/core/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPointTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPointTests.java
rename to core/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPointTests.java
index d8d169e94c..d7cd3f7763 100644
--- a/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterEntryPointTests.java
+++ b/core/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPointTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.digestauth;
+package org.springframework.security.ui.digestauth;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.DisabledException;
+import org.springframework.security.DisabledException;
 
-import org.acegisecurity.util.StringSplitUtils;
+import org.springframework.security.util.StringSplitUtils;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -53,7 +53,7 @@ public class DigestProcessingFilterEntryPointTests extends TestCase {
 
     private void checkNonceValid(String nonce) {
         // Check the nonce seems to be generated correctly
-        // format of nonce is:  
+        // format of nonce is:
         //   base64(expirationTime + ":" + md5Hex(expirationTime + ":" + key))
         assertTrue(Base64.isArrayByteBase64(nonce.getBytes()));
 
diff --git a/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterTests.java
index 8f3f7afef2..58fc20bfd7 100644
--- a/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterTests.java
@@ -13,21 +13,21 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.digestauth;
+package org.springframework.security.ui.digestauth;
 
-import org.acegisecurity.MockFilterChain;
-import org.acegisecurity.MockFilterConfig;
+import org.springframework.security.MockFilterChain;
+import org.springframework.security.MockFilterConfig;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.dao.cache.NullUserCache;
+import org.springframework.security.providers.dao.cache.NullUserCache;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.memory.InMemoryDaoImpl;
-import org.acegisecurity.userdetails.memory.UserMap;
-import org.acegisecurity.userdetails.memory.UserMapEditor;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.memory.InMemoryDaoImpl;
+import org.springframework.security.userdetails.memory.UserMap;
+import org.springframework.security.userdetails.memory.UserMapEditor;
 
-import org.acegisecurity.util.StringSplitUtils;
+import org.springframework.security.util.StringSplitUtils;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
diff --git a/core/src/test/java/org/acegisecurity/ui/logout/LogoutHandlerTests.java b/core/src/test/java/org/springframework/security/ui/logout/LogoutHandlerTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/ui/logout/LogoutHandlerTests.java
rename to core/src/test/java/org/springframework/security/ui/logout/LogoutHandlerTests.java
index a984e6e079..8ce896a78e 100644
--- a/core/src/test/java/org/acegisecurity/ui/logout/LogoutHandlerTests.java
+++ b/core/src/test/java/org/springframework/security/ui/logout/LogoutHandlerTests.java
@@ -1,4 +1,4 @@
-package org.acegisecurity.ui.logout;
+package org.springframework.security.ui.logout;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/rememberme/NullRememberMeServicesTests.java b/core/src/test/java/org/springframework/security/ui/rememberme/NullRememberMeServicesTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/ui/rememberme/NullRememberMeServicesTests.java
rename to core/src/test/java/org/springframework/security/ui/rememberme/NullRememberMeServicesTests.java
index e493166729..88c9a6d5cb 100644
--- a/core/src/test/java/org/acegisecurity/ui/rememberme/NullRememberMeServicesTests.java
+++ b/core/src/test/java/org/springframework/security/ui/rememberme/NullRememberMeServicesTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.rememberme;
+package org.springframework.security.ui.rememberme;
 
 import junit.framework.TestCase;
 
 
 /**
- * Tests {@link org.acegisecurity.ui.rememberme.NullRememberMeServices}.
+ * Tests {@link org.springframework.security.ui.rememberme.NullRememberMeServices}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilterTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilterTests.java
index 8f2935340b..926fb610be 100644
--- a/core/src/test/java/org/acegisecurity/ui/rememberme/RememberMeProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilterTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.rememberme;
+package org.springframework.security.ui.rememberme;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.MockAuthenticationManager;
-import org.acegisecurity.MockFilterConfig;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.MockFilterConfig;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java b/core/src/test/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServicesTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java
rename to core/src/test/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServicesTests.java
index 05734f8fea..363f25b84b 100644
--- a/core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java
+++ b/core/src/test/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServicesTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.rememberme;
+package org.springframework.security.ui.rememberme;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -44,7 +44,7 @@ import javax.servlet.http.Cookie;
 
 
 /**
- * Tests {@link org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices}.
+ * Tests {@link org.springframework.security.ui.rememberme.TokenBasedRememberMeServices}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/ui/savedrequest/SavedCookieTests.java b/core/src/test/java/org/springframework/security/ui/savedrequest/SavedCookieTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/ui/savedrequest/SavedCookieTests.java
rename to core/src/test/java/org/springframework/security/ui/savedrequest/SavedCookieTests.java
index f9392fe7f8..60b8d19368 100644
--- a/core/src/test/java/org/acegisecurity/ui/savedrequest/SavedCookieTests.java
+++ b/core/src/test/java/org/springframework/security/ui/savedrequest/SavedCookieTests.java
@@ -1,4 +1,4 @@
-package org.acegisecurity.ui.savedrequest;
+package org.springframework.security.ui.savedrequest;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/savedrequest/SavedRequestTests.java b/core/src/test/java/org/springframework/security/ui/savedrequest/SavedRequestTests.java
similarity index 88%
rename from core/src/test/java/org/acegisecurity/ui/savedrequest/SavedRequestTests.java
rename to core/src/test/java/org/springframework/security/ui/savedrequest/SavedRequestTests.java
index 3db40bb9f6..7ea547d70c 100644
--- a/core/src/test/java/org/acegisecurity/ui/savedrequest/SavedRequestTests.java
+++ b/core/src/test/java/org/springframework/security/ui/savedrequest/SavedRequestTests.java
@@ -1,7 +1,7 @@
-package org.acegisecurity.ui.savedrequest;
+package org.springframework.security.ui.savedrequest;
 
 import junit.framework.TestCase;
-import org.acegisecurity.MockPortResolver;
+import org.springframework.security.MockPortResolver;
 import org.springframework.mock.web.MockHttpServletRequest;
 
 public class SavedRequestTests extends TestCase {
diff --git a/core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java b/core/src/test/java/org/springframework/security/ui/session/HttpSessionEventPublisherTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java
rename to core/src/test/java/org/springframework/security/ui/session/HttpSessionEventPublisherTests.java
index 72a0adac79..f2d0697175 100644
--- a/core/src/test/java/org/acegisecurity/ui/session/HttpSessionEventPublisherTests.java
+++ b/core/src/test/java/org/springframework/security/ui/session/HttpSessionEventPublisherTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.session;
+package org.springframework.security.ui.session;
 
 import junit.framework.TestCase;
 import org.springframework.mock.web.MockHttpSession;
diff --git a/core/src/test/java/org/acegisecurity/ui/session/TestListener.java b/core/src/test/java/org/springframework/security/ui/session/TestListener.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/ui/session/TestListener.java
rename to core/src/test/java/org/springframework/security/ui/session/TestListener.java
index e0e70e6060..fc3f7abce2 100644
--- a/core/src/test/java/org/acegisecurity/ui/session/TestListener.java
+++ b/core/src/test/java/org/springframework/security/ui/session/TestListener.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.session;
+package org.springframework.security.ui.session;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
diff --git a/core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilterTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilterTests.java
index f6820ef53a..c34d38ca72 100644
--- a/core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilterTests.java
@@ -13,28 +13,28 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.switchuser;
+package org.springframework.security.ui.switchuser;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccountExpiredException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.CredentialsExpiredException;
-import org.acegisecurity.DisabledException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.AccountExpiredException;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationException;
+import org.springframework.security.CredentialsExpiredException;
+import org.springframework.security.DisabledException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 
-import org.acegisecurity.util.MockFilterChain;
+import org.springframework.security.util.MockFilterChain;
 
 import org.springframework.dao.DataAccessException;
 
@@ -43,7 +43,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
 
 
 /**
- * Tests {@link org.acegisecurity.ui.switchuser.SwitchUserProcessingFilter}.
+ * Tests {@link org.springframework.security.ui.switchuser.SwitchUserProcessingFilter}.
  *
  * @author Mark St.Godard
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java b/core/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java
rename to core/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java
index 342a42bdc1..4862f3b994 100644
--- a/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java
+++ b/core/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.webapp;
+package org.springframework.security.ui.webapp;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.MockPortResolver;
+import org.springframework.security.MockPortResolver;
 
-import org.acegisecurity.util.PortMapperImpl;
+import org.springframework.security.util.PortMapperImpl;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterTests.java
index 8964a9f0f2..592f15612a 100644
--- a/core/src/test/java/org/acegisecurity/ui/webapp/AuthenticationProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.webapp;
+package org.springframework.security.ui.webapp;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.MockAuthenticationManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.MockAuthenticationManager;
 
-import org.acegisecurity.ui.WebAuthenticationDetails;
+import org.springframework.security.ui.WebAuthenticationDetails;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/core/src/test/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/webapp/SiteminderAuthenticationProcessingFilterTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/ui/webapp/SiteminderAuthenticationProcessingFilterTests.java
index afd6c0b50a..51b9c82a27 100644
--- a/core/src/test/java/org/acegisecurity/ui/webapp/SiteminderAuthenticationProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/webapp/SiteminderAuthenticationProcessingFilterTests.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.webapp;
+package org.springframework.security.ui.webapp;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.MockAuthenticationManager;
-import org.acegisecurity.ui.WebAuthenticationDetails;
+import org.springframework.security.Authentication;
+import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.ui.WebAuthenticationDetails;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
@@ -42,7 +42,7 @@ public class SiteminderAuthenticationProcessingFilterTests extends TestCase {
 
     /**
      * Argument constructor.
-     * 
+     *
      * @param arg0
      */
     public SiteminderAuthenticationProcessingFilterTests(String arg0) {
@@ -61,7 +61,7 @@ public class SiteminderAuthenticationProcessingFilterTests extends TestCase {
     }
 
     /**
-     * 
+     *
      * @see junit.framework.TestCase#setUp()
      */
     public final void setUp() throws Exception {
diff --git a/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPointTests.java b/core/src/test/java/org/springframework/security/ui/x509/X509ProcessingFilterEntryPointTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPointTests.java
rename to core/src/test/java/org/springframework/security/ui/x509/X509ProcessingFilterEntryPointTests.java
index cfc564614b..878ecc0275 100644
--- a/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterEntryPointTests.java
+++ b/core/src/test/java/org/springframework/security/ui/x509/X509ProcessingFilterEntryPointTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.x509;
+package org.springframework.security.ui.x509;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.BadCredentialsException;
+import org.springframework.security.BadCredentialsException;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/x509/X509ProcessingFilterTests.java
similarity index 90%
rename from core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java
rename to core/src/test/java/org/springframework/security/ui/x509/X509ProcessingFilterTests.java
index 95fc70f392..9d74368062 100644
--- a/core/src/test/java/org/acegisecurity/ui/x509/X509ProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/x509/X509ProcessingFilterTests.java
@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.ui.x509;
+package org.springframework.security.ui.x509;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationManager;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.MockAuthenticationManager;
+import org.springframework.security.Authentication;
+import org.springframework.security.AuthenticationManager;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.MockAuthenticationManager;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.x509.X509AuthenticationToken;
-import org.acegisecurity.providers.x509.X509TestUtils;
+import org.springframework.security.providers.x509.X509AuthenticationToken;
+import org.springframework.security.providers.x509.X509TestUtils;
 
-import org.acegisecurity.ui.AbstractProcessingFilter;
+import org.springframework.security.ui.AbstractProcessingFilter;
 
-import org.acegisecurity.util.MockFilterChain;
+import org.springframework.security.util.MockFilterChain;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -41,7 +41,7 @@ import javax.servlet.ServletException;
 
 
 /**
- * Tests {@link org.acegisecurity.ui.x509.X509ProcessingFilter}.
+ * Tests {@link org.springframework.security.ui.x509.X509ProcessingFilter}.
  *
  * @author Luke Taylor
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/userdetails/UserTests.java b/core/src/test/java/org/springframework/security/userdetails/UserTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/userdetails/UserTests.java
rename to core/src/test/java/org/springframework/security/userdetails/UserTests.java
index 85e8f0d5c9..c98a69061d 100644
--- a/core/src/test/java/org/acegisecurity/userdetails/UserTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/UserTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails;
+package org.springframework.security.userdetails;
 
 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.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/HierarchicalRolesTestHelper.java b/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/HierarchicalRolesTestHelper.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/HierarchicalRolesTestHelper.java
rename to core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/HierarchicalRolesTestHelper.java
index e53e300d13..a637243c71 100755
--- a/core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/HierarchicalRolesTestHelper.java
+++ b/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/HierarchicalRolesTestHelper.java
@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.hierarchicalroles;
+package org.springframework.security.userdetails.hierarchicalroles;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.GrantedAuthority;
 import org.apache.commons.collections.CollectionUtils;
 
 /**
  * Test helper class for the hierarchical roles tests.
- * 
+ *
  * @author Michael Mayr
  */
 public abstract class HierarchicalRolesTestHelper {
@@ -39,5 +39,5 @@ public abstract class HierarchicalRolesTestHelper {
         CollectionUtils.addAll(authoritiesList2, authorities2);
         return CollectionUtils.isEqualCollection(authoritiesList1, authoritiesList2);
     }
-    
+
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/RoleHierarchyImplTests.java b/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImplTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/RoleHierarchyImplTests.java
rename to core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImplTests.java
index d32f65b489..d5a5c22ac5 100755
--- a/core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/RoleHierarchyImplTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImplTests.java
@@ -12,13 +12,12 @@
 * limitations under the License.
 */
 
-package org.acegisecurity.userdetails.hierarchicalroles;
+package org.springframework.security.userdetails.hierarchicalroles;
 
 import junit.framework.TestCase;
-import junit.textui.TestRunner;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
 /**
  * Tests for {@link RoleHierarchyImpl}.
diff --git a/core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/TestHelperTests.java b/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/TestHelperTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/TestHelperTests.java
rename to core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/TestHelperTests.java
index 74c8f85fc9..efd766fe46 100755
--- a/core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/TestHelperTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/TestHelperTests.java
@@ -12,13 +12,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.hierarchicalroles;
+package org.springframework.security.userdetails.hierarchicalroles;
 
 import junit.framework.TestCase;
-import junit.textui.TestRunner;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 
 /**
  * Tests for {@link HierarchicalRolesTestHelper}.
diff --git a/core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsServiceWrapperTests.java b/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapperTests.java
similarity index 87%
rename from core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsServiceWrapperTests.java
rename to core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapperTests.java
index b88ca785d0..5e9f5a39f3 100755
--- a/core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsServiceWrapperTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapperTests.java
@@ -1,13 +1,13 @@
-package org.acegisecurity.userdetails.hierarchicalroles;
+package org.springframework.security.userdetails.hierarchicalroles;
 
 import junit.textui.TestRunner;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UserDetailsService;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 import org.springframework.dao.DataAccessException;
@@ -17,7 +17,7 @@ public class UserDetailsServiceWrapperTests extends MockObjectTestCase {
 
     private UserDetailsService wrappedUserDetailsService = null;
     private UserDetailsServiceWrapper userDetailsServiceWrapper = null;
-    
+
     public UserDetailsServiceWrapperTests() {
         super();
     }
@@ -49,27 +49,27 @@ public class UserDetailsServiceWrapperTests extends MockObjectTestCase {
         GrantedAuthority[] authorities = new GrantedAuthority[] { new GrantedAuthorityImpl("ROLE_A"), new GrantedAuthorityImpl("ROLE_B") };
         UserDetails expectedUserDetails = new User("EXISTING_USER", "PASSWORD", true, true, true, true, authorities);
         UserDetails userDetails = userDetailsServiceWrapper.loadUserByUsername("EXISTING_USER");
-        assertEquals(expectedUserDetails.getPassword(), userDetails.getPassword()); 
+        assertEquals(expectedUserDetails.getPassword(), userDetails.getPassword());
         assertEquals(expectedUserDetails.getUsername(), userDetails.getUsername());
         assertEquals(expectedUserDetails.isAccountNonExpired(), userDetails.isAccountNonExpired());
         assertEquals(expectedUserDetails.isAccountNonLocked(), userDetails.isAccountNonLocked());
         assertEquals(expectedUserDetails.isCredentialsNonExpired(), expectedUserDetails.isCredentialsNonExpired());
         assertEquals(expectedUserDetails.isEnabled(), userDetails.isEnabled());
         assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(expectedUserDetails.getAuthorities(), userDetails.getAuthorities()));
-        
+
         try {
             userDetails = userDetailsServiceWrapper.loadUserByUsername("USERNAME_NOT_FOUND_EXCEPTION");
             fail("testLoadUserByUsername() - UsernameNotFoundException did not bubble up!");
         } catch (UsernameNotFoundException e) {}
-        
+
         try {
             userDetails = userDetailsServiceWrapper.loadUserByUsername("DATA_ACCESS_EXCEPTION");
             fail("testLoadUserByUsername() - DataAccessException did not bubble up!");
         } catch (DataAccessException e) {}
     }
-    
+
     public void testGetWrappedUserDetailsService() {
         assertTrue(userDetailsServiceWrapper.getWrappedUserDetailsService() == wrappedUserDetailsService);
     }
-   
+
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsWrapperTests.java b/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapperTests.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsWrapperTests.java
rename to core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapperTests.java
index 7c3a9c33bb..4e6f6391ff 100755
--- a/core/src/test/java/org/acegisecurity/userdetails/hierarchicalroles/UserDetailsWrapperTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapperTests.java
@@ -1,12 +1,11 @@
-package org.acegisecurity.userdetails.hierarchicalroles;
+package org.springframework.security.userdetails.hierarchicalroles;
 
 import junit.framework.TestCase;
-import junit.textui.TestRunner;
 
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
 
 /**
  * Tests for {@link UserDetailsWrapper}.
diff --git a/core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImplTests.java b/core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcDaoImplTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImplTests.java
rename to core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcDaoImplTests.java
index dcef6e4a2c..6912dbd77c 100644
--- a/core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImplTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcDaoImplTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.jdbc;
+package org.springframework.security.userdetails.jdbc;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.PopulatedDatabase;
+import org.springframework.security.PopulatedDatabase;
 
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 
 import org.springframework.jdbc.object.MappingSqlQuery;
 
diff --git a/core/src/test/java/org/acegisecurity/userdetails/ldap/InetOrgPersonTests.java b/core/src/test/java/org/springframework/security/userdetails/ldap/InetOrgPersonTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/userdetails/ldap/InetOrgPersonTests.java
rename to core/src/test/java/org/springframework/security/userdetails/ldap/InetOrgPersonTests.java
index cab21bf8c1..8f9c69c2ff 100644
--- a/core/src/test/java/org/acegisecurity/userdetails/ldap/InetOrgPersonTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/ldap/InetOrgPersonTests.java
@@ -1,4 +1,4 @@
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsManagerTests.java b/core/src/test/java/org/springframework/security/userdetails/ldap/LdapUserDetailsManagerTests.java
similarity index 90%
rename from core/src/test/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsManagerTests.java
rename to core/src/test/java/org/springframework/security/userdetails/ldap/LdapUserDetailsManagerTests.java
index 4e302328c0..bd41ee3d38 100644
--- a/core/src/test/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsManagerTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/ldap/LdapUserDetailsManagerTests.java
@@ -12,17 +12,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
-import org.acegisecurity.ldap.SpringSecurityLdapTemplate;
-import org.acegisecurity.ldap.AbstractLdapIntegrationTests;
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.BadCredentialsException;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.ldap.SpringSecurityLdapTemplate;
+import org.springframework.security.ldap.AbstractLdapIntegrationTests;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UsernameNotFoundException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.BadCredentialsException;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.context.SecurityContextHolder;
 
 import org.springframework.ldap.core.DirContextAdapter;
 
diff --git a/core/src/test/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsMapperTests.java b/core/src/test/java/org/springframework/security/userdetails/ldap/LdapUserDetailsMapperTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsMapperTests.java
rename to core/src/test/java/org/springframework/security/userdetails/ldap/LdapUserDetailsMapperTests.java
index 9290962413..367e29379c 100644
--- a/core/src/test/java/org/acegisecurity/userdetails/ldap/LdapUserDetailsMapperTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/ldap/LdapUserDetailsMapperTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.ldap;
+package org.springframework.security.userdetails.ldap;
 
 import junit.framework.TestCase;
 
@@ -22,7 +22,7 @@ import javax.naming.directory.BasicAttribute;
 
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;
-import org.acegisecurity.GrantedAuthority;
+import org.springframework.security.GrantedAuthority;
 
 /**
  * Tests {@link LdapUserDetailsMapper}.
diff --git a/core/src/test/java/org/acegisecurity/userdetails/memory/InMemoryDaoTests.java b/core/src/test/java/org/springframework/security/userdetails/memory/InMemoryDaoTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/userdetails/memory/InMemoryDaoTests.java
rename to core/src/test/java/org/springframework/security/userdetails/memory/InMemoryDaoTests.java
index 8b7b5557c7..74b880adb5 100644
--- a/core/src/test/java/org/acegisecurity/userdetails/memory/InMemoryDaoTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/memory/InMemoryDaoTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.memory;
+package org.springframework.security.userdetails.memory;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.userdetails.UsernameNotFoundException;
-import org.acegisecurity.userdetails.memory.InMemoryDaoImpl;
-import org.acegisecurity.userdetails.memory.UserMap;
-import org.acegisecurity.userdetails.memory.UserMapEditor;
+import org.springframework.security.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.memory.InMemoryDaoImpl;
+import org.springframework.security.userdetails.memory.UserMap;
+import org.springframework.security.userdetails.memory.UserMapEditor;
 
 import java.util.Properties;
 
diff --git a/core/src/test/java/org/acegisecurity/userdetails/memory/UserAttributeEditorTests.java b/core/src/test/java/org/springframework/security/userdetails/memory/UserAttributeEditorTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/userdetails/memory/UserAttributeEditorTests.java
rename to core/src/test/java/org/springframework/security/userdetails/memory/UserAttributeEditorTests.java
index f392fb8403..68ca0bf1b4 100644
--- a/core/src/test/java/org/acegisecurity/userdetails/memory/UserAttributeEditorTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/memory/UserAttributeEditorTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.memory;
+package org.springframework.security.userdetails.memory;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.userdetails.memory.UserAttribute;
-import org.acegisecurity.userdetails.memory.UserAttributeEditor;
+import org.springframework.security.userdetails.memory.UserAttribute;
+import org.springframework.security.userdetails.memory.UserAttributeEditor;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/userdetails/memory/UserMapEditorTests.java b/core/src/test/java/org/springframework/security/userdetails/memory/UserMapEditorTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/userdetails/memory/UserMapEditorTests.java
rename to core/src/test/java/org/springframework/security/userdetails/memory/UserMapEditorTests.java
index 68cdff5dd0..a02f02045c 100644
--- a/core/src/test/java/org/acegisecurity/userdetails/memory/UserMapEditorTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/memory/UserMapEditorTests.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.memory;
+package org.springframework.security.userdetails.memory;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.userdetails.memory.UserMap;
-import org.acegisecurity.userdetails.memory.UserMapEditor;
+import org.springframework.security.userdetails.memory.UserMap;
+import org.springframework.security.userdetails.memory.UserMapEditor;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/userdetails/memory/UserMapTests.java b/core/src/test/java/org/springframework/security/userdetails/memory/UserMapTests.java
similarity index 88%
rename from core/src/test/java/org/acegisecurity/userdetails/memory/UserMapTests.java
rename to core/src/test/java/org/springframework/security/userdetails/memory/UserMapTests.java
index cd56b15f8f..0bf3642d7e 100644
--- a/core/src/test/java/org/acegisecurity/userdetails/memory/UserMapTests.java
+++ b/core/src/test/java/org/springframework/security/userdetails/memory/UserMapTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.userdetails.memory;
+package org.springframework.security.userdetails.memory;
 
 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.userdetails.User;
-import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
-import org.acegisecurity.userdetails.memory.UserMap;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UsernameNotFoundException;
+import org.springframework.security.userdetails.memory.UserMap;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/util/EncryptionUtilsTests.java b/core/src/test/java/org/springframework/security/util/EncryptionUtilsTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/util/EncryptionUtilsTests.java
rename to core/src/test/java/org/springframework/security/util/EncryptionUtilsTests.java
index 121df1b6a5..4c0b2a4359 100644
--- a/core/src/test/java/org/acegisecurity/util/EncryptionUtilsTests.java
+++ b/core/src/test/java/org/springframework/security/util/EncryptionUtilsTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.util.EncryptionUtils.EncryptionException;
+import org.springframework.security.util.EncryptionUtils.EncryptionException;
 
 /**
  * JUnit tests for EncryptionUtils.
diff --git a/core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java b/core/src/test/java/org/springframework/security/util/FilterChainProxyTests.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java
rename to core/src/test/java/org/springframework/security/util/FilterChainProxyTests.java
index af1f5ee48b..7d758b75dd 100644
--- a/core/src/test/java/org/acegisecurity/util/FilterChainProxyTests.java
+++ b/core/src/test/java/org/springframework/security/util/FilterChainProxyTests.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockApplicationContext;
-import org.acegisecurity.MockFilterConfig;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockApplicationContext;
+import org.springframework.security.MockFilterConfig;
 
-import org.acegisecurity.intercept.web.FilterInvocationDefinitionSource;
-import org.acegisecurity.intercept.web.MockFilterInvocationDefinitionSource;
-import org.acegisecurity.intercept.web.PathBasedFilterInvocationDefinitionMap;
+import org.springframework.security.intercept.web.FilterInvocationDefinitionSource;
+import org.springframework.security.intercept.web.MockFilterInvocationDefinitionSource;
+import org.springframework.security.intercept.web.PathBasedFilterInvocationDefinitionMap;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -111,7 +111,7 @@ public class FilterChainProxyTests extends TestCase {
     }
 
     public void testDoNotFilter() throws Exception {
-        ApplicationContext appCtx = new ClassPathXmlApplicationContext("org/acegisecurity/util/filtertest-valid.xml");
+        ApplicationContext appCtx = new ClassPathXmlApplicationContext("org/springframework/security/util/filtertest-valid.xml");
         FilterChainProxy filterChainProxy = (FilterChainProxy) appCtx.getBean("filterChain", FilterChainProxy.class);
         MockFilter filter = (MockFilter) appCtx.getBean("mockFilter", MockFilter.class);
 
@@ -135,7 +135,7 @@ public class FilterChainProxyTests extends TestCase {
     }
 
     public void testNormalOperation() throws Exception {
-        ApplicationContext appCtx = new ClassPathXmlApplicationContext("org/acegisecurity/util/filtertest-valid.xml");
+        ApplicationContext appCtx = new ClassPathXmlApplicationContext("org/springframework/security/util/filtertest-valid.xml");
         FilterChainProxy filterChainProxy = (FilterChainProxy) appCtx.getBean("filterChain", FilterChainProxy.class);
         MockFilter filter = (MockFilter) appCtx.getBean("mockFilter", MockFilter.class);
         assertFalse(filter.isWasInitialized());
diff --git a/core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java b/core/src/test/java/org/springframework/security/util/FilterToBeanProxyTests.java
similarity index 88%
rename from core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java
rename to core/src/test/java/org/springframework/security/util/FilterToBeanProxyTests.java
index 29b2618f54..42aaac4a08 100644
--- a/core/src/test/java/org/acegisecurity/util/FilterToBeanProxyTests.java
+++ b/core/src/test/java/org/springframework/security/util/FilterToBeanProxyTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.MockFilterConfig;
+import org.springframework.security.MockFilterConfig;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -75,7 +75,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockFilterConfig config = new MockFilterConfig();
         config.setInitParmeter("targetClass", "net.sf.DOES.NOT.EXIST");
 
-        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/acegisecurity/util/filtertest-valid.xml");
+        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/springframework/security/util/filtertest-valid.xml");
 
         try {
             filter.init(config);
@@ -89,7 +89,7 @@ public class FilterToBeanProxyTests extends TestCase {
         // Setup our filter
         MockFilterConfig config = new MockFilterConfig();
 
-        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/acegisecurity/util/filtertest-valid.xml");
+        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/springframework/security/util/filtertest-valid.xml");
 
         try {
             filter.init(config);
@@ -102,9 +102,9 @@ public class FilterToBeanProxyTests extends TestCase {
     public void testDetectsTargetBeanIsNotAFilter() throws Exception {
         // Setup our filter
         MockFilterConfig config = new MockFilterConfig();
-        config.setInitParmeter("targetClass", "org.acegisecurity.util.MockNotAFilter");
+        config.setInitParmeter("targetClass", "org.springframework.security.util.MockNotAFilter");
 
-        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/acegisecurity/util/filtertest-valid.xml");
+        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/springframework/security/util/filtertest-valid.xml");
 
         try {
             filter.init(config);
@@ -120,7 +120,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockFilterConfig config = new MockFilterConfig();
         config.setInitParmeter("targetBean", "WRONG_NAME");
 
-        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/acegisecurity/util/filtertest-valid.xml");
+        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/springframework/security/util/filtertest-valid.xml");
 
         try {
             filter.init(config);
@@ -134,15 +134,15 @@ public class FilterToBeanProxyTests extends TestCase {
         throws Exception {
         // Setup our filter
         MockFilterConfig config = new MockFilterConfig();
-        config.setInitParmeter("targetClass", "org.acegisecurity.util.FilterToBeanProxyTests");
+        config.setInitParmeter("targetClass", "org.springframework.security.util.FilterToBeanProxyTests");
 
-        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/acegisecurity/util/filtertest-valid.xml");
+        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/springframework/security/util/filtertest-valid.xml");
 
         try {
             filter.init(config);
             fail("Should have thrown ServletException");
         } catch (ServletException expected) {
-            assertEquals("Bean context must contain at least one bean of type org.acegisecurity.util.FilterToBeanProxyTests",
+            assertEquals("Bean context must contain at least one bean of type org.springframework.security.util.FilterToBeanProxyTests",
                 expected.getMessage());
         }
     }
@@ -150,7 +150,7 @@ public class FilterToBeanProxyTests extends TestCase {
     public void testIgnoresEmptyTargetBean() throws Exception {
         // Setup our filter
         MockFilterConfig config = new MockFilterConfig();
-        config.setInitParmeter("targetClass", "org.acegisecurity.util.MockFilter");
+        config.setInitParmeter("targetClass", "org.springframework.security.util.MockFilter");
         config.setInitParmeter("targetBean", "");
 
         // Setup our expectation that the filter chain will be invoked
@@ -159,7 +159,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockHttpServletResponse response = new MockHttpServletResponse();
         MockHttpServletRequest request = new MockHttpServletRequest();
 
-        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/acegisecurity/util/filtertest-valid.xml");
+        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/springframework/security/util/filtertest-valid.xml");
 
         executeFilterInContainerSimulator(config, filter, request, response, chain);
     }
@@ -176,7 +176,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockHttpServletResponse response = new MockHttpServletResponse();
         MockHttpServletRequest request = new MockHttpServletRequest();
 
-        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/acegisecurity/util/filtertest-valid.xml");
+        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/springframework/security/util/filtertest-valid.xml");
 
         executeFilterInContainerSimulator(config, filter, request, response, chain);
     }
@@ -193,7 +193,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockHttpServletResponse response = new MockHttpServletResponse();
         MockHttpServletRequest request = new MockHttpServletRequest();
 
-        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/acegisecurity/util/filtertest-valid.xml");
+        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/springframework/security/util/filtertest-valid.xml");
 
         executeFilterInContainerSimulator(config, filter, request, response, chain);
     }
@@ -201,7 +201,7 @@ public class FilterToBeanProxyTests extends TestCase {
     public void testNormalOperationWithTargetClass() throws Exception {
         // Setup our filter
         MockFilterConfig config = new MockFilterConfig();
-        config.setInitParmeter("targetClass", "org.acegisecurity.util.MockFilter");
+        config.setInitParmeter("targetClass", "org.springframework.security.util.MockFilter");
 
         // Setup our expectation that the filter chain will be invoked
         MockFilterChain chain = new MockFilterChain(true);
@@ -209,7 +209,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockHttpServletResponse response = new MockHttpServletResponse();
         MockHttpServletRequest request = new MockHttpServletRequest();
 
-        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/acegisecurity/util/filtertest-valid.xml");
+        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/springframework/security/util/filtertest-valid.xml");
 
         executeFilterInContainerSimulator(config, filter, request, response, chain);
     }
@@ -227,7 +227,7 @@ public class FilterToBeanProxyTests extends TestCase {
         MockHttpServletResponse response = new MockHttpServletResponse();
         MockHttpServletRequest request = new MockHttpServletRequest();
 
-        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/acegisecurity/util/filtertest-valid.xml");
+        FilterToBeanProxy filter = new MockFilterToBeanProxy("org/springframework/security/util/filtertest-valid.xml");
 
         // do not init (which would hapen if called .doFilter)
         filter.destroy();
diff --git a/core/src/test/java/org/acegisecurity/util/MockFilter.java b/core/src/test/java/org/springframework/security/util/MockFilter.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/util/MockFilter.java
rename to core/src/test/java/org/springframework/security/util/MockFilter.java
index 04d7022f15..c33a94f24a 100644
--- a/core/src/test/java/org/acegisecurity/util/MockFilter.java
+++ b/core/src/test/java/org/springframework/security/util/MockFilter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/acegisecurity/util/MockFilterChain.java b/core/src/test/java/org/springframework/security/util/MockFilterChain.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/util/MockFilterChain.java
rename to core/src/test/java/org/springframework/security/util/MockFilterChain.java
index 8206b4f7fe..8554a98d39 100644
--- a/core/src/test/java/org/acegisecurity/util/MockFilterChain.java
+++ b/core/src/test/java/org/springframework/security/util/MockFilterChain.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/util/MockNotAFilter.java b/core/src/test/java/org/springframework/security/util/MockNotAFilter.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/util/MockNotAFilter.java
rename to core/src/test/java/org/springframework/security/util/MockNotAFilter.java
index 5a17676799..9eda38538b 100644
--- a/core/src/test/java/org/acegisecurity/util/MockNotAFilter.java
+++ b/core/src/test/java/org/springframework/security/util/MockNotAFilter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 /**
  * A class that is not a filter.
diff --git a/core/src/test/java/org/acegisecurity/util/PortMapperImplTests.java b/core/src/test/java/org/springframework/security/util/PortMapperImplTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/util/PortMapperImplTests.java
rename to core/src/test/java/org/springframework/security/util/PortMapperImplTests.java
index 7fa0656b8b..8581fc9e85 100644
--- a/core/src/test/java/org/acegisecurity/util/PortMapperImplTests.java
+++ b/core/src/test/java/org/springframework/security/util/PortMapperImplTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java b/core/src/test/java/org/springframework/security/util/PortResolverImplTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java
rename to core/src/test/java/org/springframework/security/util/PortResolverImplTests.java
index d672eb28bc..128ceec0b5 100644
--- a/core/src/test/java/org/acegisecurity/util/PortResolverImplTests.java
+++ b/core/src/test/java/org/springframework/security/util/PortResolverImplTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import junit.framework.TestCase;
 
diff --git a/core/src/test/java/org/acegisecurity/util/StringSplitUtilsTests.java b/core/src/test/java/org/springframework/security/util/StringSplitUtilsTests.java
similarity index 98%
rename from core/src/test/java/org/acegisecurity/util/StringSplitUtilsTests.java
rename to core/src/test/java/org/springframework/security/util/StringSplitUtilsTests.java
index 07b203ad9f..fc1dd376de 100644
--- a/core/src/test/java/org/acegisecurity/util/StringSplitUtilsTests.java
+++ b/core/src/test/java/org/springframework/security/util/StringSplitUtilsTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.util;
+package org.springframework.security.util;
 
 import junit.framework.TestCase;
 
@@ -23,7 +23,7 @@ import java.util.Map;
 
 
 /**
- * Tests {@link org.acegisecurity.util.StringSplitUtils}.
+ * Tests {@link org.springframework.security.util.StringSplitUtils}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/vote/AbstractAccessDecisionManagerTests.java b/core/src/test/java/org/springframework/security/vote/AbstractAccessDecisionManagerTests.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/vote/AbstractAccessDecisionManagerTests.java
rename to core/src/test/java/org/springframework/security/vote/AbstractAccessDecisionManagerTests.java
index 887e019316..7281ebc6f4 100644
--- a/core/src/test/java/org/acegisecurity/vote/AbstractAccessDecisionManagerTests.java
+++ b/core/src/test/java/org/springframework/security/vote/AbstractAccessDecisionManagerTests.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.SecurityConfig;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/vote/AffirmativeBasedTests.java b/core/src/test/java/org/springframework/security/vote/AffirmativeBasedTests.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/vote/AffirmativeBasedTests.java
rename to core/src/test/java/org/springframework/security/vote/AffirmativeBasedTests.java
index bcc66cc384..0549f25377 100644
--- a/core/src/test/java/org/acegisecurity/vote/AffirmativeBasedTests.java
+++ b/core/src/test/java/org/springframework/security/vote/AffirmativeBasedTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/vote/AuthenticatedVoterTests.java b/core/src/test/java/org/springframework/security/vote/AuthenticatedVoterTests.java
similarity index 88%
rename from core/src/test/java/org/acegisecurity/vote/AuthenticatedVoterTests.java
rename to core/src/test/java/org/springframework/security/vote/AuthenticatedVoterTests.java
index ebcd24d69e..65719bb1c7 100644
--- a/core/src/test/java/org/acegisecurity/vote/AuthenticatedVoterTests.java
+++ b/core/src/test/java/org/springframework/security/vote/AuthenticatedVoterTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
-import org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken;
+import org.springframework.security.providers.rememberme.RememberMeAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/vote/BasicAclEntryVoterTests.java b/core/src/test/java/org/springframework/security/vote/BasicAclEntryVoterTests.java
similarity index 97%
rename from core/src/test/java/org/acegisecurity/vote/BasicAclEntryVoterTests.java
rename to core/src/test/java/org/springframework/security/vote/BasicAclEntryVoterTests.java
index dc2916a12e..9b87188640 100644
--- a/core/src/test/java/org/acegisecurity/vote/BasicAclEntryVoterTests.java
+++ b/core/src/test/java/org/springframework/security/vote/BasicAclEntryVoterTests.java
@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AuthorizationServiceException;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.MockAclManager;
-import org.acegisecurity.SecurityConfig;
-import org.acegisecurity.acl.AclEntry;
-import org.acegisecurity.acl.AclManager;
-import org.acegisecurity.acl.basic.MockAclObjectIdentity;
-import org.acegisecurity.acl.basic.SimpleAclEntry;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.acegisecurity.util.SimpleMethodInvocation;
+import org.springframework.security.AuthorizationServiceException;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.MockAclManager;
+import org.springframework.security.SecurityConfig;
+import org.springframework.security.acl.AclEntry;
+import org.springframework.security.acl.AclManager;
+import org.springframework.security.acl.basic.MockAclObjectIdentity;
+import org.springframework.security.acl.basic.SimpleAclEntry;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.util.SimpleMethodInvocation;
 import org.aopalliance.intercept.MethodInvocation;
 import org.aspectj.lang.JoinPoint;
 
diff --git a/core/src/test/java/org/acegisecurity/vote/ConsensusBasedTests.java b/core/src/test/java/org/springframework/security/vote/ConsensusBasedTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/vote/ConsensusBasedTests.java
rename to core/src/test/java/org/springframework/security/vote/ConsensusBasedTests.java
index 4216eff071..044c68bb75 100644
--- a/core/src/test/java/org/acegisecurity/vote/ConsensusBasedTests.java
+++ b/core/src/test/java/org/springframework/security/vote/ConsensusBasedTests.java
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import java.util.List;
 import java.util.Vector;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.SecurityConfig;
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.SecurityConfig;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/vote/DenyAgainVoter.java b/core/src/test/java/org/springframework/security/vote/DenyAgainVoter.java
similarity index 88%
rename from core/src/test/java/org/acegisecurity/vote/DenyAgainVoter.java
rename to core/src/test/java/org/springframework/security/vote/DenyAgainVoter.java
index 47bfcf225e..3a0b22eda4 100644
--- a/core/src/test/java/org/acegisecurity/vote/DenyAgainVoter.java
+++ b/core/src/test/java/org/springframework/security/vote/DenyAgainVoter.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
 
 import java.util.Iterator;
 
@@ -30,7 +30,7 @@ import java.util.Iterator;
  * 

  * All comparisons are case sensitive.
  * 

- * 
+ *
  * @author Ben Alex
  * @version $Id$
  */
@@ -64,5 +64,5 @@ public class DenyAgainVoter implements AccessDecisionVoter {
 
 		return ACCESS_ABSTAIN;
 	}
-	
+
 }
diff --git a/core/src/test/java/org/acegisecurity/vote/DenyVoter.java b/core/src/test/java/org/springframework/security/vote/DenyVoter.java
similarity index 89%
rename from core/src/test/java/org/acegisecurity/vote/DenyVoter.java
rename to core/src/test/java/org/springframework/security/vote/DenyVoter.java
index 69687cead6..dd7c1a177e 100644
--- a/core/src/test/java/org/acegisecurity/vote/DenyVoter.java
+++ b/core/src/test/java/org/springframework/security/vote/DenyVoter.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.ConfigAttribute;
-import org.acegisecurity.ConfigAttributeDefinition;
+import org.springframework.security.Authentication;
+import org.springframework.security.ConfigAttribute;
+import org.springframework.security.ConfigAttributeDefinition;
 
 import java.util.Iterator;
 
diff --git a/core/src/test/java/org/acegisecurity/vote/LabelBasedAclVoterTests.java b/core/src/test/java/org/springframework/security/vote/LabelBasedAclVoterTests.java
similarity index 93%
rename from core/src/test/java/org/acegisecurity/vote/LabelBasedAclVoterTests.java
rename to core/src/test/java/org/springframework/security/vote/LabelBasedAclVoterTests.java
index 1f3663062a..c55b421bcc 100644
--- a/core/src/test/java/org/acegisecurity/vote/LabelBasedAclVoterTests.java
+++ b/core/src/test/java/org/springframework/security/vote/LabelBasedAclVoterTests.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.AuthenticationManager;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.AuthenticationManager;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
@@ -41,7 +41,7 @@ public class LabelBasedAclVoterTests extends AbstractDependencyInjectionSpringCo
     //~ Methods ========================================================================================================
 
     protected String[] getConfigLocations() {
-        return new String[] {"org/acegisecurity/vote/labelBasedSecurityApplicationContext.xml"};
+        return new String[] {"org/springframework/security/vote/labelBasedSecurityApplicationContext.xml"};
     }
 
     public SampleService getSampleService() {
diff --git a/core/src/test/java/org/acegisecurity/vote/SampleBlockOfData.java b/core/src/test/java/org/springframework/security/vote/SampleBlockOfData.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/vote/SampleBlockOfData.java
rename to core/src/test/java/org/springframework/security/vote/SampleBlockOfData.java
index 1f10a22fcf..d70902abb0 100644
--- a/core/src/test/java/org/acegisecurity/vote/SampleBlockOfData.java
+++ b/core/src/test/java/org/springframework/security/vote/SampleBlockOfData.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.vote.LabeledData;
+import org.springframework.security.vote.LabeledData;
 
 import java.io.Serializable;
 
diff --git a/core/src/test/java/org/acegisecurity/vote/SampleService.java b/core/src/test/java/org/springframework/security/vote/SampleService.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/vote/SampleService.java
rename to core/src/test/java/org/springframework/security/vote/SampleService.java
index ea09c2574a..bab6a40bf6 100644
--- a/core/src/test/java/org/acegisecurity/vote/SampleService.java
+++ b/core/src/test/java/org/springframework/security/vote/SampleService.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import java.util.List;
 
diff --git a/core/src/test/java/org/acegisecurity/vote/SampleServiceImpl.java b/core/src/test/java/org/springframework/security/vote/SampleServiceImpl.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/vote/SampleServiceImpl.java
rename to core/src/test/java/org/springframework/security/vote/SampleServiceImpl.java
index b535598019..01a946b9aa 100644
--- a/core/src/test/java/org/acegisecurity/vote/SampleServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/vote/SampleServiceImpl.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextHolder;
 
 import org.apache.log4j.Logger;
 
diff --git a/core/src/test/java/org/acegisecurity/vote/SomeDomainObject.java b/core/src/test/java/org/springframework/security/vote/SomeDomainObject.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/vote/SomeDomainObject.java
rename to core/src/test/java/org/springframework/security/vote/SomeDomainObject.java
index 2daebd2577..e86ac9d51f 100644
--- a/core/src/test/java/org/acegisecurity/vote/SomeDomainObject.java
+++ b/core/src/test/java/org/springframework/security/vote/SomeDomainObject.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 /**
  * Simple domain object, used by {@link BasicAclEntryVoterTests}.
diff --git a/core/src/test/java/org/acegisecurity/vote/SomeDomainObjectManager.java b/core/src/test/java/org/springframework/security/vote/SomeDomainObjectManager.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/vote/SomeDomainObjectManager.java
rename to core/src/test/java/org/springframework/security/vote/SomeDomainObjectManager.java
index da6417eee7..542c975b2c 100644
--- a/core/src/test/java/org/acegisecurity/vote/SomeDomainObjectManager.java
+++ b/core/src/test/java/org/springframework/security/vote/SomeDomainObjectManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 /**
  * Used by {@link BasicAclEntryVoterTests} so it can create a MethodInvocation contining
diff --git a/core/src/test/java/org/acegisecurity/vote/UnanimousBasedTests.java b/core/src/test/java/org/springframework/security/vote/UnanimousBasedTests.java
similarity index 94%
rename from core/src/test/java/org/acegisecurity/vote/UnanimousBasedTests.java
rename to core/src/test/java/org/springframework/security/vote/UnanimousBasedTests.java
index c574a3f44e..a4dfaa38c3 100644
--- a/core/src/test/java/org/acegisecurity/vote/UnanimousBasedTests.java
+++ b/core/src/test/java/org/springframework/security/vote/UnanimousBasedTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.vote;
+package org.springframework.security.vote;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.AccessDeniedException;
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.SecurityConfig;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.SecurityConfig;
 
-import org.acegisecurity.providers.TestingAuthenticationToken;
+import org.springframework.security.providers.TestingAuthenticationToken;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilterTests.java b/core/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilterTests.java
similarity index 96%
rename from core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilterTests.java
rename to core/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilterTests.java
index 902b834b7c..9bd8227913 100644
--- a/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestFilterTests.java
+++ b/core/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilterTests.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.wrapper;
+package org.springframework.security.wrapper;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.MockFilterConfig;
+import org.springframework.security.MockFilterConfig;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapperTests.java b/core/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapperTests.java
similarity index 92%
rename from core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapperTests.java
rename to core/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapperTests.java
index 180b714c44..b364d70708 100644
--- a/core/src/test/java/org/acegisecurity/wrapper/SecurityContextHolderAwareRequestWrapperTests.java
+++ b/core/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapperTests.java
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.acegisecurity.wrapper;
+package org.springframework.security.wrapper;
 
 import junit.framework.TestCase;
 
-import org.acegisecurity.Authentication;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.providers.TestingAuthenticationToken;
-import org.acegisecurity.userdetails.User;
-import org.acegisecurity.util.PortResolverImpl;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.providers.TestingAuthenticationToken;
+import org.springframework.security.userdetails.User;
+import org.springframework.security.util.PortResolverImpl;
 import org.springframework.mock.web.MockHttpServletRequest;
 
 
diff --git a/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties
index 1ee4259441..58c3bbb44a 100644
--- a/core/src/test/resources/log4j.properties
+++ b/core/src/test/resources/log4j.properties
@@ -8,4 +8,4 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n
 
-log4j.category.org.acegisecurity=DEBUG
+log4j.category.org.springframework.security=DEBUG
diff --git a/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.conf b/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.conf
deleted file mode 100644
index 0de33f9462..0000000000
--- a/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-JAASTest2 {
-    org.acegisecurity.providers.jaas.TestLoginModule required;
-};
\ No newline at end of file
diff --git a/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.xml b/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.xml
deleted file mode 100644
index 4b2dc16ff5..0000000000
--- a/core/src/test/resources/org/acegisecurity/providers/jaas/JaasAuthenticationProviderTests.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-    
-
-    
-        
-            JAASTest
-        
-        
-            classpath:org/acegisecurity/providers/jaas/login.conf
-        
-        
-            
-                
-                
-                
-            
-        
-        
-            
-                
-            
-        
-    
-
\ No newline at end of file
diff --git a/core/src/test/resources/org/acegisecurity/providers/jaas/login.conf b/core/src/test/resources/org/acegisecurity/providers/jaas/login.conf
deleted file mode 100644
index f9ccb89597..0000000000
--- a/core/src/test/resources/org/acegisecurity/providers/jaas/login.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-JAASTest {
-    org.acegisecurity.providers.jaas.TestLoginModule required;
-};
\ No newline at end of file
diff --git a/core/src/test/resources/org/acegisecurity/acls/jdbc/applicationContext-test.xml b/core/src/test/resources/org/springframework/security/acls/jdbc/applicationContext-test.xml
similarity index 68%
rename from core/src/test/resources/org/acegisecurity/acls/jdbc/applicationContext-test.xml
rename to core/src/test/resources/org/springframework/security/acls/jdbc/applicationContext-test.xml
index 3cd882ab8d..3d18741df7 100644
--- a/core/src/test/resources/org/acegisecurity/acls/jdbc/applicationContext-test.xml
+++ b/core/src/test/resources/org/springframework/security/acls/jdbc/applicationContext-test.xml
@@ -11,16 +11,16 @@
 
 
 
-	
+	
 		
-		
+		
 	
-	
-	
-		
-	
-	
-	
+
+	
+		
+	
+
+	
 		
 		   
 		      
@@ -32,36 +32,36 @@
 		   
 		
 	
-    
-	
+
+	
 		
-		
-		
-		
-			
+		
+		
+		
+			
 		
-	
-	
-	
-		
-			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-			
-		
 	
-	
-	
+
+	
+		
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+		
+	
+
+	
 		
-		
-		
+		
+		
 	
 
     
@@ -69,8 +69,8 @@
             org.hsqldb.jdbcDriver
         
         
-            jdbc:hsqldb:mem:test
-            
+            jdbc:hsqldb:mem:test
+            
         
         
             sa
@@ -79,5 +79,5 @@
             
         
     
-	
+
 
diff --git a/core/src/test/resources/org/acegisecurity/acls/jdbc/select.sql b/core/src/test/resources/org/springframework/security/acls/jdbc/select.sql
similarity index 100%
rename from core/src/test/resources/org/acegisecurity/acls/jdbc/select.sql
rename to core/src/test/resources/org/springframework/security/acls/jdbc/select.sql
diff --git a/core/src/test/resources/org/acegisecurity/acls/jdbc/testData.sql b/core/src/test/resources/org/springframework/security/acls/jdbc/testData.sql
similarity index 100%
rename from core/src/test/resources/org/acegisecurity/acls/jdbc/testData.sql
rename to core/src/test/resources/org/springframework/security/acls/jdbc/testData.sql
diff --git a/core/src/test/resources/org/acegisecurity/applicationContext.xml b/core/src/test/resources/org/springframework/security/applicationContext.xml
similarity index 86%
rename from core/src/test/resources/org/acegisecurity/applicationContext.xml
rename to core/src/test/resources/org/springframework/security/applicationContext.xml
index 290ff6f467..6195bf67ed 100644
--- a/core/src/test/resources/org/acegisecurity/applicationContext.xml
+++ b/core/src/test/resources/org/springframework/security/applicationContext.xml
@@ -21,17 +21,17 @@
 
 
    
-   
+   
 
    
-   
+   
 
    
    
       
          classpath:/ehcache-failsafe.xml
       
-     
+   
 
    
       
diff --git a/core/src/test/resources/org/acegisecurity/intercept/method/aopalliance/applicationContext.xml b/core/src/test/resources/org/springframework/security/intercept/method/aopalliance/applicationContext.xml
similarity index 57%
rename from core/src/test/resources/org/acegisecurity/intercept/method/aopalliance/applicationContext.xml
rename to core/src/test/resources/org/springframework/security/intercept/method/aopalliance/applicationContext.xml
index 5cb60fde4d..a3bbb6b66a 100644
--- a/core/src/test/resources/org/acegisecurity/intercept/method/aopalliance/applicationContext.xml
+++ b/core/src/test/resources/org/springframework/security/intercept/method/aopalliance/applicationContext.xml
@@ -20,31 +20,31 @@
 
 
 
-	
-	
-	
-	
+	
+	
+	
+	
 
-   
+   
 
-	
+	
 		
 		
 		
 		
 		
 			
-				org.acegisecurity.ITargetObject.makeLower*=MOCK_LOWER
-				org.acegisecurity.ITargetObject.makeUpper*=MOCK_UPPER,RUN_AS
-				org.acegisecurity.ITargetObject.computeHashCode*=MOCK_HASH,AFTER_INVOCATION_MOCK
-			
+                org.springframework.security.ITargetObject.makeLower*=MOCK_LOWER
+                org.springframework.security.ITargetObject.makeUpper*=MOCK_UPPER,RUN_AS
+                org.springframework.security.ITargetObject.computeHashCode*=MOCK_HASH,AFTER_INVOCATION_MOCK
+            
 		
 	
-	
-	
+
+	
 
     
-      org.acegisecurity.ITargetObject
+      org.springframework.security.ITargetObject
       
          
             
diff --git a/core/src/test/resources/org/acegisecurity/intercept/method/applicationContext.xml b/core/src/test/resources/org/springframework/security/intercept/method/applicationContext.xml
similarity index 62%
rename from core/src/test/resources/org/acegisecurity/intercept/method/applicationContext.xml
rename to core/src/test/resources/org/springframework/security/intercept/method/applicationContext.xml
index 608028eec7..a358e61ce1 100644
--- a/core/src/test/resources/org/acegisecurity/intercept/method/applicationContext.xml
+++ b/core/src/test/resources/org/springframework/security/intercept/method/applicationContext.xml
@@ -20,16 +20,16 @@
 
 
 
-	
-	
-	
-	
+	
+	
+	
+	
 
-	
+	
 		
 	
-	
-	
+
+	
 		
 		
 		
@@ -37,11 +37,11 @@
 			
 		
 	
-	
-	
+
+	
 
     
-      org.acegisecurity.ITargetObject
+      org.springframework.security.ITargetObject
       
          
             
@@ -50,6 +50,6 @@
       
     
 
-   
+   
 
 
diff --git a/core/src/test/resources/org/acegisecurity/intercept/web/applicationContext.xml b/core/src/test/resources/org/springframework/security/intercept/web/applicationContext.xml
similarity index 77%
rename from core/src/test/resources/org/acegisecurity/intercept/web/applicationContext.xml
rename to core/src/test/resources/org/springframework/security/intercept/web/applicationContext.xml
index e40ed74516..75a9fcb063 100644
--- a/core/src/test/resources/org/acegisecurity/intercept/web/applicationContext.xml
+++ b/core/src/test/resources/org/springframework/security/intercept/web/applicationContext.xml
@@ -19,11 +19,11 @@
 -->
 
 
-	
-	
-	
+	
+	
+	
 
-	
+	
 		
 		
 		
diff --git a/core/src/test/resources/org/acegisecurity/ldap/apacheDsContext.xml b/core/src/test/resources/org/springframework/security/ldap/apacheDsContext.xml
similarity index 93%
rename from core/src/test/resources/org/acegisecurity/ldap/apacheDsContext.xml
rename to core/src/test/resources/org/springframework/security/ldap/apacheDsContext.xml
index 08f546f0f4..6d5a3de4f6 100644
--- a/core/src/test/resources/org/acegisecurity/ldap/apacheDsContext.xml
+++ b/core/src/test/resources/org/springframework/security/ldap/apacheDsContext.xml
@@ -50,7 +50,7 @@
     	
 	
 
-	
+	
 		
 		
 	
@@ -64,7 +64,7 @@
         
 	
 
-	
+	
 		
 	 
 
diff --git a/core/src/test/resources/org/acegisecurity/ldap/ldapIntegrationTestContext.xml b/core/src/test/resources/org/springframework/security/ldap/ldapIntegrationTestContext.xml
similarity index 80%
rename from core/src/test/resources/org/acegisecurity/ldap/ldapIntegrationTestContext.xml
rename to core/src/test/resources/org/springframework/security/ldap/ldapIntegrationTestContext.xml
index ed2d9b14da..c0cef29064 100644
--- a/core/src/test/resources/org/acegisecurity/ldap/ldapIntegrationTestContext.xml
+++ b/core/src/test/resources/org/springframework/security/ldap/ldapIntegrationTestContext.xml
@@ -4,10 +4,10 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-    
+    
 
 	
-		
+		
 	
 
-    
+    
         
         
 		
@@ -27,7 +27,7 @@
 	
 
     
-    
+    
         
         
         
diff --git a/core/src/test/resources/org/acegisecurity/ldap/ldapserver.properties b/core/src/test/resources/org/springframework/security/ldap/ldapserver.properties
similarity index 100%
rename from core/src/test/resources/org/acegisecurity/ldap/ldapserver.properties
rename to core/src/test/resources/org/springframework/security/ldap/ldapserver.properties
diff --git a/core/src/test/resources/org/acegisecurity/ldap/setup_data.ldif b/core/src/test/resources/org/springframework/security/ldap/setup_data.ldif
similarity index 100%
rename from core/src/test/resources/org/acegisecurity/ldap/setup_data.ldif
rename to core/src/test/resources/org/springframework/security/ldap/setup_data.ldif
diff --git a/core/src/test/resources/org/springframework/security/providers/jaas/JaasAuthenticationProviderTests.conf b/core/src/test/resources/org/springframework/security/providers/jaas/JaasAuthenticationProviderTests.conf
new file mode 100644
index 0000000000..022c32c4db
--- /dev/null
+++ b/core/src/test/resources/org/springframework/security/providers/jaas/JaasAuthenticationProviderTests.conf
@@ -0,0 +1,3 @@
+JAASTest2 {
+    org.springframework.security.providers.jaas.TestLoginModule required;
+};
\ No newline at end of file
diff --git a/core/src/test/resources/org/springframework/security/providers/jaas/JaasAuthenticationProviderTests.xml b/core/src/test/resources/org/springframework/security/providers/jaas/JaasAuthenticationProviderTests.xml
new file mode 100644
index 0000000000..05bd7f8643
--- /dev/null
+++ b/core/src/test/resources/org/springframework/security/providers/jaas/JaasAuthenticationProviderTests.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+    
+
+    
+        
+            JAASTest
+        
+        
+            classpath:org/springframework/security/providers/jaas/login.conf
+        
+        
+            
+                
+                
+                
+            
+        
+        
+            
+                
+            
+        
+    
+
\ No newline at end of file
diff --git a/core/src/test/resources/org/springframework/security/providers/jaas/login.conf b/core/src/test/resources/org/springframework/security/providers/jaas/login.conf
new file mode 100644
index 0000000000..f406682f51
--- /dev/null
+++ b/core/src/test/resources/org/springframework/security/providers/jaas/login.conf
@@ -0,0 +1,3 @@
+JAASTest {
+    org.springframework.security.providers.jaas.TestLoginModule required;
+};
\ No newline at end of file
diff --git a/core/src/test/resources/org/acegisecurity/providers/ldap/ldif/acegisecurity.ldif b/core/src/test/resources/org/springframework/security/providers/ldap/ldif/acegisecurity.ldif
similarity index 100%
rename from core/src/test/resources/org/acegisecurity/providers/ldap/ldif/acegisecurity.ldif
rename to core/src/test/resources/org/springframework/security/providers/ldap/ldif/acegisecurity.ldif
diff --git a/core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml b/core/src/test/resources/org/springframework/security/ui/webapp/filtertest-valid.xml
similarity index 80%
rename from core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml
rename to core/src/test/resources/org/springframework/security/ui/webapp/filtertest-valid.xml
index df11460da7..bcfbd5f877 100644
--- a/core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml
+++ b/core/src/test/resources/org/springframework/security/ui/webapp/filtertest-valid.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
   		
 			
 				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
@@ -32,14 +32,14 @@
 			
 		
 	
-	
+
 	
-	
+	
      	
 	
 
 	
-	
+	
 		
 		  
 		    
@@ -47,7 +47,7 @@
 		
 	
 
-	
+	
 		
 		/failed.jsp
 		/
diff --git a/core/src/test/resources/org/acegisecurity/util/filtertest-valid.xml b/core/src/test/resources/org/springframework/security/util/filtertest-valid.xml
similarity index 77%
rename from core/src/test/resources/org/acegisecurity/util/filtertest-valid.xml
rename to core/src/test/resources/org/springframework/security/util/filtertest-valid.xml
index 6e8bf3c132..f000cf5ef0 100644
--- a/core/src/test/resources/org/acegisecurity/util/filtertest-valid.xml
+++ b/core/src/test/resources/org/springframework/security/util/filtertest-valid.xml
@@ -21,13 +21,13 @@
 
 
 
-	
+	
 
-	
+	
 
-	
+	
 
-	
+	
       
          
 		    CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
diff --git a/core/src/test/resources/org/acegisecurity/vote/labelBasedSecurityApplicationContext.xml b/core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml
similarity index 71%
rename from core/src/test/resources/org/acegisecurity/vote/labelBasedSecurityApplicationContext.xml
rename to core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml
index 30e5ce0dbc..3151f5ae29 100644
--- a/core/src/test/resources/org/acegisecurity/vote/labelBasedSecurityApplicationContext.xml
+++ b/core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml
@@ -1,7 +1,7 @@
 
 
 
-	
+	
 	  
 	    
 	      blueuser=password,ROLE_BASIC,LABEL_BLUE
@@ -11,12 +11,12 @@
 	    
 	  
 	
-		
-	
+
+	
 	  
-	        
-	
-	
+	
+
+	
 	  
 	    
 	      
@@ -24,12 +24,12 @@
 	  
 	
 
-	
+	
 		false
 		
 			
-				
-				
+				
+				
 					LABELED_OPERATION
 					
 						
@@ -58,26 +58,26 @@
 			
 		
 	
-	
+
 	
+		class="org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor">
 	  false
 	  
 	  
 	  
 	    
-	      org.acegisecurity.vote.SampleService.get*=ROLE_BASIC
-	      org.acegisecurity.vote.SampleService.do*=ROLE_BASIC,LABELED_OPERATION
-	    
+            org.springframework.security.vote.SampleService.get*=ROLE_BASIC
+            org.springframework.security.vote.SampleService.do*=ROLE_BASIC,LABELED_OPERATION
+        
 	  
 	
-	
+
     
     	Security: 
     
-    
-	
-	
+
+	
+
  	
 	  sampleService