SEC-562: Repackaging core.

core/pom.xml

@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.acegisecurity</groupId>
-		<artifactId>acegi-security-parent</artifactId>
+		<groupId>org.springframework.security</groupId>
+		<artifactId>spring-security-parent</artifactId>
 		<version>2.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
-	<artifactId>acegi-security</artifactId>
-	<name>Acegi Security Core</name>
+	<artifactId>spring-security-core</artifactId>
+	<name>Spring Security Core</name>
 
 	<scm>
 		<connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk/core</connection>

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
     /**
      * <p>Concrete implementations of this class override this method to provide the authentication service.</p>
      *  <p>The contract for this method is documented in the {@link
-     * AuthenticationManager#authenticate(org.acegisecurity.Authentication)}.</p>
+     * AuthenticationManager#authenticate(org.springframework.security.Authentication)}.</p>
      *
      * @param authentication the authentication request object
      *

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.

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 ===================================================================================================
 
 /**

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

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 ========================================================================================================

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 <code>Object</code> 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 <code>Collection</code> 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.
  * </p>
  *

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;
  * </p>
  *
  * <p>
- * Stored in a request {@link org.acegisecurity.context.SecurityContext}.
+ * Stored in a request {@link org.springframework.security.context.SecurityContext}.
  * </p>
  *
  * @author Ben Alex

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$

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 <code>null</code>) */

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.

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.<p>This might be thrown if a

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 <code>Authentication</code> tokens

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;
 
 
 /**

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.<p>This might be thrown if an

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

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.
  *
  * <p>
- * 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

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.<p>All the
  * <code>ConfigAttributeDefinition</code>s associated with a given {@link
- * org.acegisecurity.intercept.AbstractSecurityInterceptor} are stored in an {@link
- * org.acegisecurity.intercept.ObjectDefinitionSource}.</p>
+ * org.springframework.security.intercept.AbstractSecurityInterceptor} are stored in an {@link
+ * org.springframework.security.intercept.ObjectDefinitionSource}.</p>
  *
  * @author Ben Alex
  * @version $Id$

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;
 

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

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

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;
 

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;
 

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.<p>{{@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 <code>AuthenticationEntryPoint</code>
+ * {@link org.springframework.security.ui.ExceptionTranslationFilter} will thus cause the <code>AuthenticationEntryPoint</code>
  * to be called, allowing the principal to authenticate with a stronger level of authentication.}</p>
  *
  * @author Ben Alex

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

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 <code>grantAccess</code> is set to <code>true</code>.

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
  * <code>Authentication</code> 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 <code>Authentication</code> 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 <code>Authentication</code> object when the callback ends.
  * </p>

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 <code>String</code>.

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 <code>AcegiSecurityException</code> with the specified
+     * Constructs an <code>SpringSecurityException</code> 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 <code>AcegiSecurityException</code> with the specified
+     * Constructs an <code>SpringSecurityException</code> with the specified
      * message and no root cause.
      *
      * @param msg the detail message
      */
-    public AcegiSecurityException(String msg) {
+    public SpringSecurityException(String msg) {
         super(msg);
     }
 }

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;
 

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;
 
 
 /**

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;
 
 
 /**

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;

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;

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;
 

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

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

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 <code>String</code>
      * containing a username, or a <code>GrantedAuthorityImpl</code> 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 <code>Authentication</code> object.</p>
      *
      * @return the recipient of this access control list entry (never <code>null</code>)

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.

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;
 

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;

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;
 
 
 /**

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;

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;

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;

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;
 

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;

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;
 
 
 /**

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;

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.</p>
  *  <p>This implementation works with <code>String</code> 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)}.</p>
  *
  * @author Ben Alex

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;
 

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.
  * </p>
  *
  * <p>
- * 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.
  * </p>
  *

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;
 

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;
 

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 <code>AlreadyExistsException</code> with the specified message.
-     *
-     * @param msg the detail message
+/**
+     * Constructs an <code>AlreadyExistsException</code> with the specified message.
+     *
+     * @param msg the detail message
      */
     public AlreadyExistsException(String msg) {
         super(msg);
     }
 
-/**
-     * Constructs an <code>AlreadyExistsException</code> with the specified message
-     * and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
+/**
+     * Constructs an <code>AlreadyExistsException</code> 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);

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.

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;
 

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 <code>ChildrenExistException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message
+/**
+     * Constructs an <code>ChildrenExistException</code> with the specified
+     * message.
+     *
+     * @param msg the detail message
      */
     public ChildrenExistException(String msg) {
         super(msg);
     }
 
-/**
-     * Constructs an <code>ChildrenExistException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
+/**
+     * Constructs an <code>ChildrenExistException</code> 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);

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 <code>IdentityUnavailableException</code> with the specified message.
-     *
-     * @param msg the detail message
+/**
+     * Constructs an <code>IdentityUnavailableException</code> with the specified message.
+     *
+     * @param msg the detail message
      */
     public IdentityUnavailableException(String msg) {
         super(msg);
     }
 
-/**
-     * Constructs an <code>IdentityUnavailableException</code> with the specified message
-     * and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
+/**
+     * Constructs an <code>IdentityUnavailableException</code> 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);

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;
 

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;
 
 
 /**

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 <code>NotFoundException</code> with the specified message.
-     *
-     * @param msg the detail message
+/**
+     * Constructs an <code>NotFoundException</code> with the specified message.
+     *
+     * @param msg the detail message
      */
     public NotFoundException(String msg) {
         super(msg);
     }
 
-/**
-     * Constructs an <code>NotFoundException</code> with the specified message
-     * and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
+/**
+     * Constructs an <code>NotFoundException</code> 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);

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;
 
 
 /**

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$

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 <code>NotFoundException</code> with the specified message.
-     *
-     * @param msg the detail message
+/**
+     * Constructs an <code>NotFoundException</code> with the specified message.
+     *
+     * @param msg the detail message
      */
     public UnloadedSidException(String msg) {
         super(msg);
     }
 
-/**
-     * Constructs an <code>NotFoundException</code> with the specified message
-     * and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
+/**
+     * Constructs an <code>NotFoundException</code> 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);

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;
 

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;
 
 
 /**

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;
 

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)

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;
 
 
 /**

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;
 	}

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;
 

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;
 	}

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;
 

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;
 

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;
 

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 <code>AclService</code>.<p>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.</p>
  *
  * @author Ben Alex

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;
 

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 <code>Map</code> 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);
 }

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;
 

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}.
  * <p>
  * Uses <code>String</code>s to store the identity of the domain object instance. Also offers a constructor that uses
  * reflection to build the identity information.

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}

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

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());
     }
 

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());
     }
 

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.

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;
 
 
 /**

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;

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;
 
 
 /**

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;
 
 
 /**

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;