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

Move UserDetails interface to net.sf.acegisecurity package.

This commit is contained in:
Ben Alex 2004-07-13 22:38:20 +00:00
parent 064cd3c7bf
commit 48b1cb7c85
29 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
View File

@ -20,6 +20,7 @@ import net.sf.acegisecurity.AuthenticationException;
import net.sf.acegisecurity.AuthenticationServiceException;
import net.sf.acegisecurity.BadCredentialsException;
import net.sf.acegisecurity.DisabledException;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.AuthenticationProvider;
import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
import net.sf.acegisecurity.providers.dao.cache.NullUserCache;

3
core/src/main/java/org/acegisecurity/providers/dao/SaltSource.java
View File

@ -15,6 +15,9 @@
package net.sf.acegisecurity.providers.dao;
import net.sf.acegisecurity.UserDetails;
/**
* Provides alternative sources of the salt to use for encoding passwords.
*

3
core/src/main/java/org/acegisecurity/providers/dao/UserCache.java
View File

@ -15,6 +15,9 @@
package net.sf.acegisecurity.providers.dao;
import net.sf.acegisecurity.UserDetails;
/**
* Provides a cache of {@link User} objects.
*

2
core/src/main/java/org/acegisecurity/providers/dao/cache/EhCacheBasedUserCache.java vendored
View File

@ -15,8 +15,8 @@
package net.sf.acegisecurity.providers.dao.cache;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.UserCache;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheException;

2
core/src/main/java/org/acegisecurity/providers/dao/cache/NullUserCache.java vendored
View File

@ -15,8 +15,8 @@
package net.sf.acegisecurity.providers.dao.cache;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.UserCache;
import net.sf.acegisecurity.providers.dao.UserDetails;
/**

2
core/src/main/java/org/acegisecurity/providers/dao/event/AuthenticationEvent.java
View File

@ -16,8 +16,8 @@
package net.sf.acegisecurity.providers.dao.event;
import net.sf.acegisecurity.Authentication;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.User;
import net.sf.acegisecurity.providers.dao.UserDetails;
import org.springframework.context.ApplicationEvent;

2
core/src/main/java/org/acegisecurity/providers/dao/event/AuthenticationFailureDisabledEvent.java
View File

@ -16,7 +16,7 @@
package net.sf.acegisecurity.providers.dao.event;
import net.sf.acegisecurity.Authentication;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.UserDetails;
/**

2
core/src/main/java/org/acegisecurity/providers/dao/event/AuthenticationFailurePasswordEvent.java
View File

@ -16,7 +16,7 @@
package net.sf.acegisecurity.providers.dao.event;
import net.sf.acegisecurity.Authentication;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.UserDetails;
/**

2
core/src/main/java/org/acegisecurity/providers/dao/event/AuthenticationSuccessEvent.java
View File

@ -16,7 +16,7 @@
package net.sf.acegisecurity.providers.dao.event;
import net.sf.acegisecurity.Authentication;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.UserDetails;
/**

2
core/src/main/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSource.java
View File

@ -16,9 +16,9 @@
package net.sf.acegisecurity.providers.dao.salt;
import net.sf.acegisecurity.AuthenticationServiceException;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.SaltSource;
import net.sf.acegisecurity.providers.dao.User;
import net.sf.acegisecurity.providers.dao.UserDetails;
import org.springframework.beans.factory.InitializingBean;

2
core/src/main/java/org/acegisecurity/providers/dao/salt/SystemWideSaltSource.java
View File

@ -15,9 +15,9 @@
package net.sf.acegisecurity.providers.dao.salt;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.SaltSource;
import net.sf.acegisecurity.providers.dao.User;
import net.sf.acegisecurity.providers.dao.UserDetails;
import org.springframework.beans.factory.InitializingBean;

1
core/src/main/java/org/acegisecurity/userdetails/User.java
View File

@ -16,6 +16,7 @@
package net.sf.acegisecurity.providers.dao;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.UserDetails;
/**

14
core/src/main/java/org/acegisecurity/providers/dao/UserDetails.java → core/src/main/java/org/acegisecurity/userdetails/UserDetails.java
View File

@ -13,15 +13,23 @@
* limitations under the License.
*/
package net.sf.acegisecurity.providers.dao;
package net.sf.acegisecurity;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.providers.dao.User;
import java.io.Serializable;
/**
* Provides core user information required by the package.
* Provides core user information.
*
* <P>
* Implementations are not used directly by Acegi Security for security
* purposes. They simply store user information which is later encapsulated
* into {@link Authentication} objects. This allows non-security related user
* information (such as email addresses, telephone numbers etc) to be stored
* in a convenient location.
* </p>
*
* <P>
* Concrete implementations must take particular care to ensure the non-null

2
core/src/main/java/org/acegisecurity/userdetails/UserDetailsService.java
View File

@ -15,6 +15,8 @@
package net.sf.acegisecurity.providers.dao;
import net.sf.acegisecurity.UserDetails;
import org.springframework.dao.DataAccessException;

2
core/src/main/java/org/acegisecurity/userdetails/jdbc/JdbcDaoImpl.java
View File

@ -17,9 +17,9 @@ package net.sf.acegisecurity.providers.dao.jdbc;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.AuthenticationDao;
import net.sf.acegisecurity.providers.dao.User;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
import org.apache.commons.logging.Log;

2
core/src/main/java/org/acegisecurity/userdetails/memory/InMemoryDaoImpl.java
View File

@ -15,8 +15,8 @@
package net.sf.acegisecurity.providers.dao.memory;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.AuthenticationDao;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
import org.springframework.beans.factory.InitializingBean;

2
core/src/main/java/org/acegisecurity/userdetails/memory/UserMap.java
View File

@ -15,8 +15,8 @@
package net.sf.acegisecurity.providers.dao.memory;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.User;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
import org.apache.commons.logging.Log;

2
core/src/main/java/org/acegisecurity/userdetails/memory/UserMapEditor.java
View File

@ -15,8 +15,8 @@
package net.sf.acegisecurity.providers.dao.memory;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.User;
import net.sf.acegisecurity.providers.dao.UserDetails;
import org.springframework.beans.propertyeditors.PropertiesEditor;

2
core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java
View File

@ -19,9 +19,9 @@ import junit.framework.TestCase;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.AuthenticationDao;
import net.sf.acegisecurity.providers.dao.User;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
import org.springframework.dao.DataAccessException;

1
core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java
View File

@ -23,6 +23,7 @@ import net.sf.acegisecurity.BadCredentialsException;
import net.sf.acegisecurity.DisabledException;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.TestingAuthenticationToken;
import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
import net.sf.acegisecurity.providers.dao.cache.EhCacheBasedUserCache;

1
core/src/test/java/org/acegisecurity/providers/dao/UserTests.java
View File

@ -19,6 +19,7 @@ import junit.framework.TestCase;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.UserDetails;
/**

30
core/src/test/java/org/acegisecurity/providers/dao/jdbc/JdbcDaoTests.java
View File

@ -17,7 +17,7 @@ package net.sf.acegisecurity.providers.dao.jdbc;
import junit.framework.TestCase;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
import org.springframework.core.io.ClassPathResource;
@ -166,6 +166,20 @@ public class JdbcDaoTests extends TestCase {
}
}
private DataSource makeDataSource() throws Exception {
ClassPathResource dbScript = new ClassPathResource(
"acegisecuritytest.script");
String path = dbScript.getFile().getParentFile().getAbsolutePath();
DriverManagerDataSource ds = new DriverManagerDataSource();
ds.setDriverClassName("org.hsqldb.jdbcDriver");
ds.setUrl("jdbc:hsqldb:" + path + File.separator + "acegisecuritytest");
ds.setUsername("sa");
ds.setPassword("");
return ds;
}
private JdbcDaoImpl makePopulatedJdbcDao() throws Exception {
JdbcDaoImpl dao = new JdbcDaoImpl();
dao.setDataSource(makeDataSource());
@ -184,20 +198,6 @@ public class JdbcDaoTests extends TestCase {
return dao;
}
private DataSource makeDataSource()
throws Exception {
ClassPathResource dbScript = new ClassPathResource("acegisecuritytest.script");
String path = dbScript.getFile().getParentFile().getAbsolutePath();
DriverManagerDataSource ds = new DriverManagerDataSource();
ds.setDriverClassName("org.hsqldb.jdbcDriver");
ds.setUrl("jdbc:hsqldb:" + path + File.separator + "acegisecuritytest");
ds.setUsername("sa");
ds.setPassword("");
return ds;
}
//~ Inner Classes ==========================================================
private class MockMappingSqlQuery extends MappingSqlQuery {

2
core/src/test/java/org/acegisecurity/providers/dao/memory/UserMapTests.java
View File

@ -19,8 +19,8 @@ import junit.framework.TestCase;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.User;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;

2
core/src/test/java/org/acegisecurity/providers/dao/salt/ReflectionSaltSourceTests.java
View File

@ -20,8 +20,8 @@ import junit.framework.TestCase;
import net.sf.acegisecurity.AuthenticationServiceException;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.providers.dao.User;
import net.sf.acegisecurity.providers.dao.UserDetails;
/**

2
core/src/test/java/org/acegisecurity/ui/basicauth/BasicProcessingFilterTests.java
View File

@ -24,7 +24,7 @@ import net.sf.acegisecurity.MockFilterConfig;
import net.sf.acegisecurity.MockHttpServletRequest;
import net.sf.acegisecurity.MockHttpServletResponse;
import net.sf.acegisecurity.MockHttpSession;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.ui.webapp.HttpSessionIntegrationFilter;
import org.apache.commons.codec.binary.Base64;

2
samples/contacts/src/main/java/sample/contact/ContactManagerFacade.java
View File

@ -17,9 +17,9 @@ package sample.contact;
import net.sf.acegisecurity.AccessDeniedException;
import net.sf.acegisecurity.Authentication;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.context.ContextHolder;
import net.sf.acegisecurity.context.SecureContext;
import net.sf.acegisecurity.providers.dao.UserDetails;
import org.springframework.beans.factory.InitializingBean;

2
samples/contacts/src/main/java/sample/contact/ContactSecurityVoter.java
View File

@ -18,7 +18,7 @@ package sample.contact;
import net.sf.acegisecurity.Authentication;
import net.sf.acegisecurity.ConfigAttribute;
import net.sf.acegisecurity.ConfigAttributeDefinition;
import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.vote.AccessDecisionVoter;
import org.aopalliance.intercept.MethodInvocation;

2
samples/contacts/src/main/java/sample/contact/SecureIndexController.java
View File

@ -18,9 +18,9 @@ package sample.contact;
import net.sf.acegisecurity.Authentication;
import net.sf.acegisecurity.AuthenticationCredentialsNotFoundException;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.context.ContextHolder;
import net.sf.acegisecurity.context.SecureContext;
import net.sf.acegisecurity.providers.dao.UserDetails;
import org.springframework.beans.factory.InitializingBean;

2
samples/contacts/src/main/java/sample/contact/WebContactAddController.java
View File

@ -16,9 +16,9 @@
package sample.contact;
import net.sf.acegisecurity.Authentication;
import net.sf.acegisecurity.UserDetails;
import net.sf.acegisecurity.context.ContextHolder;
import net.sf.acegisecurity.context.SecureContext;
import net.sf.acegisecurity.providers.dao.UserDetails;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController;