Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Luke Taylor 2009-04-15 07:39:21 +00:00
parent 5d0d1bd404
commit 93bdcccaee
221 changed files with 455 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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 {

6
cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java
View File

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

6
cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
View File

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

10
cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java
View File

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

6
cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java
View File

@ -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}.

4
cas/src/test/java/org/springframework/security/cas/authentication/cache/AbstractStatelessTicketCacheTests.java vendored
View File

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

8
config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java
View File

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

2
config/src/main/java/org/springframework/security/config/FilterChainMapBeanDefinitionDecorator.java
View File

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

4
config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java
View File

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

6
config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java
View File

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

4
config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java
View File

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

8
config/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java
View File

@ -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")

2
config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java
View File

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

2
config/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java
View File

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

4
config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java
View File

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

2
config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
View File

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

2
config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java
View File

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

4
config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java
View File

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

2
config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java
View File

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

8
config/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java
View File

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

6
config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java
View File

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

2
config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java
View File

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

4
config/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -41,7 +41,7 @@ import org.springframework.security.core.GrantedAuthority;
* which do not represent roles. However, this option may be of some use when
* using pre-existing role names without a prefix, and no ability exists to
* prefix them with a role prefix on reading them in, such as provided for
* example in {@link org.springframework.security.userdetails.jdbc.JdbcDaoImpl}.
* example in {@link org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl}.
* <p>
* All comparisons and prefixes are case sensitive.
*

2
core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java
View File

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

4
core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java
View File

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

2
core/src/main/java/org/springframework/security/authentication/ProviderManager.java
View File

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

2
core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
core/src/main/java/org/springframework/security/core/GrantedAuthority.java
View File

@ -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.

4
core/src/main/java/org/springframework/security/core/AuthorityUtils.java → core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java
View File

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

4
core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainer.java → core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainer.java
View File

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

3
core/src/main/java/org/springframework/security/core/GrantedAuthoritiesContainerImpl.java → core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainerImpl.java
View File

@ -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 {

4
core/src/main/java/org/springframework/security/core/GrantedAuthorityImpl.java → core/src/main/java/org/springframework/security/core/authority/GrantedAuthorityImpl.java
View File

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

4
core/src/main/java/org/springframework/security/core/MutableGrantedAuthoritiesContainer.java → core/src/main/java/org/springframework/security/core/authority/MutableGrantedAuthoritiesContainer.java
View File

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

2
core/src/main/java/org/springframework/security/core/authoritymapping/Attributes2GrantedAuthoritiesMapper.java → core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java
View File

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

6
core/src/main/java/org/springframework/security/core/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java → core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java
View File

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

2
core/src/main/java/org/springframework/security/core/authoritymapping/MappableAttributesRetriever.java → core/src/main/java/org/springframework/security/core/authority/mapping/MappableAttributesRetriever.java
View File

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

4
core/src/main/java/org/springframework/security/core/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java → core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java
View File

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

4
core/src/main/java/org/springframework/security/core/authoritymapping/SimpleMappableAttributesRetriever.java → core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java
View File

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

2
core/src/main/java/org/springframework/security/core/authoritymapping/XmlMappableAttributesRetriever.java → core/src/main/java/org/springframework/security/core/authority/mapping/XmlMappableAttributesRetriever.java
View File

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

2
core/src/main/java/org/springframework/security/core/SessionCreationEvent.java → core/src/main/java/org/springframework/security/core/session/SessionCreationEvent.java
View File

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

2
core/src/main/java/org/springframework/security/core/SessionDestroyedEvent.java → core/src/main/java/org/springframework/security/core/session/SessionDestroyedEvent.java
View File

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

2
core/src/main/java/org/springframework/security/userdetails/AuthenticationUserDetailsService.java → core/src/main/java/org/springframework/security/core/userdetails/AuthenticationUserDetailsService.java
View File

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

2
core/src/main/java/org/springframework/security/userdetails/User.java → core/src/main/java/org/springframework/security/core/userdetails/User.java
View File

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

2
core/src/main/java/org/springframework/security/userdetails/UserCache.java → core/src/main/java/org/springframework/security/core/userdetails/UserCache.java
View File

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

4
core/src/main/java/org/springframework/security/userdetails/UserDetails.java → core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java
View File

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

2
core/src/main/java/org/springframework/security/userdetails/UserDetailsByNameServiceWrapper.java → core/src/main/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapper.java
View File

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

2
core/src/main/java/org/springframework/security/userdetails/UserDetailsChecker.java → core/src/main/java/org/springframework/security/core/userdetails/UserDetailsChecker.java
View File

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

2
core/src/main/java/org/springframework/security/userdetails/UserDetailsService.java → core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java
View File

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

2
core/src/main/java/org/springframework/security/userdetails/UsernameNotFoundException.java → core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java
View File

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

6
core/src/main/java/org/springframework/security/userdetails/cache/EhCacheBasedUserCache.java → core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java vendored
View File

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

6
core/src/main/java/org/springframework/security/userdetails/cache/NullUserCache.java → core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java vendored
View File

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

14
core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcDaoImpl.java → core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java
View File

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

0
core/src/main/java/org/springframework/security/userdetails/jdbc/package.html → core/src/main/java/org/springframework/security/core/userdetails/jdbc/package.html
View File

8
core/src/main/java/org/springframework/security/userdetails/memory/InMemoryDaoImpl.java → core/src/main/java/org/springframework/security/core/userdetails/memory/InMemoryDaoImpl.java
View File

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

4
core/src/main/java/org/springframework/security/userdetails/memory/UserAttribute.java → core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java
View File

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

2
core/src/main/java/org/springframework/security/userdetails/memory/UserAttributeEditor.java → core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java
View File

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

6
core/src/main/java/org/springframework/security/userdetails/memory/UserMap.java → core/src/main/java/org/springframework/security/core/userdetails/memory/UserMap.java
View File

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

6
core/src/main/java/org/springframework/security/userdetails/memory/UserMapEditor.java → core/src/main/java/org/springframework/security/core/userdetails/memory/UserMapEditor.java
View File

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

0
core/src/main/java/org/springframework/security/userdetails/memory/package.html → core/src/main/java/org/springframework/security/core/userdetails/memory/package.html
View File

12
core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
View File

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

4
core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java
View File

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

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

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

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

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

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

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

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

@ -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}.

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

@ -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}.

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

@ -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")

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

@ -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}.

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

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

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

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

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

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

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

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

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

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

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

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

4
core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java
View File

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

Some files were not shown because too many files have changed in this diff Show More