SEC-1132: Moved userdetails into core and added core/authority sub-package

acl/src/main/java/org/springframework/security/acls/sid/PrincipalSid.java

@@ -16,7 +16,7 @@ package org.springframework.security.acls.sid;
 
 
 import org.springframework.security.core.Authentication;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetails;
 
 import org.springframework.util.Assert;
 

acl/src/main/resources/org/springframework/security/acls/jdbc/applicationContext-test.xml

@@ -37,13 +37,13 @@
     <bean id="aclAuthorizationStrategy" class="org.springframework.security.acls.domain.AclAuthorizationStrategyImpl">
         <constructor-arg>
             <list>
-                <bean class="org.springframework.security.core.GrantedAuthorityImpl">
+                <bean class="org.springframework.security.core.authority.GrantedAuthorityImpl">
                     <constructor-arg value="ROLE_ADMINISTRATOR"/>
                 </bean>
-                <bean class="org.springframework.security.core.GrantedAuthorityImpl">
+                <bean class="org.springframework.security.core.authority.GrantedAuthorityImpl">
                     <constructor-arg value="ROLE_ADMINISTRATOR"/>
                 </bean>
-                <bean class="org.springframework.security.core.GrantedAuthorityImpl">
+                <bean class="org.springframework.security.core.authority.GrantedAuthorityImpl">
                     <constructor-arg value="ROLE_ADMINISTRATOR"/>
                 </bean>
             </list>

acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java

@@ -32,7 +32,7 @@ import org.springframework.security.acls.sid.Sid;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.util.FieldUtils;
 

acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java

@@ -13,7 +13,7 @@ import org.springframework.security.acls.sid.PrincipalSid;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**

acl/src/test/java/org/springframework/security/acls/jdbc/AclPermissionInheritanceTests.java

@@ -21,8 +21,8 @@ import org.springframework.security.acls.sid.GrantedAuthoritySid;
 import org.springframework.security.acls.sid.PrincipalSid;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthorityUtils;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;

acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java

@@ -32,7 +32,7 @@ import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
 import org.springframework.security.acls.sid.PrincipalSid;
 import org.springframework.security.acls.sid.Sid;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 import org.springframework.util.FileCopyUtils;
 
 /**

acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java

@@ -30,7 +30,7 @@ import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.util.FieldUtils;
 

acl/src/test/java/org/springframework/security/acls/sid/SidTests.java

@@ -9,7 +9,7 @@ import org.springframework.security.acls.sid.Sid;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 
 public class SidTests extends TestCase {
 

cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java

@@ -32,9 +32,9 @@ import org.springframework.security.cas.web.CasProcessingFilter;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.SpringSecurityMessageSource;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsChecker;
-import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsChecker;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.util.Assert;
 
 

cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java

@@ -19,8 +19,8 @@ import org.jasig.cas.client.validation.Assertion;
 
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
 
-import org.springframework.security.userdetails.UserDetails;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -62,9 +62,9 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
      * @param credentials the service/proxy ticket ID from CAS (cannot be
      *        <code>null</code>)
      * @param authorities the authorities granted to the user (from the {@link
-     *        org.springframework.security.userdetails.UserDetailsService}) (cannot be <code>null</code>)
+     *        org.springframework.security.core.userdetails.UserDetailsService}) (cannot be <code>null</code>)
      * @param userDetails the user details (from the {@link
-     *        org.springframework.security.userdetails.UserDetailsService}) (cannot be <code>null</code>)
+     *        org.springframework.security.core.userdetails.UserDetailsService}) (cannot be <code>null</code>)
      * @param assertion the assertion returned from the CAS servers.  It contains the principal and how to obtain a
      *        proxy ticket for the user.
      *

cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java

@@ -26,14 +26,14 @@ import org.springframework.security.cas.authentication.StatelessTicketCache;
 import org.springframework.security.cas.web.CasProcessingFilter;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.AuthorityUtils;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
 
 
-import org.springframework.security.userdetails.User;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
 
 import java.util.HashMap;
 import java.util.Map;

cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java

@@ -23,10 +23,10 @@ import org.jasig.cas.client.validation.Assertion;
 import org.jasig.cas.client.validation.AssertionImpl;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.cas.authentication.CasAuthenticationToken;
-import org.springframework.security.core.AuthorityUtils;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.userdetails.User;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
 
 /**
  * Tests {@link CasAuthenticationToken}.

cas/src/test/java/org/springframework/security/cas/authentication/cache/AbstractStatelessTicketCacheTests.java

@@ -6,8 +6,8 @@ import java.util.List;
 import org.jasig.cas.client.validation.Assertion;
 import org.jasig.cas.client.validation.AssertionImpl;
 import org.springframework.security.cas.authentication.CasAuthenticationToken;
-import org.springframework.security.core.AuthorityUtils;
-import org.springframework.security.userdetails.User;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.User;
 
 /**
  *

config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java

@@ -1,9 +1,9 @@
 package org.springframework.security.config;
 
-import org.springframework.security.userdetails.UserCache;
-import org.springframework.security.userdetails.UserDetailsService;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.cache.NullUserCache;
+import org.springframework.security.core.userdetails.UserCache;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.cache.NullUserCache;
 import org.springframework.util.Assert;
 
 /**

config/src/main/java/org/springframework/security/config/FilterChainMapBeanDefinitionDecorator.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.ManagedMap;
 import org.springframework.beans.factory.xml.BeanDefinitionDecorator;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.security.util.RegexUrlPathMatcher;
+import org.springframework.security.web.util.RegexUrlPathMatcher;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;

config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java

@@ -7,10 +7,10 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.util.AntUrlPathMatcher;
-import org.springframework.security.util.UrlMatcher;
 import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource;
 import org.springframework.security.web.intercept.RequestKey;
+import org.springframework.security.web.util.AntUrlPathMatcher;
+import org.springframework.security.web.util.UrlMatcher;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;

config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java

@@ -22,9 +22,6 @@ import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.access.vote.AuthenticatedVoter;
 import org.springframework.security.access.vote.RoleVoter;
-import org.springframework.security.util.AntUrlPathMatcher;
-import org.springframework.security.util.RegexUrlPathMatcher;
-import org.springframework.security.util.UrlMatcher;
 import org.springframework.security.web.AccessDeniedHandlerImpl;
 import org.springframework.security.web.ExceptionTranslationFilter;
 import org.springframework.security.web.FilterChainProxy;
@@ -42,6 +39,9 @@ import org.springframework.security.web.securechannel.InsecureChannelProcessor;
 import org.springframework.security.web.securechannel.RetryWithHttpEntryPoint;
 import org.springframework.security.web.securechannel.RetryWithHttpsEntryPoint;
 import org.springframework.security.web.securechannel.SecureChannelProcessor;
+import org.springframework.security.web.util.AntUrlPathMatcher;
+import org.springframework.security.web.util.RegexUrlPathMatcher;
+import org.springframework.security.web.util.UrlMatcher;
 import org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestFilter;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;

config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java

@@ -13,8 +13,8 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.security.authentication.preauth.PreAuthenticatedAuthenticationProvider;
-import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper;
-import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UserDetailsByNameServiceWrapper;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices;
 import org.springframework.util.Assert;
 

config/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java

@@ -6,9 +6,9 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.security.core.AuthorityUtils;
-import org.springframework.security.userdetails.memory.UserMap;
-import org.springframework.security.userdetails.User;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.memory.UserMap;
 import org.springframework.util.StringUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.xml.DomUtils;
@@ -33,7 +33,7 @@ public class UserServiceBeanDefinitionParser extends AbstractUserDetailsServiceB
     static final String ATT_LOCKED = "locked";
 
     protected String getBeanClassName(Element element) {
-        return "org.springframework.security.userdetails.memory.InMemoryDaoImpl";
+        return "org.springframework.security.core.userdetails.memory.InMemoryDaoImpl";
     }
 
     @SuppressWarnings("unchecked")

config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java

@@ -1,10 +1,10 @@
 package org.springframework.security.config;
 
-import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedProcessingFilterEntryPoint;
 import org.springframework.security.web.authentication.preauth.x509.SubjectDnX509PrincipalExtractor;
 import org.springframework.security.web.authentication.preauth.x509.X509PreAuthenticatedProcessingFilter;
 import org.springframework.security.authentication.preauth.PreAuthenticatedAuthenticationProvider;
+import org.springframework.security.core.userdetails.UserDetailsByNameServiceWrapper;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.beans.factory.config.BeanDefinition;

config/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java

@@ -115,7 +115,7 @@ public class AuthenticationProviderBeanDefinitionParserTests {
                 "         <b:property name='userPropertyToUse' value='username'/>" +
                 "    </b:bean>" +
                 "    <b:bean id='customUserService' " +
-                "           class='org.springframework.security.userdetails.memory.InMemoryDaoImpl'>" +
+                "           class='org.springframework.security.core.userdetails.memory.InMemoryDaoImpl'>" +
                 "        <b:property name='userMap' value='bob=f117f0862384e9497ff4f470e3522606,ROLE_A'/>" +
                 "    </b:bean>");
         getProvider().authenticate(bob);

config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java

@@ -25,9 +25,9 @@ import org.springframework.security.authentication.AuthenticationCredentialsNotF
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.config.util.InMemoryXmlApplicationContext;
-import org.springframework.security.core.AuthorityUtils;
+import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.util.FieldUtils;
 
 /**

config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java

@@ -473,7 +473,7 @@ public class HttpSecurityBeanDefinitionParserTests {
                 "<http auto-config='true'>" +
                 "    <remember-me key='somekey' user-service-ref='userService'/>" +
                 "</http>" +
-                "<b:bean id='userService' class='org.springframework.security.userdetails.MockUserDetailsService'/> " +
+                "<b:bean id='userService' class='org.springframework.security.core.userdetails.MockUserDetailsService'/> " +
                 AUTH_PROVIDER_XML);
 //        AbstractRememberMeServices rememberMeServices = (AbstractRememberMeServices) appContext.getBean(BeanIds.REMEMBER_ME_SERVICES);
     }

config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java

@@ -9,7 +9,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.AuthorityUtils;
+import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**

config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java

@@ -10,9 +10,9 @@ import org.springframework.security.authentication.ProviderManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.config.util.InMemoryXmlApplicationContext;
-import org.springframework.security.core.AuthorityUtils;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.provisioning.JdbcUserDetailsManager;
-import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.util.FieldUtils;
 import org.w3c.dom.Element;
 

config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java

@@ -8,7 +8,7 @@ import org.springframework.security.access.annotation.BusinessService;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.config.util.InMemoryXmlApplicationContext;
-import org.springframework.security.core.AuthorityUtils;
+import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**

config/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java

@@ -9,8 +9,10 @@ import java.util.Set;
 import org.junit.After;
 import org.junit.Test;
 import org.springframework.security.config.util.InMemoryXmlApplicationContext;
-import org.springframework.security.core.AuthorityUtils;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator;
 import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
 import org.springframework.security.ldap.userdetails.InetOrgPerson;
@@ -19,8 +21,6 @@ import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
 import org.springframework.security.ldap.userdetails.LdapUserDetailsService;
 import org.springframework.security.ldap.userdetails.Person;
 import org.springframework.security.ldap.userdetails.PersonContextMapper;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
 import org.w3c.dom.Element;
 
 /**

config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java

@@ -1,9 +1,9 @@
 package org.springframework.security.config;
 
 import org.springframework.dao.DataAccessException;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
-import org.springframework.security.userdetails.UsernameNotFoundException;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 public class PostProcessedMockUserDetailsService implements UserDetailsService {
     private String postProcessorWasHere;

config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java

@@ -8,7 +8,7 @@ import org.springframework.security.access.annotation.BusinessService;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.config.util.InMemoryXmlApplicationContext;
-import org.springframework.security.core.AuthorityUtils;
+import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**

config/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java

@@ -3,8 +3,8 @@ package org.springframework.security.config;
 import static org.junit.Assert.*;
 
 import org.springframework.security.config.util.InMemoryXmlApplicationContext;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.beans.FatalBeanException;
 

config/src/test/resources/org/springframework/security/util/filtertest-valid.xml

@@ -37,7 +37,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
        </property>
     </bean>
 
-    <bean id="mockNotAFilter" class="org.springframework.security.util.AntUrlPathMatcher"/>
+    <bean id="mockNotAFilter" class="org.springframework.security.web.util.AntUrlPathMatcher"/>
 
     <bean id="filterChain" class="org.springframework.security.web.FilterChainProxy">
         <sec:filter-chain-map path-type="ant">
@@ -83,7 +83,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 
     <bean id="newFilterChainProxyNonNamespace" class="org.springframework.security.web.FilterChainProxy">
         <property name="matcher">
-            <bean class="org.springframework.security.util.AntUrlPathMatcher"/>
+            <bean class="org.springframework.security.web.util.AntUrlPathMatcher"/>
         </property>
         <property name="filterChainMap">
             <map>

core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java

@@ -4,8 +4,8 @@ import java.util.Set;
 
 import org.springframework.security.authentication.AuthenticationTrustResolver;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthorityUtils;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
 
 
 /**

core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java

@@ -16,7 +16,7 @@ package org.springframework.security.access.hierarchicalroles;
 
 
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapper.java

@@ -14,9 +14,9 @@
 
 package org.springframework.security.access.hierarchicalroles;
 
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
-import org.springframework.security.userdetails.UsernameNotFoundException;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.dao.DataAccessException;
 
 /**

core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java

@@ -17,7 +17,7 @@ package org.springframework.security.access.hierarchicalroles;
 import java.util.List;
 
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetails;
 
 /**
  * This class wraps Spring Security's <tt>UserDetails</tt> in a way that its <tt>getAuthorities()</tt> method is

core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java

@@ -22,7 +22,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 import org.springframework.util.Assert;
 
 
@@ -43,7 +43,7 @@ import org.springframework.util.Assert;
  * properly discerned based on the prefix, with possible consequences when performing voting and other actions.
  * However, this option may be of some use when using pre-existing 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.springframework.security.userdetails.jdbc.JdbcDaoImpl}.
+ * {@link org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl}.
  *
  * @author Ben Alex
  * @author colin sampaleanu

core/src/main/java/org/springframework/security/access/vote/RoleVoter.java

@@ -41,7 +41,7 @@ import org.springframework.security.core.GrantedAuthority;
  * which do not represent roles. However, this option may be of some use when
  * using pre-existing 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.springframework.security.userdetails.jdbc.JdbcDaoImpl}.
+ * example in {@link org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl}.
  * <p>
  * All comparisons and prefixes are case sensitive.
  *

core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetails;
 
 
 /**

core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java

@@ -1,8 +1,8 @@
 package org.springframework.security.authentication;
 
 import org.springframework.security.core.SpringSecurityMessageSource;
-import org.springframework.security.userdetails.UserDetailsChecker;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsChecker;
 import org.springframework.context.support.MessageSourceAccessor;
 
 /**

core/src/main/java/org/springframework/security/authentication/ProviderManager.java

@@ -46,7 +46,7 @@ import org.springframework.security.authentication.event.AuthenticationSuccessEv
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.SpringSecurityMessageSource;
-import org.springframework.security.userdetails.UsernameNotFoundException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.util.Assert;
 
 

core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java

@@ -18,8 +18,8 @@ package org.springframework.security.authentication;
 import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.security.core.AuthorityUtils;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
 
 
 /**

core/src/main/java/org/springframework/security/authentication/concurrent/SessionRegistryUtils.java

@@ -17,7 +17,7 @@ package org.springframework.security.authentication.concurrent;
 
 
 import org.springframework.security.core.Authentication;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetails;
 
 import org.springframework.util.Assert;
 

core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java

@@ -26,13 +26,13 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.SpringSecurityMessageSource;
+import org.springframework.security.core.userdetails.UserCache;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsChecker;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.core.userdetails.cache.NullUserCache;
 
-import org.springframework.security.userdetails.UserCache;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
-import org.springframework.security.userdetails.UsernameNotFoundException;
-import org.springframework.security.userdetails.UserDetailsChecker;
-import org.springframework.security.userdetails.cache.NullUserCache;
 
 import org.springframework.beans.factory.InitializingBean;
 
@@ -45,7 +45,7 @@ import org.springframework.util.Assert;
 
 /**
  * A base {@link AuthenticationProvider} that allows subclasses to override and work with {@link
- * org.springframework.security.userdetails.UserDetails} objects. The class is designed to respond to {@link
+ * org.springframework.security.core.userdetails.UserDetails} objects. The class is designed to respond to {@link
  * UsernamePasswordAuthenticationToken} authentication requests.
  *
  * <p>

core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java

@@ -22,8 +22,8 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.authentication.encoding.PlaintextPasswordEncoder;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.dao.DataAccessException;
 import org.springframework.util.Assert;
 

core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java

@@ -15,7 +15,7 @@
 
 package org.springframework.security.authentication.dao;
 
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetails;
 
 
 /**

core/src/main/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSource.java

@@ -18,8 +18,8 @@ package org.springframework.security.authentication.dao.salt;
 
 import org.springframework.security.authentication.AuthenticationServiceException;
 import org.springframework.security.authentication.dao.SaltSource;
+import org.springframework.security.core.userdetails.UserDetails;
 
-import org.springframework.security.userdetails.UserDetails;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.BeanUtils;
@@ -31,7 +31,7 @@ import java.beans.PropertyDescriptor;
 
 
 /**
- * Obtains a salt from a specified property of the {@link org.springframework.security.userdetails.User} object.
+ * Obtains a salt from a specified property of the {@link org.springframework.security.core.userdetails.User} object.
  * <p>
  * This allows you to subclass <code>User</code> and provide an additional bean getter for a salt. You should use a
  * synthetic value that does not change, such as a database primary key.  Do not use <code>username</code> if it is

core/src/main/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSource.java

@@ -16,15 +16,15 @@
 package org.springframework.security.authentication.dao.salt;
 
 import org.springframework.security.authentication.dao.SaltSource;
+import org.springframework.security.core.userdetails.UserDetails;
 
-import org.springframework.security.userdetails.UserDetails;
 
 import org.springframework.beans.factory.InitializingBean;
 
 
 /**
  * Uses a static system-wide <code>String</code> as the salt.<P>Does not supply a different salt for each {@link
- * org.springframework.security.userdetails.User}. This means users sharing the same password will still have the same digested
+ * org.springframework.security.core.userdetails.User}. This means users sharing the same password will still have the same digested
  * password. Of benefit is the digested passwords will at least be more protected than if stored without any salt.</p>
  *
  * @author Ben Alex

core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java

@@ -44,8 +44,8 @@ import org.springframework.security.authentication.jaas.event.JaasAuthentication
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.SessionDestroyedEvent;
 import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.session.SessionDestroyedEvent;
 import org.springframework.util.Assert;
 
 

core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java

@@ -15,7 +15,7 @@
 
 package org.springframework.security.authentication.jaas;
 
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 
 import java.security.Principal;
 

core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java

@@ -17,7 +17,7 @@ package org.springframework.security.authentication.jaas;
 
 
 import org.springframework.security.core.Authentication;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetails;
 
 import java.io.IOException;
 

core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java

@@ -9,9 +9,9 @@ import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.userdetails.AuthenticationUserDetailsService;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsChecker;
+import org.springframework.security.core.userdetails.AuthenticationUserDetailsService;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsChecker;
 import org.springframework.util.Assert;
 
 /**

core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java

@@ -4,11 +4,11 @@ import java.util.List;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.GrantedAuthoritiesContainer;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.userdetails.AuthenticationUserDetailsService;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.User;
+import org.springframework.security.core.authority.GrantedAuthoritiesContainer;
+import org.springframework.security.core.userdetails.AuthenticationUserDetailsService;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
 
 import org.springframework.util.Assert;
 

core/src/main/java/org/springframework/security/core/GrantedAuthority.java

@@ -18,7 +18,7 @@ package org.springframework.security.core;
 import java.io.Serializable;
 
 import org.springframework.security.access.AccessDecisionManager;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetails;
 
 /**
  * Represents an authority granted to an {@link Authentication} object.

core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java

@@ -1,5 +1,7 @@
-package org.springframework.security.core;
+package org.springframework.security.core.authority;
 
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.StringUtils;
 

core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainer.java

@@ -1,8 +1,10 @@
-package org.springframework.security.core;
+package org.springframework.security.core.authority;
 
 import java.io.Serializable;
 import java.util.List;
 
+import org.springframework.security.core.GrantedAuthority;
+
 /**
  * Indicates that a object stores GrantedAuthority objects.
  * <p>

core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainerImpl.java

@@ -1,8 +1,9 @@
-package org.springframework.security.core;
+package org.springframework.security.core.authority;
 
 import java.util.Collections;
 import java.util.List;
 
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.util.Assert;
 
 public class GrantedAuthoritiesContainerImpl implements MutableGrantedAuthoritiesContainer {

core/src/main/java/org/springframework/security/core/authority/GrantedAuthorityImpl.java

@@ -13,10 +13,12 @@
  * limitations under the License.
  */
 
-package org.springframework.security.core;
+package org.springframework.security.core.authority;
 
 import java.io.Serializable;
 
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.util.Assert;
 
 

core/src/main/java/org/springframework/security/core/authority/MutableGrantedAuthoritiesContainer.java

@@ -1,7 +1,9 @@
-package org.springframework.security.core;
+package org.springframework.security.core.authority;
 
 import java.util.List;
 
+import org.springframework.security.core.GrantedAuthority;
+
 /**
  * Indicates that a object can be used to store and retrieve GrantedAuthority objects.
  * <p>

core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java

@@ -1,4 +1,4 @@
-package org.springframework.security.core.authoritymapping;
+package org.springframework.security.core.authority.mapping;
 
 import java.util.Collection;
 import java.util.List;

core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java

@@ -1,4 +1,4 @@
-package org.springframework.security.core.authoritymapping;
+package org.springframework.security.core.authority.mapping;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,7 +11,7 @@ import java.util.StringTokenizer;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -144,7 +144,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper implements Attributes2G
 
     /**
      *
-     * @see org.springframework.security.core.authoritymapping.MappableAttributesRetriever#getMappableAttributes()
+     * @see org.springframework.security.core.authority.mapping.MappableAttributesRetriever#getMappableAttributes()
      */
     public Set<String> getMappableAttributes() {
         return mappableAttributes;

core/src/main/java/org/springframework/security/core/authority/mapping/MappableAttributesRetriever.java

@@ -1,4 +1,4 @@
-package org.springframework.security.core.authoritymapping;
+package org.springframework.security.core.authority.mapping;
 
 import java.util.Set;
 

core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java

@@ -1,7 +1,7 @@
-package org.springframework.security.core.authoritymapping;
+package org.springframework.security.core.authority.mapping;
 
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 
 import java.util.ArrayList;
 import java.util.Collection;

core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java

@@ -1,4 +1,4 @@
-package org.springframework.security.core.authoritymapping;
+package org.springframework.security.core.authority.mapping;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -18,7 +18,7 @@ public class SimpleMappableAttributesRetriever implements MappableAttributesRetr
     /*
      * (non-Javadoc)
      *
-     * @see org.springframework.security.core.authoritymapping.MappableAttributesRetriever#getMappableAttributes()
+     * @see org.springframework.security.core.authority.mapping.MappableAttributesRetriever#getMappableAttributes()
      */
     public Set<String> getMappableAttributes() {
         return mappableAttributes;

core/src/main/java/org/springframework/security/core/authority/mapping/XmlMappableAttributesRetriever.java

@@ -1,4 +1,4 @@
-package org.springframework.security.core.authoritymapping;
+package org.springframework.security.core.authority.mapping;
 
 import java.io.FilterInputStream;
 import java.io.IOException;

core/src/main/java/org/springframework/security/core/session/SessionCreationEvent.java

@@ -1,4 +1,4 @@
-package org.springframework.security.core;
+package org.springframework.security.core.session;
 
 import org.springframework.context.ApplicationEvent;
 

core/src/main/java/org/springframework/security/core/session/SessionDestroyedEvent.java

@@ -1,4 +1,4 @@
-package org.springframework.security.core;
+package org.springframework.security.core.session;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.security.core.context.SecurityContext;

core/src/main/java/org/springframework/security/core/userdetails/AuthenticationUserDetailsService.java

@@ -1,4 +1,4 @@
-package org.springframework.security.userdetails;
+package org.springframework.security.core.userdetails;
 
 import org.springframework.security.core.Authentication;
 

core/src/main/java/org/springframework/security/core/userdetails/User.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails;
+package org.springframework.security.core.userdetails;
 
 import java.util.ArrayList;
 import java.util.Arrays;

core/src/main/java/org/springframework/security/core/userdetails/UserCache.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails;
+package org.springframework.security.core.userdetails;
 
 
 

core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails;
+package org.springframework.security.core.userdetails;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
@@ -36,7 +36,7 @@ import java.util.List;
  * <p>
  * Concrete implementations must take particular care to ensure the non-null
  * contract detailed for each method is enforced. See
- * {@link org.springframework.security.userdetails.User} for a
+ * {@link org.springframework.security.core.userdetails.User} for a
  * reference implementation (which you might like to extend).
  * </p>
  *

core/src/main/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapper.java

@@ -1,4 +1,4 @@
-package org.springframework.security.userdetails;
+package org.springframework.security.core.userdetails;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.beans.factory.InitializingBean;

core/src/main/java/org/springframework/security/core/userdetails/UserDetailsChecker.java

@@ -1,4 +1,4 @@
-package org.springframework.security.userdetails;
+package org.springframework.security.core.userdetails;
 
 /**
  * Called by classes which make use of a {@link UserDetailsService} to check the status of the loaded

core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails;
+package org.springframework.security.core.userdetails;
 
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 

core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails;
+package org.springframework.security.core.userdetails;
 
 import org.springframework.security.core.AuthenticationException;
 

core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java

@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails.cache;
+package org.springframework.security.core.userdetails.cache;
 
 import net.sf.ehcache.CacheException;
 import net.sf.ehcache.Element;
 import net.sf.ehcache.Ehcache;
 
 
-import org.springframework.security.userdetails.UserCache;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserCache;
+import org.springframework.security.core.userdetails.UserDetails;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java

@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails.cache;
+package org.springframework.security.core.userdetails.cache;
 
 
-import org.springframework.security.userdetails.UserCache;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserCache;
+import org.springframework.security.core.userdetails.UserDetails;
 
 
 /**

core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails.jdbc;
+package org.springframework.security.core.userdetails.jdbc;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -27,14 +27,14 @@ import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
-import org.springframework.security.core.AuthorityUtils;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
 import org.springframework.security.core.SpringSecurityMessageSource;
-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.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.util.Assert;
 
 

core/src/main/java/org/springframework/security/core/userdetails/memory/InMemoryDaoImpl.java

@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails.memory;
+package org.springframework.security.core.userdetails.memory;
 
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
-import org.springframework.security.userdetails.UsernameNotFoundException;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 import org.springframework.beans.factory.InitializingBean;
 

core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java

@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails.memory;
+package org.springframework.security.core.userdetails.memory;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 
 
 /**

core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails.memory;
+package org.springframework.security.core.userdetails.memory;
 
 import java.beans.PropertyEditorSupport;
 import java.util.ArrayList;

core/src/main/java/org/springframework/security/core/userdetails/memory/UserMap.java

@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails.memory;
+package org.springframework.security.core.userdetails.memory;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UsernameNotFoundException;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;

core/src/main/java/org/springframework/security/core/userdetails/memory/UserMapEditor.java

@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails.memory;
+package org.springframework.security.core.userdetails.memory;
 
-import org.springframework.security.userdetails.User;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
 
 import org.springframework.beans.propertyeditors.PropertiesEditor;
 

core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java

@@ -5,14 +5,14 @@ import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.AuthorityUtils;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.userdetails.UserCache;
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.cache.NullUserCache;
-import org.springframework.security.userdetails.jdbc.JdbcDaoImpl;
+import org.springframework.security.core.userdetails.UserCache;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.cache.NullUserCache;
+import org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.jdbc.core.PreparedStatementSetter;

core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java

@@ -1,7 +1,7 @@
 package org.springframework.security.provisioning;
 
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
 
 /**
  * An extension of the {@link UserDetailsService} which provides the ability

core/src/main/resources/org/springframework/security/adapters/acegisecurity.xml

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

core/src/main/resources/org/springframework/security/adapters/adaptertest-invalid.xml

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

core/src/main/resources/org/springframework/security/adapters/adaptertest-valid.xml

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

core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java

@@ -20,8 +20,8 @@ import junit.framework.TestCase;
 
 import org.springframework.security.access.hierarchicalroles.CycleInRoleHierarchyException;
 import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
-import org.springframework.security.core.AuthorityUtils;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
 
 /**
  * Tests for {@link RoleHierarchyImpl}.

core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java

@@ -20,8 +20,8 @@ import static org.junit.Assert.assertTrue;
 import java.util.List;
 
 import org.junit.Test;
-import org.springframework.security.core.AuthorityUtils;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
 
 /**
  * Tests for {@link HierarchicalRolesTestHelper}.

core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapperTests.java

@@ -13,11 +13,11 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
 import org.springframework.security.access.hierarchicalroles.UserDetailsServiceWrapper;
-import org.springframework.security.core.AuthorityUtils;
-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.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 @RunWith(JMock.class)
 @SuppressWarnings("deprecation")

core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapperTests.java

@@ -6,10 +6,10 @@ import junit.framework.TestCase;
 
 import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
 import org.springframework.security.access.hierarchicalroles.UserDetailsWrapper;
-import org.springframework.security.core.AuthorityUtils;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.userdetails.User;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
 
 /**
  * Tests for {@link UserDetailsWrapper}.

core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java

@@ -25,7 +25,7 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 
 
 /**

core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java

@@ -23,7 +23,7 @@ import org.springframework.security.access.intercept.RunAsManagerImpl;
 import org.springframework.security.access.intercept.RunAsUserToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthorityUtils;
+import org.springframework.security.core.authority.AuthorityUtils;
 
 
 /**

core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java

@@ -21,7 +21,7 @@ import junit.framework.TestCase;
 import org.springframework.security.access.intercept.RunAsUserToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 
 
 /**

core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java

@@ -28,7 +28,7 @@ import org.springframework.security.access.vote.AffirmativeBased;
 import org.springframework.security.access.vote.RoleVoter;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 
 
 /**

core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java

@@ -27,7 +27,7 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.RememberMeAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthorityUtils;
+import org.springframework.security.core.authority.AuthorityUtils;
 
 
 /**

core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java

@@ -29,7 +29,7 @@ import org.springframework.security.access.vote.ConsensusBased;
 import org.springframework.security.access.vote.RoleVoter;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 
 
 /**

core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java

@@ -22,9 +22,9 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
-import org.springframework.security.core.AuthorityUtils;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
 
 
 /**