diff --git a/acl/src/main/java/org/springframework/security/acls/sid/PrincipalSid.java b/acl/src/main/java/org/springframework/security/acls/sid/PrincipalSid.java index cada1cedb0..a5cef38189 100644 --- a/acl/src/main/java/org/springframework/security/acls/sid/PrincipalSid.java +++ b/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; diff --git a/acl/src/main/resources/org/springframework/security/acls/jdbc/applicationContext-test.xml b/acl/src/main/resources/org/springframework/security/acls/jdbc/applicationContext-test.xml index 1b422aba93..1b3304ef45 100644 --- a/acl/src/main/resources/org/springframework/security/acls/jdbc/applicationContext-test.xml +++ b/acl/src/main/resources/org/springframework/security/acls/jdbc/applicationContext-test.xml @@ -37,13 +37,13 @@ - + - + - + diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java index d48add42db..a38639b4bd 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java +++ b/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; diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java index 587d8b01eb..6a1d857faf 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java +++ b/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; /** diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/AclPermissionInheritanceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/AclPermissionInheritanceTests.java index a6ef74b1f5..2368f1e79e 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/AclPermissionInheritanceTests.java +++ b/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; diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java index 84215137bf..0226d91e5f 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java +++ b/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; /** diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java index 214366ce72..4973a4a822 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java +++ b/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; diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java index e02ffd6a0e..6df59e80db 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java +++ b/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 { diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java index e13c7a5fb5..f6adf847a2 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java +++ b/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; diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java index 3e5a7b32e3..f08fe1406d 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java +++ b/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 * null) * @param authorities the authorities granted to the user (from the {@link - * org.springframework.security.userdetails.UserDetailsService}) (cannot be null) + * org.springframework.security.core.userdetails.UserDetailsService}) (cannot be null) * @param userDetails the user details (from the {@link - * org.springframework.security.userdetails.UserDetailsService}) (cannot be null) + * org.springframework.security.core.userdetails.UserDetailsService}) (cannot be null) * @param assertion the assertion returned from the CAS servers. It contains the principal and how to obtain a * proxy ticket for the user. * diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java index 4f519e65b2..743ade5209 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java +++ b/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; diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java index d69b096f18..6b5698af66 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java +++ b/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}. diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/cache/AbstractStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/cache/AbstractStatelessTicketCacheTests.java index a7c181872d..e49362cc24 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/cache/AbstractStatelessTicketCacheTests.java +++ b/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; /** * diff --git a/config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java b/config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java index f87c7980b3..34e872f798 100644 --- a/config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java +++ b/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; /** diff --git a/config/src/main/java/org/springframework/security/config/FilterChainMapBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/FilterChainMapBeanDefinitionDecorator.java index c9800532ac..44572c671a 100644 --- a/config/src/main/java/org/springframework/security/config/FilterChainMapBeanDefinitionDecorator.java +++ b/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; diff --git a/config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java index bf94d50a9f..58f9c5c551 100644 --- a/config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java +++ b/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; diff --git a/config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java index dc4b96942c..6db7da1101 100644 --- a/config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java +++ b/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; diff --git a/config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java b/config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java index 3d63d33311..e47c3aedb2 100644 --- a/config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java +++ b/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; diff --git a/config/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java index c88581a843..df822f0672 100644 --- a/config/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java +++ b/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") diff --git a/config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java index 5e5660fafe..6fc2c4ff67 100644 --- a/config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java +++ b/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; diff --git a/config/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java index 570517fee8..e9dbe5f4ac 100644 --- a/config/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java @@ -115,7 +115,7 @@ public class AuthenticationProviderBeanDefinitionParserTests { " " + " " + " " + + " class='org.springframework.security.core.userdetails.memory.InMemoryDaoImpl'>" + " " + " "); getProvider().authenticate(bob); diff --git a/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java index 3281dda6f2..626dab3bc7 100644 --- a/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java +++ b/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; /** diff --git a/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java index 32d6ea0953..d2434ac101 100644 --- a/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java @@ -473,7 +473,7 @@ public class HttpSecurityBeanDefinitionParserTests { "" + " " + "" + - " " + + " " + AUTH_PROVIDER_XML); // AbstractRememberMeServices rememberMeServices = (AbstractRememberMeServices) appContext.getBean(BeanIds.REMEMBER_ME_SERVICES); } diff --git a/config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java b/config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java index 78974d9d92..e28020c493 100644 --- a/config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java +++ b/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; /** diff --git a/config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java index 2301b8bad4..000292546a 100644 --- a/config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java +++ b/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; diff --git a/config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java index 981e46a7d8..2f7a40c88c 100644 --- a/config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java +++ b/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; /** diff --git a/config/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java index cea7b2dd2c..52df2775ae 100644 --- a/config/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java +++ b/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; /** diff --git a/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java b/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java index c274a2942b..da45fc4684 100644 --- a/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java +++ b/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; diff --git a/config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java index 64803cfdf2..3e1a799ed9 100644 --- a/config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java +++ b/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; /** diff --git a/config/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java index d157933e3b..ef73b79039 100644 --- a/config/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java +++ b/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; diff --git a/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml b/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml index f5252a85fa..a69f493de8 100644 --- a/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml +++ b/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 - + @@ -83,7 +83,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc - + diff --git a/core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java b/core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java index 0c4dbb436c..2eaaf206ee 100644 --- a/core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java +++ b/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; /** diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java index be23735813..191a2b9a58 100755 --- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapper.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapper.java index 528fa04cdb..033589b8a5 100755 --- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapper.java +++ b/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; /** diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java index 8f2c6e9eb8..de5ee39bf1 100755 --- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java +++ b/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 UserDetails in a way that its getAuthorities() method is diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java index 76e727ea98..d04df0bcd2 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java +++ b/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 diff --git a/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java index cf0133bb5d..f969510932 100644 --- a/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java +++ b/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}. *

* All comparisons and prefixes are case sensitive. * diff --git a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java index b6d03a8c27..4a9ea6bbb9 100644 --- a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java +++ b/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; /** diff --git a/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java b/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java index 83a2676bea..be960d03f1 100644 --- a/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java +++ b/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; /** diff --git a/core/src/main/java/org/springframework/security/authentication/ProviderManager.java b/core/src/main/java/org/springframework/security/authentication/ProviderManager.java index 12d298cfa8..4a607a14ca 100644 --- a/core/src/main/java/org/springframework/security/authentication/ProviderManager.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java index 0a2943ed25..f2d1b035dd 100644 --- a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java +++ b/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; /** diff --git a/core/src/main/java/org/springframework/security/authentication/concurrent/SessionRegistryUtils.java b/core/src/main/java/org/springframework/security/authentication/concurrent/SessionRegistryUtils.java index 4c80219c03..35147c2a80 100644 --- a/core/src/main/java/org/springframework/security/authentication/concurrent/SessionRegistryUtils.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java index 4be23d476b..be3acbaf16 100644 --- a/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java +++ b/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. * *

diff --git a/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java index cebee3df5b..23b1b5f310 100644 --- a/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java b/core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java index daba51ac92..b000b4a9f6 100644 --- a/core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java +++ b/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; /** diff --git a/core/src/main/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSource.java b/core/src/main/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSource.java index c3ab47e482..bb5406530e 100644 --- a/core/src/main/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSource.java +++ b/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. *

* This allows you to subclass User 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 username if it is diff --git a/core/src/main/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSource.java b/core/src/main/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSource.java index 2ce8f33ac8..dad98b1458 100644 --- a/core/src/main/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSource.java +++ b/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 String as the salt.

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.

* * @author Ben Alex diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java index 0cc258abce..97e7776daf 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java index a00501c432..4ee5b6ec38 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java index 615d201072..3fbe141a4b 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java index 74492f05bc..bd4bdf9b14 100644 --- a/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProvider.java +++ b/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; /** diff --git a/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java b/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java index 68c7f3f61e..91b38f0c6e 100755 --- a/core/src/main/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/core/GrantedAuthority.java b/core/src/main/java/org/springframework/security/core/GrantedAuthority.java index 7277265e39..f313345502 100644 --- a/core/src/main/java/org/springframework/security/core/GrantedAuthority.java +++ b/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. diff --git a/core/src/main/java/org/springframework/security/core/AuthorityUtils.java b/core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java similarity index 94% rename from core/src/main/java/org/springframework/security/core/AuthorityUtils.java rename to core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java index df872f8887..1b86c7eff4 100644 --- a/core/src/main/java/org/springframework/security/core/AuthorityUtils.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainer.java b/core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainer.java similarity index 80% rename from core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainer.java rename to core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainer.java index e6627e2d74..b768f59665 100644 --- a/core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainer.java +++ b/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. *

diff --git a/core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainerImpl.java b/core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainerImpl.java similarity index 86% rename from core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainerImpl.java rename to core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainerImpl.java index f4410c7a0e..340ea40ad2 100644 --- a/core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainerImpl.java +++ b/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 { diff --git a/core/src/main/java/org/springframework/security/core/GrantedAuthorityImpl.java b/core/src/main/java/org/springframework/security/core/authority/GrantedAuthorityImpl.java similarity index 93% rename from core/src/main/java/org/springframework/security/core/GrantedAuthorityImpl.java rename to core/src/main/java/org/springframework/security/core/authority/GrantedAuthorityImpl.java index d6708a48c9..252fb93cf9 100644 --- a/core/src/main/java/org/springframework/security/core/GrantedAuthorityImpl.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/core/MutableGrantedAuthoritiesContainer.java b/core/src/main/java/org/springframework/security/core/authority/MutableGrantedAuthoritiesContainer.java similarity index 83% rename from core/src/main/java/org/springframework/security/core/MutableGrantedAuthoritiesContainer.java rename to core/src/main/java/org/springframework/security/core/authority/MutableGrantedAuthoritiesContainer.java index 302d245eb7..0fa77ce214 100644 --- a/core/src/main/java/org/springframework/security/core/MutableGrantedAuthoritiesContainer.java +++ b/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. *

diff --git a/core/src/main/java/org/springframework/security/core/authoritymapping/Attributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java similarity index 91% rename from core/src/main/java/org/springframework/security/core/authoritymapping/Attributes2GrantedAuthoritiesMapper.java rename to core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java index 11103ed397..28f6a6241a 100755 --- a/core/src/main/java/org/springframework/security/core/authoritymapping/Attributes2GrantedAuthoritiesMapper.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/core/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java similarity index 93% rename from core/src/main/java/org/springframework/security/core/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java rename to core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java index 4a4b7e1306..47adcae34a 100755 --- a/core/src/main/java/org/springframework/security/core/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java +++ b/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 getMappableAttributes() { return mappableAttributes; diff --git a/core/src/main/java/org/springframework/security/core/authoritymapping/MappableAttributesRetriever.java b/core/src/main/java/org/springframework/security/core/authority/mapping/MappableAttributesRetriever.java similarity index 87% rename from core/src/main/java/org/springframework/security/core/authoritymapping/MappableAttributesRetriever.java rename to core/src/main/java/org/springframework/security/core/authority/mapping/MappableAttributesRetriever.java index f9f0d247b5..7054a7ba1b 100755 --- a/core/src/main/java/org/springframework/security/core/authoritymapping/MappableAttributesRetriever.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/core/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java similarity index 93% rename from core/src/main/java/org/springframework/security/core/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java rename to core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java index a0d69cca15..644fed7363 100755 --- a/core/src/main/java/org/springframework/security/core/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/core/authoritymapping/SimpleMappableAttributesRetriever.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java similarity index 80% rename from core/src/main/java/org/springframework/security/core/authoritymapping/SimpleMappableAttributesRetriever.java rename to core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java index 483b082206..4d49c54038 100755 --- a/core/src/main/java/org/springframework/security/core/authoritymapping/SimpleMappableAttributesRetriever.java +++ b/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 getMappableAttributes() { return mappableAttributes; diff --git a/core/src/main/java/org/springframework/security/core/authoritymapping/XmlMappableAttributesRetriever.java b/core/src/main/java/org/springframework/security/core/authority/mapping/XmlMappableAttributesRetriever.java similarity index 96% rename from core/src/main/java/org/springframework/security/core/authoritymapping/XmlMappableAttributesRetriever.java rename to core/src/main/java/org/springframework/security/core/authority/mapping/XmlMappableAttributesRetriever.java index 1950f2e362..52746d2f96 100755 --- a/core/src/main/java/org/springframework/security/core/authoritymapping/XmlMappableAttributesRetriever.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/core/SessionCreationEvent.java b/core/src/main/java/org/springframework/security/core/session/SessionCreationEvent.java similarity index 88% rename from core/src/main/java/org/springframework/security/core/SessionCreationEvent.java rename to core/src/main/java/org/springframework/security/core/session/SessionCreationEvent.java index 17af32b3fe..4b20f2b8c5 100644 --- a/core/src/main/java/org/springframework/security/core/SessionCreationEvent.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/core/SessionDestroyedEvent.java b/core/src/main/java/org/springframework/security/core/session/SessionDestroyedEvent.java similarity index 93% rename from core/src/main/java/org/springframework/security/core/SessionDestroyedEvent.java rename to core/src/main/java/org/springframework/security/core/session/SessionDestroyedEvent.java index 4857cfbf52..b7f23064b7 100644 --- a/core/src/main/java/org/springframework/security/core/SessionDestroyedEvent.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/AuthenticationUserDetailsService.java b/core/src/main/java/org/springframework/security/core/userdetails/AuthenticationUserDetailsService.java similarity index 89% rename from core/src/main/java/org/springframework/security/userdetails/AuthenticationUserDetailsService.java rename to core/src/main/java/org/springframework/security/core/userdetails/AuthenticationUserDetailsService.java index 76725eeaf2..46c496d6c5 100644 --- a/core/src/main/java/org/springframework/security/userdetails/AuthenticationUserDetailsService.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/User.java b/core/src/main/java/org/springframework/security/core/userdetails/User.java similarity index 99% rename from core/src/main/java/org/springframework/security/userdetails/User.java rename to core/src/main/java/org/springframework/security/core/userdetails/User.java index 6a88fb636a..a0ba17110f 100644 --- a/core/src/main/java/org/springframework/security/userdetails/User.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/UserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/UserCache.java similarity index 97% rename from core/src/main/java/org/springframework/security/userdetails/UserCache.java rename to core/src/main/java/org/springframework/security/core/userdetails/UserCache.java index 1c8b5ca3d3..780ad6e027 100644 --- a/core/src/main/java/org/springframework/security/userdetails/UserCache.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/UserDetails.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java similarity index 96% rename from core/src/main/java/org/springframework/security/userdetails/UserDetails.java rename to core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java index 161b7751bb..5e28faeecf 100644 --- a/core/src/main/java/org/springframework/security/userdetails/UserDetails.java +++ b/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; *

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

* diff --git a/core/src/main/java/org/springframework/security/userdetails/UserDetailsByNameServiceWrapper.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapper.java similarity index 94% rename from core/src/main/java/org/springframework/security/userdetails/UserDetailsByNameServiceWrapper.java rename to core/src/main/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapper.java index 1a8c5a2b1f..ede79f911b 100755 --- a/core/src/main/java/org/springframework/security/userdetails/UserDetailsByNameServiceWrapper.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/UserDetailsChecker.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsChecker.java similarity index 95% rename from core/src/main/java/org/springframework/security/userdetails/UserDetailsChecker.java rename to core/src/main/java/org/springframework/security/core/userdetails/UserDetailsChecker.java index 1a396b7401..1e53f5daba 100644 --- a/core/src/main/java/org/springframework/security/userdetails/UserDetailsChecker.java +++ b/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 diff --git a/core/src/main/java/org/springframework/security/userdetails/UserDetailsService.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java similarity index 97% rename from core/src/main/java/org/springframework/security/userdetails/UserDetailsService.java rename to core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java index c5d869a829..8dac8f0f87 100644 --- a/core/src/main/java/org/springframework/security/userdetails/UserDetailsService.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/UsernameNotFoundException.java b/core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java similarity index 97% rename from core/src/main/java/org/springframework/security/userdetails/UsernameNotFoundException.java rename to core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java index a8b4cf218b..b5c833341d 100644 --- a/core/src/main/java/org/springframework/security/userdetails/UsernameNotFoundException.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/cache/EhCacheBasedUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java similarity index 94% rename from core/src/main/java/org/springframework/security/userdetails/cache/EhCacheBasedUserCache.java rename to core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java index 7c308b7ba7..4fc745a8c6 100644 --- a/core/src/main/java/org/springframework/security/userdetails/cache/EhCacheBasedUserCache.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/cache/NullUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java similarity index 84% rename from core/src/main/java/org/springframework/security/userdetails/cache/NullUserCache.java rename to core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java index 353940964d..3436ae4eed 100644 --- a/core/src/main/java/org/springframework/security/userdetails/cache/NullUserCache.java +++ b/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; /** diff --git a/core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java similarity index 96% rename from core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcDaoImpl.java rename to core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java index bb8a50f4e8..1ed729c331 100644 --- a/core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcDaoImpl.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/jdbc/package.html b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/package.html similarity index 100% rename from core/src/main/java/org/springframework/security/userdetails/jdbc/package.html rename to core/src/main/java/org/springframework/security/core/userdetails/jdbc/package.html diff --git a/core/src/main/java/org/springframework/security/userdetails/memory/InMemoryDaoImpl.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/InMemoryDaoImpl.java similarity index 89% rename from core/src/main/java/org/springframework/security/userdetails/memory/InMemoryDaoImpl.java rename to core/src/main/java/org/springframework/security/core/userdetails/memory/InMemoryDaoImpl.java index ad3082d75d..30eb427df6 100644 --- a/core/src/main/java/org/springframework/security/userdetails/memory/InMemoryDaoImpl.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/memory/UserAttribute.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java similarity index 95% rename from core/src/main/java/org/springframework/security/userdetails/memory/UserAttribute.java rename to core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java index c3000ac732..d88756ac55 100644 --- a/core/src/main/java/org/springframework/security/userdetails/memory/UserAttribute.java +++ b/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; /** diff --git a/core/src/main/java/org/springframework/security/userdetails/memory/UserAttributeEditor.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java similarity index 97% rename from core/src/main/java/org/springframework/security/userdetails/memory/UserAttributeEditor.java rename to core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java index 1acc590016..0cd83f6bd4 100644 --- a/core/src/main/java/org/springframework/security/userdetails/memory/UserAttributeEditor.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/memory/UserMap.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserMap.java similarity index 93% rename from core/src/main/java/org/springframework/security/userdetails/memory/UserMap.java rename to core/src/main/java/org/springframework/security/core/userdetails/memory/UserMap.java index 2c7744e466..8c92933126 100644 --- a/core/src/main/java/org/springframework/security/userdetails/memory/UserMap.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/memory/UserMapEditor.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserMapEditor.java similarity index 95% rename from core/src/main/java/org/springframework/security/userdetails/memory/UserMapEditor.java rename to core/src/main/java/org/springframework/security/core/userdetails/memory/UserMapEditor.java index 6d32b1cc6f..cc915af583 100644 --- a/core/src/main/java/org/springframework/security/userdetails/memory/UserMapEditor.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/userdetails/memory/package.html b/core/src/main/java/org/springframework/security/core/userdetails/memory/package.html similarity index 100% rename from core/src/main/java/org/springframework/security/userdetails/memory/package.html rename to core/src/main/java/org/springframework/security/core/userdetails/memory/package.html diff --git a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java index 5420d7f43f..d954776961 100644 --- a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java +++ b/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; diff --git a/core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java index a464bd6a50..baa0bf27f4 100644 --- a/core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java +++ b/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 diff --git a/core/src/main/resources/org/springframework/security/adapters/acegisecurity.xml b/core/src/main/resources/org/springframework/security/adapters/acegisecurity.xml index bc0462349d..5e46228021 100644 --- a/core/src/main/resources/org/springframework/security/adapters/acegisecurity.xml +++ b/core/src/main/resources/org/springframework/security/adapters/acegisecurity.xml @@ -22,7 +22,7 @@ - + rod=koala,ROLE_TELLER,ROLE_SUPERVISOR diff --git a/core/src/main/resources/org/springframework/security/adapters/adaptertest-invalid.xml b/core/src/main/resources/org/springframework/security/adapters/adaptertest-invalid.xml index 2e96497d92..555110407c 100644 --- a/core/src/main/resources/org/springframework/security/adapters/adaptertest-invalid.xml +++ b/core/src/main/resources/org/springframework/security/adapters/adaptertest-invalid.xml @@ -22,7 +22,7 @@ - + rod=koala,ROLE_TELLER,ROLE_SUPERVISOR diff --git a/core/src/main/resources/org/springframework/security/adapters/adaptertest-valid.xml b/core/src/main/resources/org/springframework/security/adapters/adaptertest-valid.xml index bc0462349d..5e46228021 100644 --- a/core/src/main/resources/org/springframework/security/adapters/adaptertest-valid.xml +++ b/core/src/main/resources/org/springframework/security/adapters/adaptertest-valid.xml @@ -22,7 +22,7 @@ - + rod=koala,ROLE_TELLER,ROLE_SUPERVISOR diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java index fc9d4904c3..266e7a5987 100755 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java +++ b/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}. diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java index 14a51b379d..4e3087ccc7 100755 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java +++ b/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}. diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapperTests.java index ff90239b1f..adad24f009 100755 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapperTests.java +++ b/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") diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapperTests.java index 091a7e1f7e..7b7d5b0cb3 100755 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapperTests.java +++ b/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}. diff --git a/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java index 3d3547cf64..a5f44c3cc1 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java +++ b/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; /** diff --git a/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java index 03a86bcf8e..7dbd7daf31 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java +++ b/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; /** diff --git a/core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java index 6108404aec..315c51b797 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java +++ b/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; /** diff --git a/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java index e54bb9c345..afc98e3ba5 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java +++ b/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; /** diff --git a/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java index 3e75afe466..a20e27b01b 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java +++ b/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; /** diff --git a/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java index dd62d35661..8d47e61e3c 100644 --- a/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java +++ b/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; /** diff --git a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java index bebb9c097d..3482f73ff2 100644 --- a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java +++ b/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; /** diff --git a/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java b/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java index 782d895607..5da9dcaab8 100644 --- a/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java +++ b/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java @@ -21,7 +21,7 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.AuthenticationTrustResolverImpl; import org.springframework.security.authentication.RememberMeAuthenticationToken; import org.springframework.security.authentication.TestingAuthenticationToken; -import org.springframework.security.core.AuthorityUtils; +import org.springframework.security.core.authority.AuthorityUtils; /** diff --git a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java index e659927c3f..e53108a613 100644 --- a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java @@ -34,8 +34,8 @@ import org.springframework.security.authentication.concurrent.ConcurrentSessionC import org.springframework.security.authentication.concurrent.NullConcurrentSessionController; 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.authority.AuthorityUtils; /** * Tests {@link ProviderManager}. diff --git a/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java index 89f0d9f3ce..84ca4fb468 100644 --- a/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java @@ -21,7 +21,7 @@ import static org.junit.Assert.fail; import org.junit.Test; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.AuthorityUtils; +import org.springframework.security.core.authority.AuthorityUtils; /** diff --git a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java index 1bf4620045..437c4467e5 100644 --- a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java @@ -23,9 +23,9 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; -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; /** diff --git a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java index 833411d613..1a56852a6a 100644 --- a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java @@ -21,8 +21,8 @@ import junit.framework.TestCase; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; /** diff --git a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java index 5283629abe..2950b16a77 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java @@ -32,15 +32,15 @@ import org.springframework.security.authentication.dao.DaoAuthenticationProvider import org.springframework.security.authentication.dao.salt.SystemWideSaltSource; import org.springframework.security.authentication.encoding.ShaPasswordEncoder; 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; +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.security.core.userdetails.cache.EhCacheBasedUserCache; +import org.springframework.security.core.userdetails.cache.NullUserCache; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UserDetailsService; -import org.springframework.security.userdetails.UsernameNotFoundException; -import org.springframework.security.userdetails.cache.EhCacheBasedUserCache; -import org.springframework.security.userdetails.cache.NullUserCache; import org.springframework.dao.DataAccessException; import org.springframework.dao.DataRetrievalFailureException; diff --git a/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java b/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java index dd40e887f2..5205a559b7 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java @@ -6,9 +6,9 @@ package org.springframework.security.authentication.dao; import java.util.HashMap; import java.util.Map; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserCache; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserCache; +import org.springframework.security.core.userdetails.UserDetails; public class MockUserCache implements UserCache { private Map cache = new HashMap(); diff --git a/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java b/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java index b9f29e6004..6f33b570a3 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java @@ -20,9 +20,9 @@ import static junit.framework.Assert.assertEquals; import org.junit.Test; import org.springframework.security.authentication.AuthenticationServiceException; import org.springframework.security.authentication.dao.salt.ReflectionSaltSource; -import org.springframework.security.core.AuthorityUtils; -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 ReflectionSaltSource}. diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java index 5eb9efad32..ec4f0687a1 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java @@ -37,11 +37,11 @@ import org.springframework.security.authentication.jaas.JaasGrantedAuthority; import org.springframework.security.authentication.jaas.LoginExceptionResolver; 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.SessionDestroyedEvent; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.authority.GrantedAuthorityImpl; import org.springframework.security.core.context.SecurityContextImpl; +import org.springframework.security.core.session.SessionDestroyedEvent; /** diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java b/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java index ce86433550..c3e056033e 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java @@ -11,7 +11,7 @@ import org.springframework.security.authentication.jaas.JaasAuthenticationProvid import org.springframework.security.authentication.jaas.JaasNameCallbackHandler; import org.springframework.security.authentication.jaas.JaasPasswordCallbackHandler; import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthorityUtils; +import org.springframework.security.core.authority.AuthorityUtils; /** * Tests bug reported in SEC-760. diff --git a/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java index 5db84a0d27..91d3bd16f4 100755 --- a/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java @@ -11,11 +11,11 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.authentication.preauth.PreAuthenticatedAuthenticationProvider; import org.springframework.security.authentication.preauth.PreAuthenticatedAuthenticationToken; import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthorityUtils; -import org.springframework.security.userdetails.AuthenticationUserDetailsService; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UsernameNotFoundException; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.AuthenticationUserDetailsService; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; /** * diff --git a/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java index f12e4df3d9..99eb0cfd63 100755 --- a/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java @@ -5,8 +5,8 @@ import java.util.List; import junit.framework.TestCase; import org.springframework.security.authentication.preauth.PreAuthenticatedAuthenticationToken; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; /** * diff --git a/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java b/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java index 492aa32190..657bba24ee 100755 --- a/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java +++ b/core/src/test/java/org/springframework/security/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java @@ -7,10 +7,10 @@ import java.util.List; import org.junit.Test; import org.springframework.security.authentication.preauth.PreAuthenticatedAuthenticationToken; import org.springframework.security.authentication.preauth.PreAuthenticatedGrantedAuthoritiesUserDetailsService; -import org.springframework.security.core.AuthorityUtils; -import org.springframework.security.core.GrantedAuthoritiesContainer; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.authority.GrantedAuthoritiesContainer; +import org.springframework.security.core.userdetails.UserDetails; /** * diff --git a/core/src/test/java/org/springframework/security/authentication/preauth/UserDetailsByNameServiceWrapperTests.java b/core/src/test/java/org/springframework/security/authentication/preauth/UserDetailsByNameServiceWrapperTests.java index c9be6d7603..ebd3a3dbd2 100755 --- a/core/src/test/java/org/springframework/security/authentication/preauth/UserDetailsByNameServiceWrapperTests.java +++ b/core/src/test/java/org/springframework/security/authentication/preauth/UserDetailsByNameServiceWrapperTests.java @@ -4,12 +4,12 @@ import junit.framework.TestCase; import org.springframework.dao.DataAccessException; import org.springframework.security.authentication.preauth.PreAuthenticatedAuthenticationToken; -import org.springframework.security.core.AuthorityUtils; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper; -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.UserDetailsByNameServiceWrapper; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; /** * diff --git a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java index bb7356d7b4..81f8e995be 100644 --- a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java @@ -24,7 +24,7 @@ import org.springframework.security.authentication.rcp.RemoteAuthenticationManag import org.springframework.security.authentication.rcp.RemoteAuthenticationProvider; 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; /** diff --git a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java index b2f7afc0b5..4ac55aba12 100644 --- a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java @@ -22,7 +22,7 @@ import org.springframework.security.authentication.RememberMeAuthenticationProvi import org.springframework.security.authentication.RememberMeAuthenticationToken; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthorityUtils; +import org.springframework.security.core.authority.AuthorityUtils; /** diff --git a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java index 91462ac015..f7c13e8400 100644 --- a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java @@ -22,8 +22,8 @@ import junit.framework.TestCase; import org.springframework.security.authentication.RememberMeAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; /** * Tests {@link RememberMeAuthenticationToken}. diff --git a/core/src/test/java/org/springframework/security/core/GrantedAuthorityImplTests.java b/core/src/test/java/org/springframework/security/core/authority/GrantedAuthorityImplTests.java similarity index 96% rename from core/src/test/java/org/springframework/security/core/GrantedAuthorityImplTests.java rename to core/src/test/java/org/springframework/security/core/authority/GrantedAuthorityImplTests.java index 858de68ed5..b98d1660a7 100644 --- a/core/src/test/java/org/springframework/security/core/GrantedAuthorityImplTests.java +++ b/core/src/test/java/org/springframework/security/core/authority/GrantedAuthorityImplTests.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.springframework.security.core; +package org.springframework.security.core.authority; import static org.junit.Assert.*; import org.junit.Test; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.GrantedAuthorityImpl; +import org.springframework.security.core.authority.GrantedAuthorityImpl; /** diff --git a/core/src/test/java/org/springframework/security/core/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java b/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java similarity index 94% rename from core/src/test/java/org/springframework/security/core/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java rename to core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java index d5576b676e..c20ba6ed3d 100755 --- a/core/src/test/java/org/springframework/security/core/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java +++ b/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java @@ -1,4 +1,4 @@ -package org.springframework.security.core.authoritymapping; +package org.springframework.security.core.authority.mapping; import static org.junit.Assert.*; @@ -12,9 +12,9 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.junit.Test; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.GrantedAuthorityImpl; -import org.springframework.security.core.authoritymapping.Attributes2GrantedAuthoritiesMapper; -import org.springframework.security.core.authoritymapping.MapBasedAttributes2GrantedAuthoritiesMapper; +import org.springframework.security.core.authority.GrantedAuthorityImpl; +import org.springframework.security.core.authority.mapping.Attributes2GrantedAuthoritiesMapper; +import org.springframework.security.core.authority.mapping.MapBasedAttributes2GrantedAuthoritiesMapper; /** * diff --git a/core/src/test/java/org/springframework/security/core/authoritymapping/SimpleMappableRolesRetrieverTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleMappableRolesRetrieverTests.java similarity index 82% rename from core/src/test/java/org/springframework/security/core/authoritymapping/SimpleMappableRolesRetrieverTests.java rename to core/src/test/java/org/springframework/security/core/authority/mapping/SimpleMappableRolesRetrieverTests.java index f54622bf0b..049f4c2ddc 100755 --- a/core/src/test/java/org/springframework/security/core/authoritymapping/SimpleMappableRolesRetrieverTests.java +++ b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleMappableRolesRetrieverTests.java @@ -1,10 +1,10 @@ -package org.springframework.security.core.authoritymapping; +package org.springframework.security.core.authority.mapping; import java.util.Set; import junit.framework.TestCase; -import org.springframework.security.core.authoritymapping.SimpleMappableAttributesRetriever; +import org.springframework.security.core.authority.mapping.SimpleMappableAttributesRetriever; import org.springframework.util.StringUtils; /** diff --git a/core/src/test/java/org/springframework/security/core/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java similarity index 94% rename from core/src/test/java/org/springframework/security/core/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java rename to core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java index bbfa12c673..a74786af67 100755 --- a/core/src/test/java/org/springframework/security/core/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java +++ b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.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.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper; +import org.springframework.security.core.authority.mapping.SimpleAttributes2GrantedAuthoritiesMapper; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/test/java/org/springframework/security/core/authoritymapping/XmlMappableRolesRetrieverTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/XmlMappableRolesRetrieverTests.java similarity index 93% rename from core/src/test/java/org/springframework/security/core/authoritymapping/XmlMappableRolesRetrieverTests.java rename to core/src/test/java/org/springframework/security/core/authority/mapping/XmlMappableRolesRetrieverTests.java index 2978a0ed9c..75d21e7ecf 100755 --- a/core/src/test/java/org/springframework/security/core/authoritymapping/XmlMappableRolesRetrieverTests.java +++ b/core/src/test/java/org/springframework/security/core/authority/mapping/XmlMappableRolesRetrieverTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.core.authoritymapping; +package org.springframework.security.core.authority.mapping; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Set; -import org.springframework.security.core.authoritymapping.XmlMappableAttributesRetriever; +import org.springframework.security.core.authority.mapping.XmlMappableAttributesRetriever; import junit.framework.TestCase; diff --git a/core/src/test/java/org/springframework/security/userdetails/MockUserDetailsService.java b/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java similarity index 77% rename from core/src/test/java/org/springframework/security/userdetails/MockUserDetailsService.java rename to core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java index ff48396170..18f67d685f 100644 --- a/core/src/test/java/org/springframework/security/userdetails/MockUserDetailsService.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java @@ -1,12 +1,16 @@ -package org.springframework.security.userdetails; +package org.springframework.security.core.userdetails; import java.util.HashMap; import java.util.List; import java.util.Map; import org.springframework.dao.DataAccessException; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; +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; /** * A test UserDetailsService containing a set of standard usernames corresponding to their account status: diff --git a/core/src/test/java/org/springframework/security/userdetails/UserTests.java b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java similarity index 93% rename from core/src/test/java/org/springframework/security/userdetails/UserTests.java rename to core/src/test/java/org/springframework/security/core/userdetails/UserTests.java index 8426937a7b..79216d19ee 100644 --- a/core/src/test/java/org/springframework/security/userdetails/UserTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java @@ -13,18 +13,18 @@ * limitations under the License. */ -package org.springframework.security.userdetails; +package org.springframework.security.core.userdetails; import java.util.List; import junit.framework.TestCase; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.GrantedAuthorityImpl; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; +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; /** diff --git a/core/src/test/java/org/springframework/security/userdetails/cache/EhCacheBasedUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java similarity index 91% rename from core/src/test/java/org/springframework/security/userdetails/cache/EhCacheBasedUserCacheTests.java rename to core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java index 313d3a2627..ff22b551f7 100644 --- a/core/src/test/java/org/springframework/security/userdetails/cache/EhCacheBasedUserCacheTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.userdetails.cache; +package org.springframework.security.core.userdetails.cache; import static org.junit.Assert.*; @@ -24,9 +24,9 @@ import net.sf.ehcache.Ehcache; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.security.core.AuthorityUtils; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.cache.EhCacheBasedUserCache; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.cache.EhCacheBasedUserCache; /** * Tests {@link EhCacheBasedUserCache}. diff --git a/core/src/test/java/org/springframework/security/userdetails/cache/NullUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java similarity index 83% rename from core/src/test/java/org/springframework/security/userdetails/cache/NullUserCacheTests.java rename to core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java index beee186238..870d0893ac 100644 --- a/core/src/test/java/org/springframework/security/userdetails/cache/NullUserCacheTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.springframework.security.userdetails.cache; +package org.springframework.security.core.userdetails.cache; import junit.framework.TestCase; -import org.springframework.security.core.AuthorityUtils; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.cache.NullUserCache; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.cache.NullUserCache; /** diff --git a/core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcDaoImplTests.java b/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java similarity index 95% rename from core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcDaoImplTests.java rename to core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java index 60dc36bf23..64afa203b6 100644 --- a/core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcDaoImplTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java @@ -13,15 +13,16 @@ * limitations under the License. */ -package org.springframework.security.userdetails.jdbc; +package org.springframework.security.core.userdetails.jdbc; import java.util.HashSet; import junit.framework.TestCase; import org.springframework.security.PopulatedDatabase; -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.springframework.security.core.userdetails.jdbc.JdbcDaoImpl; /** diff --git a/core/src/test/java/org/springframework/security/userdetails/memory/InMemoryDaoTests.java b/core/src/test/java/org/springframework/security/core/userdetails/memory/InMemoryDaoTests.java similarity index 92% rename from core/src/test/java/org/springframework/security/userdetails/memory/InMemoryDaoTests.java rename to core/src/test/java/org/springframework/security/core/userdetails/memory/InMemoryDaoTests.java index cbb3ee1b7f..e4bc8abb1c 100644 --- a/core/src/test/java/org/springframework/security/userdetails/memory/InMemoryDaoTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/memory/InMemoryDaoTests.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package org.springframework.security.userdetails.memory; +package org.springframework.security.core.userdetails.memory; import junit.framework.TestCase; -import org.springframework.security.userdetails.UsernameNotFoundException; -import org.springframework.security.userdetails.memory.InMemoryDaoImpl; -import org.springframework.security.userdetails.memory.UserMap; -import org.springframework.security.userdetails.memory.UserMapEditor; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.core.userdetails.memory.InMemoryDaoImpl; +import org.springframework.security.core.userdetails.memory.UserMap; +import org.springframework.security.core.userdetails.memory.UserMapEditor; import java.util.Properties; diff --git a/core/src/test/java/org/springframework/security/userdetails/memory/UserAttributeEditorTests.java b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java similarity index 95% rename from core/src/test/java/org/springframework/security/userdetails/memory/UserAttributeEditorTests.java rename to core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java index 17c00b63e6..23abbbe456 100644 --- a/core/src/test/java/org/springframework/security/userdetails/memory/UserAttributeEditorTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.springframework.security.userdetails.memory; +package org.springframework.security.core.userdetails.memory; import junit.framework.TestCase; -import org.springframework.security.userdetails.memory.UserAttribute; -import org.springframework.security.userdetails.memory.UserAttributeEditor; +import org.springframework.security.core.userdetails.memory.UserAttribute; +import org.springframework.security.core.userdetails.memory.UserAttributeEditor; /** diff --git a/core/src/test/java/org/springframework/security/userdetails/memory/UserMapEditorTests.java b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapEditorTests.java similarity index 94% rename from core/src/test/java/org/springframework/security/userdetails/memory/UserMapEditorTests.java rename to core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapEditorTests.java index ce20d2fd4f..cfd929b350 100644 --- a/core/src/test/java/org/springframework/security/userdetails/memory/UserMapEditorTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapEditorTests.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.springframework.security.userdetails.memory; +package org.springframework.security.core.userdetails.memory; import junit.framework.TestCase; -import org.springframework.security.userdetails.memory.UserMap; -import org.springframework.security.userdetails.memory.UserMapEditor; +import org.springframework.security.core.userdetails.memory.UserMap; +import org.springframework.security.core.userdetails.memory.UserMapEditor; /** diff --git a/core/src/test/java/org/springframework/security/userdetails/memory/UserMapTests.java b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapTests.java similarity index 86% rename from core/src/test/java/org/springframework/security/userdetails/memory/UserMapTests.java rename to core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapTests.java index 6e8855b485..4043961496 100644 --- a/core/src/test/java/org/springframework/security/userdetails/memory/UserMapTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapTests.java @@ -13,14 +13,15 @@ * limitations under the License. */ -package org.springframework.security.userdetails.memory; +package org.springframework.security.core.userdetails.memory; import junit.framework.TestCase; -import org.springframework.security.core.AuthorityUtils; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; -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.UsernameNotFoundException; +import org.springframework.security.core.userdetails.memory.UserMap; /** diff --git a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java index 63af6d1c02..010ec95ede 100644 --- a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java +++ b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java @@ -23,14 +23,14 @@ import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; -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.core.userdetails.User; +import org.springframework.security.core.userdetails.UserCache; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.provisioning.JdbcUserDetailsManager; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserCache; -import org.springframework.security.userdetails.UserDetails; /** * Tests for {@link JdbcUserDetailsManager} diff --git a/core/src/test/java/org/springframework/security/util/AuthorityUtilsTests.java b/core/src/test/java/org/springframework/security/util/AuthorityUtilsTests.java index ec6f3e4280..7b0bc91d69 100644 --- a/core/src/test/java/org/springframework/security/util/AuthorityUtilsTests.java +++ b/core/src/test/java/org/springframework/security/util/AuthorityUtilsTests.java @@ -9,8 +9,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.context.SecurityContextHolder; /** diff --git a/core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml b/core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml index bce027e5e0..6a3dfa1f6e 100644 --- a/core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml +++ b/core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml @@ -1,7 +1,7 @@ - + blueuser=password,ROLE_BASIC,LABEL_BLUE diff --git a/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java b/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java index f130d658e1..2972217864 100755 --- a/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java +++ b/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java @@ -1,8 +1,8 @@ package org.springframework.security.integration; import org.springframework.beans.factory.annotation.Required; -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.transaction.annotation.Transactional; public class UserDetailsServiceImpl implements UserDetailsService { diff --git a/itest/context/src/test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java b/itest/context/src/test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java index 68c3ab456f..5530ee8937 100644 --- a/itest/context/src/test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java +++ b/itest/context/src/test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java @@ -5,7 +5,7 @@ import static org.junit.Assert.*; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/itest/context/src/test/java/org/springframework/security/performance/FilterChainPerformanceTests.java b/itest/context/src/test/java/org/springframework/security/performance/FilterChainPerformanceTests.java index 9192bc140e..a53b6700be 100644 --- a/itest/context/src/test/java/org/springframework/security/performance/FilterChainPerformanceTests.java +++ b/itest/context/src/test/java/org/springframework/security/performance/FilterChainPerformanceTests.java @@ -18,7 +18,7 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpSession; 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; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.FilterChainProxy; import org.springframework.security.web.context.HttpSessionSecurityContextRepository; diff --git a/itest/context/src/test/resources/filter-chain-performance-app-context.xml b/itest/context/src/test/resources/filter-chain-performance-app-context.xml index ad632725b0..2ac665b702 100644 --- a/itest/context/src/test/resources/filter-chain-performance-app-context.xml +++ b/itest/context/src/test/resources/filter-chain-performance-app-context.xml @@ -75,7 +75,7 @@ - + diff --git a/ldap/src/main/java/org/springframework/security/ldap/LdapUserSearch.java b/ldap/src/main/java/org/springframework/security/ldap/LdapUserSearch.java index 0489316089..88ed1c2f41 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/LdapUserSearch.java +++ b/ldap/src/main/java/org/springframework/security/ldap/LdapUserSearch.java @@ -16,7 +16,7 @@ package org.springframework.security.ldap; import org.springframework.ldap.core.DirContextOperations; -import org.springframework.security.userdetails.UsernameNotFoundException; +import org.springframework.security.core.userdetails.UsernameNotFoundException; /** diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java index fa721fb269..ad03ca503e 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java @@ -23,16 +23,16 @@ import org.springframework.security.authentication.BadCredentialsException; 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.SpringSecurityMessageSource; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.ldap.LdapAuthenticator; import org.springframework.security.ldap.LdapAuthoritiesPopulator; import org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator; import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper; import org.springframework.security.ldap.userdetails.UserDetailsContextMapper; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.context.MessageSource; import org.springframework.context.MessageSourceAware; import org.springframework.context.support.MessageSourceAccessor; diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java index 8b2e481fd4..252fdea5a5 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java @@ -25,9 +25,9 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.authentication.encoding.LdapShaPasswordEncoder; import org.springframework.security.authentication.encoding.PasswordEncoder; import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.ldap.LdapUtils; import org.springframework.security.ldap.SpringSecurityLdapTemplate; -import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.util.Assert; diff --git a/ldap/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java index e8418ad119..cbd0ab1200 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulator.java @@ -16,7 +16,7 @@ package org.springframework.security.ldap.populator; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.GrantedAuthorityImpl; +import org.springframework.security.core.authority.GrantedAuthorityImpl; import org.springframework.security.ldap.SpringSecurityLdapTemplate; import org.springframework.security.ldap.LdapAuthoritiesPopulator; import org.springframework.ldap.core.ContextSource; diff --git a/ldap/src/main/java/org/springframework/security/ldap/populator/UserDetailsServiceLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/populator/UserDetailsServiceLdapAuthoritiesPopulator.java index 4f84ee0486..d9ca859bd5 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/populator/UserDetailsServiceLdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/populator/UserDetailsServiceLdapAuthoritiesPopulator.java @@ -3,8 +3,8 @@ package org.springframework.security.ldap.populator; import java.util.List; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.ldap.LdapAuthoritiesPopulator; -import org.springframework.security.userdetails.UserDetailsService; import org.springframework.ldap.core.DirContextOperations; import org.springframework.util.Assert; diff --git a/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java b/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java index 7c7377fc09..06beb39bfd 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java +++ b/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java @@ -15,10 +15,10 @@ package org.springframework.security.ldap.search; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.ldap.SpringSecurityLdapTemplate; import org.springframework.security.ldap.LdapUserSearch; -import org.springframework.security.userdetails.UsernameNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPersonContextMapper.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPersonContextMapper.java index 4ff1c78f2d..bcbc47f4da 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPersonContextMapper.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPersonContextMapper.java @@ -17,7 +17,7 @@ package org.springframework.security.ldap.userdetails; import java.util.List; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.util.Assert; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java index ad1f5d9c6f..d8c164c0ef 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java @@ -15,7 +15,7 @@ package org.springframework.security.ldap.userdetails; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetails; /** * Captures the information for a user's LDAP entry. diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java index 373ea75cd2..806b7a031e 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java @@ -21,8 +21,8 @@ import java.util.List; import javax.naming.Name; import org.springframework.ldap.core.DirContextOperations; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.util.Assert; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java index 0251dac2d5..d304c3845e 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java @@ -17,14 +17,14 @@ package org.springframework.security.ldap.userdetails; import org.springframework.security.authentication.BadCredentialsException; 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.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.ldap.LdapUsernameToDnMapper; import org.springframework.security.ldap.LdapUtils; import org.springframework.security.ldap.DefaultLdapUsernameToDnMapper; import org.springframework.security.provisioning.UserDetailsManager; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.dao.DataAccessException; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.AttributesMapperCallbackHandler; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java index 9884260327..36b8cf7b4e 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java @@ -18,8 +18,8 @@ package org.springframework.security.ldap.userdetails; import java.util.List; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.GrantedAuthorityImpl; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.authority.GrantedAuthorityImpl; +import org.springframework.security.core.userdetails.UserDetails; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java index 69329fe268..4dfcb39fdc 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java @@ -1,11 +1,11 @@ package org.springframework.security.ldap.userdetails; import org.springframework.ldap.core.DirContextOperations; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.ldap.LdapAuthoritiesPopulator; import org.springframework.security.ldap.LdapUserSearch; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UserDetailsService; -import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.util.Assert; /** diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/PersonContextMapper.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/PersonContextMapper.java index 8070715cef..c0b65213fa 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/PersonContextMapper.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/PersonContextMapper.java @@ -3,7 +3,7 @@ package org.springframework.security.ldap.userdetails; import java.util.List; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.util.Assert; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/UserDetailsContextMapper.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/UserDetailsContextMapper.java index 7e0b5199fe..883dd97cd6 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/UserDetailsContextMapper.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/UserDetailsContextMapper.java @@ -17,7 +17,7 @@ package org.springframework.security.ldap.userdetails; import java.util.List; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.DirContextAdapter; diff --git a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java index e3bec5eb29..7184dd9e98 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java @@ -2,7 +2,7 @@ package org.springframework.security.ldap; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.TestingAuthenticationToken; -import org.springframework.security.core.AuthorityUtils; +import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.ldap.userdetails.LdapUserDetailsImpl; import org.springframework.ldap.core.AuthenticationSource; diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java index d84ad8b8e4..11107cb5bc 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java @@ -30,13 +30,13 @@ import org.springframework.ldap.core.DistinguishedName; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; 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; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.ldap.LdapAuthenticator; import org.springframework.security.ldap.LdapAuthoritiesPopulator; import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UsernameNotFoundException; /** diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java index 8d053f8121..edeb9c4c2d 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java @@ -21,11 +21,11 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.authentication.encoding.LdapShaPasswordEncoder; import org.springframework.security.authentication.encoding.PlaintextPasswordEncoder; import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.ldap.AbstractLdapIntegrationTests; import org.springframework.security.ldap.authentication.PasswordComparisonAuthenticator; -import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DistinguishedName; diff --git a/ldap/src/test/java/org/springframework/security/ldap/populator/UserDetailsServiceLdapAuthoritiesPopulatorTests.java b/ldap/src/test/java/org/springframework/security/ldap/populator/UserDetailsServiceLdapAuthoritiesPopulatorTests.java index 8469877c48..f4207f5902 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/populator/UserDetailsServiceLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/populator/UserDetailsServiceLdapAuthoritiesPopulatorTests.java @@ -7,10 +7,10 @@ import java.util.List; import org.junit.Test; import org.springframework.ldap.core.DirContextAdapter; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UserDetailsService; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; /** * @author Luke Taylor diff --git a/ldap/src/test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java b/ldap/src/test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java index 93b0635920..e799c13112 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java @@ -15,8 +15,8 @@ package org.springframework.security.ldap.search; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.ldap.AbstractLdapIntegrationTests; -import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.DistinguishedName; diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java index a264889055..270d7f2a6f 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java @@ -26,9 +26,10 @@ import org.junit.Test; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.ldap.AbstractLdapIntegrationTests; import org.springframework.security.ldap.DefaultLdapUsernameToDnMapper; import org.springframework.security.ldap.SpringSecurityLdapTemplate; @@ -37,7 +38,6 @@ import org.springframework.security.ldap.userdetails.InetOrgPersonContextMapper; import org.springframework.security.ldap.userdetails.LdapUserDetails; import org.springframework.security.ldap.userdetails.LdapUserDetailsManager; import org.springframework.security.ldap.userdetails.PersonContextMapper; -import org.springframework.security.userdetails.UsernameNotFoundException; /** * @author Luke Taylor diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java index ed3ebcfec6..f5a5f85c8f 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DistinguishedName; -import org.springframework.security.core.AuthorityUtils; +import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.ldap.userdetails.LdapUserDetails; import org.springframework.security.ldap.userdetails.LdapUserDetailsImpl; import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper; diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java index 744b3c2509..582ee5a88c 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java @@ -10,13 +10,13 @@ import org.junit.Test; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.DistinguishedName; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.ldap.LdapAuthoritiesPopulator; import org.springframework.security.ldap.authentication.MockUserSearch; import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper; import org.springframework.security.ldap.userdetails.LdapUserDetailsService; -import org.springframework.security.userdetails.UserDetails; /** * Tests for {@link LdapUserDetailsService} diff --git a/ntlm/applicationContext.xml b/ntlm/applicationContext.xml index 20ac95f531..ee6f35b59b 100755 --- a/ntlm/applicationContext.xml +++ b/ntlm/applicationContext.xml @@ -50,7 +50,7 @@ - + jdoe=PASSWORD,ROLE_USER diff --git a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java index eb7ac91ad4..142a0488e8 100755 --- a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java +++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmUsernamePasswordAuthenticationToken.java @@ -20,8 +20,8 @@ import java.util.List; import jcifs.smb.NtlmPasswordAuthentication; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; /** * An NTLM-specific {@link UsernamePasswordAuthenticationToken} that allows any provider to bypass the problem of an diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java index f36a495a22..d7720bf436 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java @@ -20,8 +20,8 @@ import org.springframework.security.authentication.AuthenticationServiceExceptio import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.Authentication; 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.util.Assert; diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java index 7eb19aa7b9..9afa9d9039 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java @@ -15,20 +15,20 @@ package org.springframework.security.openid; import junit.framework.TestCase; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.User; import org.springframework.security.authentication.AuthenticationServiceException; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.GrantedAuthorityImpl; +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.openid.AuthenticationCancelledException; import org.springframework.security.openid.OpenIDAuthenticationProvider; import org.springframework.security.openid.OpenIDAuthenticationStatus; import org.springframework.security.openid.OpenIDAuthenticationToken; -import org.springframework.security.userdetails.UserDetailsService; /** diff --git a/portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetails.java b/portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetails.java index 6763de7bef..68e2e8e61b 100644 --- a/portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetails.java +++ b/portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetails.java @@ -7,7 +7,7 @@ import java.util.List; import javax.portlet.PortletRequest; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.MutableGrantedAuthoritiesContainer; +import org.springframework.security.core.authority.MutableGrantedAuthoritiesContainer; import org.springframework.util.Assert; public class PortletPreAuthenticatedAuthenticationDetails extends PortletAuthenticationDetails implements MutableGrantedAuthoritiesContainer { diff --git a/portlet/src/test/java/org/springframework/security/portlet/PortletProcessingInterceptorTests.java b/portlet/src/test/java/org/springframework/security/portlet/PortletProcessingInterceptorTests.java index afdd01b804..963beeefc7 100644 --- a/portlet/src/test/java/org/springframework/security/portlet/PortletProcessingInterceptorTests.java +++ b/portlet/src/test/java/org/springframework/security/portlet/PortletProcessingInterceptorTests.java @@ -38,10 +38,10 @@ import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.preauth.PreAuthenticatedAuthenticationToken; import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthorityUtils; +import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.User; import org.springframework.security.portlet.PortletProcessingInterceptor; -import org.springframework.security.userdetails.User; /** * Tests {@link PortletProcessingInterceptor}. diff --git a/portlet/src/test/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptorTests.java b/portlet/src/test/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptorTests.java index be116caf81..0eaaccea49 100644 --- a/portlet/src/test/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptorTests.java +++ b/portlet/src/test/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptorTests.java @@ -22,12 +22,12 @@ import junit.framework.TestCase; import org.springframework.security.authentication.preauth.PreAuthenticatedAuthenticationToken; 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.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextImpl; +import org.springframework.security.core.userdetails.User; import org.springframework.security.portlet.PortletSessionContextIntegrationInterceptor; -import org.springframework.security.userdetails.User; import org.springframework.mock.web.portlet.MockActionRequest; import org.springframework.mock.web.portlet.MockActionResponse; import org.springframework.mock.web.portlet.MockRenderRequest; diff --git a/portlet/src/test/java/org/springframework/security/portlet/PortletTestUtils.java b/portlet/src/test/java/org/springframework/security/portlet/PortletTestUtils.java index 7093f775d6..9aae954da5 100644 --- a/portlet/src/test/java/org/springframework/security/portlet/PortletTestUtils.java +++ b/portlet/src/test/java/org/springframework/security/portlet/PortletTestUtils.java @@ -21,10 +21,10 @@ import javax.portlet.PortletRequest; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.authentication.preauth.PreAuthenticatedAuthenticationToken; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.GrantedAuthorityImpl; +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.portlet.PortletAuthenticationDetails; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; import org.springframework.mock.web.portlet.MockActionRequest; import org.springframework.mock.web.portlet.MockActionResponse; import org.springframework.mock.web.portlet.MockPortletRequest; diff --git a/samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java b/samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java index cc8a597e41..5a2c25d074 100644 --- a/samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java +++ b/samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java @@ -28,8 +28,8 @@ import org.springframework.security.acls.sid.Sid; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.userdetails.UserDetails; import org.springframework.transaction.annotation.Transactional; import org.springframework.beans.factory.InitializingBean; diff --git a/samples/contacts/src/main/java/sample/contact/DataSourcePopulator.java b/samples/contacts/src/main/java/sample/contact/DataSourcePopulator.java index 3f7ca21ccc..3d847c4925 100644 --- a/samples/contacts/src/main/java/sample/contact/DataSourcePopulator.java +++ b/samples/contacts/src/main/java/sample/contact/DataSourcePopulator.java @@ -30,7 +30,7 @@ import org.springframework.security.acls.objectidentity.ObjectIdentityImpl; 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.authority.AuthorityUtils; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; diff --git a/samples/contacts/src/main/resources/applicationContext-common-authorization.xml b/samples/contacts/src/main/resources/applicationContext-common-authorization.xml index 87ad1ff7df..bdb669d0f5 100644 --- a/samples/contacts/src/main/resources/applicationContext-common-authorization.xml +++ b/samples/contacts/src/main/resources/applicationContext-common-authorization.xml @@ -32,13 +32,13 @@ - + - + - + diff --git a/samples/dms/src/main/java/sample/dms/DataSourcePopulator.java b/samples/dms/src/main/java/sample/dms/DataSourcePopulator.java index f254deb9b1..b1e20bf626 100755 --- a/samples/dms/src/main/java/sample/dms/DataSourcePopulator.java +++ b/samples/dms/src/main/java/sample/dms/DataSourcePopulator.java @@ -7,7 +7,7 @@ import org.springframework.jdbc.core.JdbcTemplate; 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; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; diff --git a/samples/dms/src/main/resources/applicationContext-dms-secure.xml b/samples/dms/src/main/resources/applicationContext-dms-secure.xml index 1fe983e474..62577535b1 100755 --- a/samples/dms/src/main/resources/applicationContext-dms-secure.xml +++ b/samples/dms/src/main/resources/applicationContext-dms-secure.xml @@ -54,7 +54,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -174,13 +174,13 @@ - + - + - + diff --git a/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml b/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml index 66aa104117..428a71b1b7 100644 --- a/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml +++ b/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml @@ -36,7 +36,7 @@ - + tomcat @@ -72,7 +72,7 @@ - + diff --git a/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml index dfd8583aa2..3d6f603a4b 100644 --- a/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -52,7 +52,7 @@ - + diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthorizeTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthorizeTag.java index 38c4b7538d..491364c6fe 100644 --- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthorizeTag.java +++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthorizeTag.java @@ -27,7 +27,7 @@ import javax.servlet.jsp.tagext.TagSupport; 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.util.StringUtils; import org.springframework.web.util.ExpressionEvaluationUtils; diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/velocity/Authz.java b/taglibs/src/main/java/org/springframework/security/taglibs/velocity/Authz.java index 3ef00db92c..262729038a 100644 --- a/taglibs/src/main/java/org/springframework/security/taglibs/velocity/Authz.java +++ b/taglibs/src/main/java/org/springframework/security/taglibs/velocity/Authz.java @@ -17,10 +17,10 @@ package org.springframework.security.taglibs.velocity; import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.taglibs.authz.AuthenticationTag; import org.springframework.security.taglibs.authz.AuthorizeTag; -import org.springframework.security.userdetails.UserDetails; import org.springframework.context.ApplicationContext; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java index ac0a198760..05b0a35cf4 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java @@ -19,10 +19,10 @@ import junit.framework.TestCase; import org.springframework.security.authentication.TestingAuthenticationToken; 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; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.userdetails.User; +import org.springframework.security.core.userdetails.User; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.Tag; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java index 6eb44dff56..bafe0f8bda 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagAttributeTests.java @@ -20,7 +20,7 @@ import junit.framework.TestCase; 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; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java index 26d78e129a..bcff6f5dfe 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java @@ -25,7 +25,7 @@ import org.jmock.Mockery; import org.springframework.mock.web.MockPageContext; 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; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java index 18447c7bcb..f99d6adae2 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java @@ -20,7 +20,7 @@ import junit.framework.TestCase; 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; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java index e6f5adeb1f..9889d1c2e9 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java @@ -20,7 +20,7 @@ import junit.framework.TestCase; 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; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java index 9915ef0e82..0122ea5809 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java @@ -20,7 +20,7 @@ import junit.framework.TestCase; 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; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplTests.java index eb0d663674..07a5e66854 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplTests.java @@ -19,10 +19,10 @@ import junit.framework.TestCase; import org.springframework.security.authentication.TestingAuthenticationToken; 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; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.userdetails.User; +import org.springframework.security.core.userdetails.User; public class AuthzImplTests extends TestCase { diff --git a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java index eb41e98fb2..ac6940c0a0 100644 --- a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java +++ b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java @@ -34,9 +34,9 @@ import javax.servlet.ServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.security.util.AntUrlPathMatcher; -import org.springframework.security.util.UrlMatcher; import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource; +import org.springframework.security.web.util.AntUrlPathMatcher; +import org.springframework.security.web.util.UrlMatcher; import org.springframework.util.Assert; import org.springframework.web.filter.DelegatingFilterProxy; diff --git a/web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java index f0e7d374b7..fe000d7cf9 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java @@ -20,8 +20,8 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.AuthenticationDetailsSource; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.memory.UserAttribute; -import org.springframework.security.userdetails.memory.UserAttribute; import org.springframework.security.web.FilterChainOrder; import org.springframework.security.web.SpringSecurityFilter; import org.springframework.beans.factory.InitializingBean; diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java index 8ebfd1359e..84e015ce69 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java @@ -5,7 +5,7 @@ import java.util.List; import org.springframework.security.authentication.AuthenticationDetails; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.MutableGrantedAuthoritiesContainer; +import org.springframework.security.core.authority.MutableGrantedAuthoritiesContainer; import org.springframework.util.Assert; /** @@ -37,7 +37,7 @@ public class PreAuthenticatedGrantedAuthoritiesAuthenticationDetails extends Aut /** * - * @see org.springframework.security.core.GrantedAuthoritiesContainer#getGrantedAuthorities() + * @see org.springframework.security.core.authority.GrantedAuthoritiesContainer#getGrantedAuthorities() */ public List getGrantedAuthorities() { Assert.notNull(preAuthenticatedGrantedAuthorities, "Pre-authenticated granted authorities have not been set"); @@ -46,7 +46,7 @@ public class PreAuthenticatedGrantedAuthoritiesAuthenticationDetails extends Aut } /** - * @see org.springframework.security.core.MutableGrantedAuthoritiesContainer#setGrantedAuthorities() + * @see org.springframework.security.core.authority.MutableGrantedAuthoritiesContainer#setGrantedAuthorities() */ public void setGrantedAuthorities(List aJ2eeBasedGrantedAuthorities) { this.preAuthenticatedGrantedAuthorities = Collections.unmodifiableList(aJ2eeBasedGrantedAuthorities); diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java index f1d999da6a..448f2ec883 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java @@ -4,9 +4,9 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; -import org.springframework.security.core.GrantedAuthoritiesContainerImpl; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.MutableGrantedAuthoritiesContainer; +import org.springframework.security.core.authority.GrantedAuthoritiesContainerImpl; +import org.springframework.security.core.authority.MutableGrantedAuthoritiesContainer; import org.springframework.security.web.authentication.WebAuthenticationDetails; /** diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java index 328e6b0570..b217f9e36a 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java @@ -8,10 +8,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.security.authentication.AuthenticationDetailsSourceImpl; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.MutableGrantedAuthoritiesContainer; -import org.springframework.security.core.authoritymapping.Attributes2GrantedAuthoritiesMapper; -import org.springframework.security.core.authoritymapping.MappableAttributesRetriever; -import org.springframework.security.core.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper; +import org.springframework.security.core.authority.MutableGrantedAuthoritiesContainer; +import org.springframework.security.core.authority.mapping.Attributes2GrantedAuthoritiesMapper; +import org.springframework.security.core.authority.mapping.MappableAttributesRetriever; +import org.springframework.security.core.authority.mapping.SimpleAttributes2GrantedAuthoritiesMapper; import org.springframework.util.Assert; /** diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java index 1b46b1fc54..10081d8e1b 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java @@ -1,7 +1,7 @@ package org.springframework.security.web.authentication.preauth.j2ee; import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails; -import org.springframework.security.core.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper; +import org.springframework.security.core.authority.mapping.SimpleAttributes2GrantedAuthoritiesMapper; import java.util.ArrayList; import java.util.Collection; diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java index 43f3942af3..6bd62cf032 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java @@ -2,7 +2,7 @@ package org.springframework.security.web.authentication.preauth.j2ee; import java.io.InputStream; -import org.springframework.security.core.authoritymapping.XmlMappableAttributesRetriever; +import org.springframework.security.core.authority.mapping.XmlMappableAttributesRetriever; /** *

diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java index 28556b441c..59b110511f 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java @@ -8,9 +8,9 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.authentication.AuthenticationDetailsSourceImpl; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.MutableGrantedAuthoritiesContainer; -import org.springframework.security.core.authoritymapping.Attributes2GrantedAuthoritiesMapper; -import org.springframework.security.core.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper; +import org.springframework.security.core.authority.MutableGrantedAuthoritiesContainer; +import org.springframework.security.core.authority.mapping.Attributes2GrantedAuthoritiesMapper; +import org.springframework.security.core.authority.mapping.SimpleAttributes2GrantedAuthoritiesMapper; import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesAuthenticationDetails; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java index 295c5e332b..5aeec57639 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java @@ -11,10 +11,10 @@ import org.springframework.security.authentication.AuthenticationDetailsSource; import org.springframework.security.authentication.RememberMeAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.SpringSecurityMessageSource; -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.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.web.authentication.RememberMeServices; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.security.web.logout.LogoutHandler; diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java index c0ca3a0274..380b120d86 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Base64; import org.springframework.dao.DataAccessException; import org.springframework.security.core.Authentication; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.web.authentication.RememberMeServices; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java index 0b6f829bb0..f1f18e4e39 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java @@ -16,7 +16,7 @@ package org.springframework.security.web.authentication.rememberme; import org.springframework.security.core.Authentication; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.util.StringUtils; import org.apache.commons.codec.digest.DigestUtils; @@ -40,9 +40,9 @@ import java.util.Date; * implementation will only send a remember-me token if the parameter defined by * {@link #setParameter(String)} is present. *

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

* The cookie encoded by this implementation adopts the following form: diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java index b964b768b0..160a0c0165 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java @@ -18,7 +18,7 @@ package org.springframework.security.web.authentication.switchuser; import org.springframework.security.authentication.event.AbstractAuthenticationEvent; import org.springframework.security.core.Authentication; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetails; /** diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java index 359fad7e2b..1e17e2efa3 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java @@ -4,7 +4,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; /** * Allows subclasses to modify the {@link GrantedAuthority} list that will be assigned to the principal diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java index 2741bc54f5..7dad31f79d 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java @@ -16,7 +16,7 @@ package org.springframework.security.web.authentication.switchuser; import org.springframework.security.core.Authentication; -import org.springframework.security.core.GrantedAuthorityImpl; +import org.springframework.security.core.authority.GrantedAuthorityImpl; /** diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java index 664d5ed8ee..281d31d893 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java @@ -44,10 +44,10 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.SpringSecurityMessageSource; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UserDetailsChecker; -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.UserDetailsChecker; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.web.FilterChainOrder; import org.springframework.security.web.SpringSecurityFilter; import org.springframework.security.web.authentication.AuthenticationFailureHandler; diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java index 1e9b56af10..44861cf65f 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java @@ -39,11 +39,11 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.SpringSecurityMessageSource; import org.springframework.security.core.context.SecurityContextHolder; -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.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.UsernameNotFoundException; +import org.springframework.security.core.userdetails.cache.NullUserCache; import org.springframework.security.util.StringSplitUtils; import org.springframework.security.web.FilterChainOrder; import org.springframework.security.web.SpringSecurityFilter; diff --git a/web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java index 159f408169..f6d6e2e63e 100644 --- a/web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java +++ b/web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java @@ -10,9 +10,9 @@ import org.apache.commons.logging.LogFactory; import org.springframework.expression.ExpressionParser; import org.springframework.expression.ParseException; import org.springframework.security.access.ConfigAttribute; -import org.springframework.security.util.UrlMatcher; import org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource; import org.springframework.security.web.intercept.RequestKey; +import org.springframework.security.web.util.UrlMatcher; import org.springframework.util.Assert; /** diff --git a/web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java index 591844d914..5e90eda615 100644 --- a/web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java +++ b/web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java @@ -27,8 +27,8 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.security.access.ConfigAttribute; -import org.springframework.security.util.UrlMatcher; import org.springframework.security.web.FilterInvocation; +import org.springframework.security.web.util.UrlMatcher; /** diff --git a/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java index 5f0600228d..8c67702646 100644 --- a/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java +++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java @@ -17,7 +17,7 @@ package org.springframework.security.web.session; import javax.servlet.http.HttpSession; -import org.springframework.security.core.SessionCreationEvent; +import org.springframework.security.core.session.SessionCreationEvent; /** * Published by the {@link HttpSessionEventPublisher} when a HttpSession is destroyed by the container diff --git a/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java index 23ddb0c9ba..cd0a8b1e0c 100644 --- a/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java +++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java @@ -17,8 +17,8 @@ package org.springframework.security.web.session; import javax.servlet.http.HttpSession; -import org.springframework.security.core.SessionDestroyedEvent; import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.core.session.SessionDestroyedEvent; import org.springframework.security.web.context.HttpSessionSecurityContextRepository; diff --git a/core/src/main/java/org/springframework/security/util/AntUrlPathMatcher.java b/web/src/main/java/org/springframework/security/web/util/AntUrlPathMatcher.java similarity index 96% rename from core/src/main/java/org/springframework/security/util/AntUrlPathMatcher.java rename to web/src/main/java/org/springframework/security/web/util/AntUrlPathMatcher.java index 50be0afe6c..0cdb9ebf8d 100644 --- a/core/src/main/java/org/springframework/security/util/AntUrlPathMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/AntUrlPathMatcher.java @@ -1,4 +1,4 @@ -package org.springframework.security.util; +package org.springframework.security.web.util; import org.springframework.util.PathMatcher; import org.springframework.util.AntPathMatcher; diff --git a/core/src/main/java/org/springframework/security/util/RegexUrlPathMatcher.java b/web/src/main/java/org/springframework/security/web/util/RegexUrlPathMatcher.java similarity index 94% rename from core/src/main/java/org/springframework/security/util/RegexUrlPathMatcher.java rename to web/src/main/java/org/springframework/security/web/util/RegexUrlPathMatcher.java index e73bbf38dd..6fcb020be0 100644 --- a/core/src/main/java/org/springframework/security/util/RegexUrlPathMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/RegexUrlPathMatcher.java @@ -1,4 +1,4 @@ -package org.springframework.security.util; +package org.springframework.security.web.util; import java.util.regex.Pattern; diff --git a/core/src/main/java/org/springframework/security/util/UrlMatcher.java b/web/src/main/java/org/springframework/security/web/util/UrlMatcher.java similarity index 92% rename from core/src/main/java/org/springframework/security/util/UrlMatcher.java rename to web/src/main/java/org/springframework/security/web/util/UrlMatcher.java index 8166717aa9..be93039667 100644 --- a/core/src/main/java/org/springframework/security/util/UrlMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/UrlMatcher.java @@ -1,4 +1,4 @@ -package org.springframework.security.util; +package org.springframework.security.web.util; /** * Strategy for deciding whether configured path matches a submitted candidate URL. diff --git a/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapper.java b/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapper.java index ed0fa61cd2..bc323e04c3 100644 --- a/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapper.java +++ b/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapper.java @@ -21,8 +21,8 @@ import org.springframework.security.authentication.AuthenticationTrustResolverIm import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.userdetails.UserDetails; import org.springframework.security.web.PortResolver; import java.security.Principal; diff --git a/web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java b/web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java index db5e03eb92..dfb696d89d 100644 --- a/web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java @@ -33,7 +33,7 @@ import org.springframework.security.MockPortResolver; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.core.AuthorityUtils; +import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.AccessDeniedHandlerImpl; import org.springframework.security.web.ExceptionTranslationFilter; diff --git a/web/src/test/java/org/springframework/security/web/authentication/AbstractProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AbstractProcessingFilterTests.java index 3ea659cb32..b6b23065bc 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AbstractProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AbstractProcessingFilterTests.java @@ -39,7 +39,7 @@ import org.springframework.security.authentication.BadCredentialsException; 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.authority.AuthorityUtils; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.PortResolverImpl; import org.springframework.security.web.authentication.AbstractProcessingFilter; diff --git a/web/src/test/java/org/springframework/security/web/authentication/AnonymousProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AnonymousProcessingFilterTests.java index 45ed01252f..f7804050ab 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AnonymousProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AnonymousProcessingFilterTests.java @@ -22,11 +22,11 @@ import org.springframework.security.MockFilterConfig; 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.core.userdetails.memory.UserAttribute; -import org.springframework.security.userdetails.memory.UserAttribute; import org.springframework.security.web.authentication.AnonymousProcessingFilter; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java index 4deca9697c..de9abb7fcd 100755 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java @@ -11,8 +11,8 @@ import javax.servlet.http.HttpServletRequest; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.security.core.AuthorityUtils; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails; /** diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java index 580e59b213..fdcdb99f1a 100755 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java @@ -11,10 +11,10 @@ import javax.servlet.http.HttpServletRequest; import junit.framework.TestCase; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authoritymapping.Attributes2GrantedAuthoritiesMapper; -import org.springframework.security.core.authoritymapping.MappableAttributesRetriever; -import org.springframework.security.core.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper; -import org.springframework.security.core.authoritymapping.SimpleMappableAttributesRetriever; +import org.springframework.security.core.authority.mapping.Attributes2GrantedAuthoritiesMapper; +import org.springframework.security.core.authority.mapping.MappableAttributesRetriever; +import org.springframework.security.core.authority.mapping.SimpleAttributes2GrantedAuthoritiesMapper; +import org.springframework.security.core.authority.mapping.SimpleMappableAttributesRetriever; import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails; import org.springframework.security.web.authentication.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource; diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java index 0cc4b18633..34a33b9dc4 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java @@ -11,11 +11,11 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; -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; import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; import org.springframework.security.web.authentication.rememberme.CookieTheftException; import org.springframework.security.web.authentication.rememberme.InvalidCookieException; diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java index 3e3b0c849c..0544fc4be8 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java @@ -33,11 +33,11 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; -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; import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices; import org.springframework.util.StringUtils; diff --git a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilterTests.java index 1fb3b5308d..86a3524aa4 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilterTests.java @@ -34,14 +34,14 @@ import org.springframework.security.authentication.DisabledException; 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.User; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UserDetailsService; -import org.springframework.security.userdetails.UsernameNotFoundException; +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.security.util.FieldUtils; import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler; import org.springframework.security.web.authentication.switchuser.SwitchUserAuthorityChanger; diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterTests.java index e892283dac..60c22cad0d 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterTests.java @@ -47,7 +47,7 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; 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; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.www.BasicProcessingFilter; import org.springframework.security.web.authentication.www.BasicProcessingFilterEntryPoint; diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterTests.java index 0d003105ac..fd1b074d5c 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterTests.java @@ -26,13 +26,13 @@ import org.junit.Test; import org.springframework.security.MockFilterConfig; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.cache.NullUserCache; +import org.springframework.security.core.userdetails.memory.InMemoryDaoImpl; +import org.springframework.security.core.userdetails.memory.UserMap; +import org.springframework.security.core.userdetails.memory.UserMapEditor; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.cache.NullUserCache; -import org.springframework.security.userdetails.memory.InMemoryDaoImpl; -import org.springframework.security.userdetails.memory.UserMap; -import org.springframework.security.userdetails.memory.UserMapEditor; import org.springframework.security.util.StringSplitUtils; import org.springframework.security.web.authentication.www.DigestProcessingFilter; diff --git a/web/src/test/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilterTests.java index e771c10356..8cd36bdf27 100644 --- a/web/src/test/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilterTests.java @@ -20,7 +20,7 @@ import junit.framework.TestCase; import org.springframework.security.MockFilterConfig; 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; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextImpl; diff --git a/web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java b/web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java index ac7ef48ba9..8d60afb12c 100644 --- a/web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java +++ b/web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java @@ -28,10 +28,10 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.access.SecurityConfig; -import org.springframework.security.util.AntUrlPathMatcher; import org.springframework.security.web.FilterInvocation; import org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource; import org.springframework.security.web.intercept.RequestKey; +import org.springframework.security.web.util.AntUrlPathMatcher; /** * Tests parts of {@link DefaultFilterInvocationSecurityMetadataSource} not tested by {@link diff --git a/web/src/test/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapperTests.java b/web/src/test/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapperTests.java index 9f71e6951c..107ca99d6e 100644 --- a/web/src/test/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapperTests.java +++ b/web/src/test/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapperTests.java @@ -20,9 +20,9 @@ import junit.framework.TestCase; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; -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.User; +import org.springframework.security.core.userdetails.User; import org.springframework.security.web.PortResolverImpl; import org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestWrapper;