diff --git a/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml b/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml index c1379b0daa..5b62e9282a 100644 --- a/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml +++ b/adapters/cas/src/main/resources/org/acegisecurity/adapters/cas/applicationContext.xml @@ -24,7 +24,7 @@ - + marissa=koala,ROLES_IGNORED_BY_CAS @@ -36,7 +36,7 @@ - + diff --git a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml b/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml index 4b0037023b..aae10f013a 100644 --- a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml +++ b/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-invalid.xml @@ -20,7 +20,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -32,7 +32,7 @@ - + diff --git a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml b/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml index d1572d7728..89e17407f3 100644 --- a/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml +++ b/adapters/cas/src/test/resources/org/acegisecurity/adapters/cas/applicationContext-valid.xml @@ -20,7 +20,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -32,7 +32,7 @@ - + diff --git a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml b/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml index 822dfa84e5..8bcb630628 100644 --- a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml +++ b/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-invalid.xml @@ -22,7 +22,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR diff --git a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml b/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml index 279e841de8..87e1f1b7bd 100644 --- a/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml +++ b/adapters/catalina/src/main/resources/org/acegisecurity/adapters/catalinaAdapterTest-valid.xml @@ -22,7 +22,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -35,7 +35,7 @@ - + true diff --git a/core/src/main/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulator.java b/core/src/main/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulator.java index 9cc967ba25..ff1e863971 100644 --- a/core/src/main/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulator.java +++ b/core/src/main/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulator.java @@ -41,24 +41,24 @@ public class DaoCasAuthoritiesPopulator implements CasAuthoritiesPopulator, InitializingBean { //~ Instance fields ======================================================== - private UserDetailsService authenticationDao; + private UserDetailsService userDetailsService; //~ Methods ================================================================ - public void setAuthenticationDao(UserDetailsService authenticationDao) { - this.authenticationDao = authenticationDao; + public void setUserDetailsService(UserDetailsService authenticationDao) { + this.userDetailsService = authenticationDao; } - public UserDetailsService getAuthenticationDao() { - return authenticationDao; + public UserDetailsService getUserDetailsService() { + return userDetailsService; } public UserDetails getUserDetails(String casUserId) throws AuthenticationException { - return this.authenticationDao.loadUserByUsername(casUserId); + return this.userDetailsService.loadUserByUsername(casUserId); } public void afterPropertiesSet() throws Exception { - Assert.notNull(this.authenticationDao, "An authenticationDao must be set"); + Assert.notNull(this.userDetailsService, "An authenticationDao must be set"); } } diff --git a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java index 6bb5cbbdac..da8a20a034 100644 --- a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java +++ b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java @@ -40,7 +40,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthenticationProvider { //~ Instance fields ======================================================== - private UserDetailsService authenticationDao; + private UserDetailsService userDetailsService; private PasswordEncoder passwordEncoder = new PlaintextPasswordEncoder(); private SaltSource saltSource; private boolean hideUserNotFoundExceptions = true; @@ -65,12 +65,12 @@ public class DaoAuthenticationProvider } protected void doAfterPropertiesSet() throws Exception { - Assert.notNull(this.authenticationDao, + Assert.notNull(this.userDetailsService, "An Authentication DAO must be set"); } - public UserDetailsService getAuthenticationDao() { - return authenticationDao; + public UserDetailsService getUserDetailsService() { + return userDetailsService; } public PasswordEncoder getPasswordEncoder() { @@ -91,7 +91,7 @@ public class DaoAuthenticationProvider UserDetails loadedUser; try { - loadedUser = this.authenticationDao.loadUserByUsername(username); + loadedUser = this.userDetailsService.loadUserByUsername(username); } catch (UsernameNotFoundException notFound) { if (hideUserNotFoundExceptions) { throw new BadCredentialsException(messages.getMessage( @@ -113,8 +113,8 @@ public class DaoAuthenticationProvider return loadedUser; } - public void setAuthenticationDao(UserDetailsService authenticationDao) { - this.authenticationDao = authenticationDao; + public void setUserDetailsService(UserDetailsService authenticationDao) { + this.userDetailsService = authenticationDao; } /** diff --git a/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java b/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java index fc046c5728..46ef2e6134 100644 --- a/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java +++ b/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java @@ -50,7 +50,7 @@ public class DaoX509AuthoritiesPopulator implements X509AuthoritiesPopulator, //~ Instance fields ======================================================== - private UserDetailsService authenticationDao; + private UserDetailsService userDetailsService; protected MessageSourceAccessor messages; private Pattern subjectDNPattern; private String subjectDNRegex = "CN=(.*?),"; @@ -58,7 +58,7 @@ public class DaoX509AuthoritiesPopulator implements X509AuthoritiesPopulator, //~ Methods ================================================================ public void afterPropertiesSet() throws Exception { - Assert.notNull(authenticationDao, "An authenticationDao must be set"); + Assert.notNull(userDetailsService, "An authenticationDao must be set"); Assert.notNull(this.messages, "A message source must be set"); Perl5Compiler compiler = new Perl5Compiler(); @@ -94,11 +94,11 @@ public class DaoX509AuthoritiesPopulator implements X509AuthoritiesPopulator, String userName = match.group(1); - return this.authenticationDao.loadUserByUsername(userName); + return this.userDetailsService.loadUserByUsername(userName); } - public void setAuthenticationDao(UserDetailsService authenticationDao) { - this.authenticationDao = authenticationDao; + public void setUserDetailsService(UserDetailsService authenticationDao) { + this.userDetailsService = authenticationDao; } public void setMessageSource(MessageSource messageSource) { diff --git a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java index 25e37ac3cd..bec79e58a1 100644 --- a/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java +++ b/core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java @@ -120,7 +120,7 @@ public class DigestProcessingFilter implements Filter, InitializingBean, //~ Instance fields ======================================================== - private UserDetailsService authenticationDao; + private UserDetailsService userDetailsService; private DigestProcessingFilterEntryPoint authenticationEntryPoint; protected MessageSourceAccessor messages; private UserCache userCache = new NullUserCache(); @@ -129,7 +129,7 @@ public class DigestProcessingFilter implements Filter, InitializingBean, //~ Methods ================================================================ public void afterPropertiesSet() throws Exception { - Assert.notNull(authenticationDao, "An AuthenticationDao is required"); + Assert.notNull(userDetailsService, "An AuthenticationDao is required"); Assert.notNull(authenticationEntryPoint, "A DigestProcessingFilterEntryPoint is required"); } @@ -288,7 +288,7 @@ public class DigestProcessingFilter implements Filter, InitializingBean, loadedFromDao = true; try { - user = authenticationDao.loadUserByUsername(username); + user = userDetailsService.loadUserByUsername(username); } catch (UsernameNotFoundException notFound) { fail(request, response, new BadCredentialsException(messages.getMessage( @@ -324,7 +324,7 @@ public class DigestProcessingFilter implements Filter, InitializingBean, } try { - user = authenticationDao.loadUserByUsername(username); + user = userDetailsService.loadUserByUsername(username); } catch (UsernameNotFoundException notFound) { // Would very rarely happen, as user existed earlier fail(request, response, @@ -460,8 +460,8 @@ public class DigestProcessingFilter implements Filter, InitializingBean, return digestMd5; } - public UserDetailsService getAuthenticationDao() { - return authenticationDao; + public UserDetailsService getUserDetailsService() { + return userDetailsService; } public DigestProcessingFilterEntryPoint getAuthenticationEntryPoint() { @@ -474,8 +474,8 @@ public class DigestProcessingFilter implements Filter, InitializingBean, public void init(FilterConfig ignored) throws ServletException {} - public void setAuthenticationDao(UserDetailsService authenticationDao) { - this.authenticationDao = authenticationDao; + public void setUserDetailsService(UserDetailsService authenticationDao) { + this.userDetailsService = authenticationDao; } public void setAuthenticationEntryPoint( diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java b/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java index 893e38605d..1a66fb1371 100644 --- a/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java +++ b/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java @@ -112,19 +112,19 @@ public class TokenBasedRememberMeServices implements RememberMeServices, //~ Instance fields ======================================================== - private UserDetailsService authenticationDao; + private UserDetailsService userDetailsService; private String key; private String parameter = DEFAULT_PARAMETER; private long tokenValiditySeconds = 1209600; // 14 days //~ Methods ================================================================ - public void setAuthenticationDao(UserDetailsService authenticationDao) { - this.authenticationDao = authenticationDao; + public void setUserDetailsService(UserDetailsService authenticationDao) { + this.userDetailsService = authenticationDao; } - public UserDetailsService getAuthenticationDao() { - return authenticationDao; + public UserDetailsService getUserDetailsService() { + return userDetailsService; } public void setKey(String key) { @@ -154,7 +154,7 @@ public class TokenBasedRememberMeServices implements RememberMeServices, public void afterPropertiesSet() throws Exception { Assert.hasLength(key); Assert.hasLength(parameter); - Assert.notNull(authenticationDao); + Assert.notNull(userDetailsService); } public Authentication autoLogin(HttpServletRequest request, @@ -212,7 +212,7 @@ public class TokenBasedRememberMeServices implements RememberMeServices, UserDetails userDetails; try { - userDetails = this.authenticationDao + userDetails = this.userDetailsService .loadUserByUsername(cookieTokens[0]); } catch (UsernameNotFoundException notFound) { cancelCookie(request, response, diff --git a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java index 3fa5812a03..8a26c98485 100644 --- a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java +++ b/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java @@ -131,7 +131,7 @@ public class SwitchUserProcessingFilter implements Filter, InitializingBean, // ~ Instance fields // ======================================================== - private UserDetailsService authenticationDao; + private UserDetailsService userDetailsService; protected MessageSourceAccessor messages; private String exitUserUrl = "/j_acegi_exit_user"; private String switchUserUrl = "/j_acegi_switch_user"; @@ -143,7 +143,7 @@ public class SwitchUserProcessingFilter implements Filter, InitializingBean, Assert.hasLength(switchUserUrl, "switchUserUrl must be specified"); Assert.hasLength(exitUserUrl, "exitUserUrl must be specified"); Assert.hasLength(targetUrl, "targetUrl must be specified"); - Assert.notNull(authenticationDao, "authenticationDao must be specified"); + Assert.notNull(userDetailsService, "authenticationDao must be specified"); Assert.notNull(messages, "A message source must be set"); } @@ -235,7 +235,7 @@ public class SwitchUserProcessingFilter implements Filter, InitializingBean, } // load the user by name - UserDetails targetUser = this.authenticationDao + UserDetails targetUser = this.userDetailsService .loadUserByUsername(username); // user not found @@ -491,9 +491,9 @@ public class SwitchUserProcessingFilter implements Filter, InitializingBean, * @param authenticationDao The * authentication dao */ - public void setAuthenticationDao( + public void setUserDetailsService( UserDetailsService authenticationDao) { - this.authenticationDao = authenticationDao; + this.userDetailsService = authenticationDao; } /** diff --git a/core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml b/core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml index 279e841de8..87e1f1b7bd 100644 --- a/core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml +++ b/core/src/main/resources/org/acegisecurity/adapters/acegisecurity.xml @@ -22,7 +22,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -35,7 +35,7 @@ - + true diff --git a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml b/core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml index 822dfa84e5..8bcb630628 100644 --- a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml +++ b/core/src/main/resources/org/acegisecurity/adapters/adaptertest-invalid.xml @@ -22,7 +22,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR diff --git a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml b/core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml index 279e841de8..87e1f1b7bd 100644 --- a/core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml +++ b/core/src/main/resources/org/acegisecurity/adapters/adaptertest-valid.xml @@ -22,7 +22,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -35,7 +35,7 @@ - + true diff --git a/core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml b/core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml index 321076b2f1..c8340425c1 100644 --- a/core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml +++ b/core/src/main/resources/org/acegisecurity/providers/dao/jdbc/acegisecurity-jdbc.xml @@ -18,13 +18,13 @@ - + - + diff --git a/core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java b/core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java index 78abc29540..c15e2b637f 100644 --- a/core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java +++ b/core/src/test/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulatorTests.java @@ -70,7 +70,7 @@ public class DaoCasAuthoritiesPopulatorTests extends TestCase { public void testGetGrantedAuthoritiesForInvalidUsername() throws Exception { DaoCasAuthoritiesPopulator populator = new DaoCasAuthoritiesPopulator(); - populator.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + populator.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); populator.afterPropertiesSet(); try { @@ -84,7 +84,7 @@ public class DaoCasAuthoritiesPopulatorTests extends TestCase { public void testGetGrantedAuthoritiesForValidUsername() throws Exception { DaoCasAuthoritiesPopulator populator = new DaoCasAuthoritiesPopulator(); - populator.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + populator.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); populator.afterPropertiesSet(); UserDetails results = populator.getUserDetails("marissa"); @@ -98,7 +98,7 @@ public class DaoCasAuthoritiesPopulatorTests extends TestCase { public void testGetGrantedAuthoritiesWhenDaoThrowsException() throws Exception { DaoCasAuthoritiesPopulator populator = new DaoCasAuthoritiesPopulator(); - populator.setAuthenticationDao(new MockAuthenticationDaoSimulateBackendError()); + populator.setUserDetailsService(new MockAuthenticationDaoSimulateBackendError()); populator.afterPropertiesSet(); try { @@ -112,8 +112,8 @@ public class DaoCasAuthoritiesPopulatorTests extends TestCase { public void testGettersSetters() { DaoCasAuthoritiesPopulator populator = new DaoCasAuthoritiesPopulator(); UserDetailsService dao = new MockAuthenticationDaoUserMarissa(); - populator.setAuthenticationDao(dao); - assertEquals(dao, populator.getAuthenticationDao()); + populator.setUserDetailsService(dao); + assertEquals(dao, populator.getUserDetailsService()); } //~ Inner Classes ========================================================== diff --git a/core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java index c6401477b9..b05d0d7414 100644 --- a/core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java +++ b/core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java @@ -68,7 +68,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); provider.setUserCache(new MockUserCache()); try { @@ -85,7 +85,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserPeterAccountExpired()); + provider.setUserDetailsService(new MockAuthenticationDaoUserPeterAccountExpired()); provider.setUserCache(new MockUserCache()); try { @@ -102,7 +102,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserPeterAccountLocked()); + provider.setUserDetailsService(new MockAuthenticationDaoUserPeterAccountLocked()); provider.setUserCache(new MockUserCache()); try { @@ -119,7 +119,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserPeterCredentialsExpired()); + provider.setUserDetailsService(new MockAuthenticationDaoUserPeterCredentialsExpired()); provider.setUserCache(new MockUserCache()); try { @@ -147,7 +147,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserPeter()); + provider.setUserDetailsService(new MockAuthenticationDaoUserPeter()); provider.setUserCache(new MockUserCache()); try { @@ -164,7 +164,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoSimulateBackendError()); + provider.setUserDetailsService(new MockAuthenticationDaoSimulateBackendError()); provider.setUserCache(new MockUserCache()); try { @@ -181,7 +181,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); provider.setUserCache(new MockUserCache()); try { @@ -198,7 +198,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); provider.setUserCache(new MockUserCache()); try { @@ -216,7 +216,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); provider.setHideUserNotFoundExceptions(false); // we want UsernameNotFoundExceptions - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); provider.setUserCache(new MockUserCache()); try { @@ -234,7 +234,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); assertTrue(provider.isHideUserNotFoundExceptions()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); provider.setUserCache(new MockUserCache()); try { @@ -251,7 +251,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); provider.setUserCache(new MockUserCache()); try { @@ -269,7 +269,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); provider.setUserCache(new MockUserCache()); Authentication result = provider.authenticate(token); @@ -293,7 +293,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); provider.setUserCache(new MockUserCache()); Authentication result = provider.authenticate(token); @@ -323,7 +323,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissaWithSalt()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissaWithSalt()); provider.setSaltSource(salt); provider.setUserCache(new MockUserCache()); @@ -349,7 +349,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); provider.setUserCache(new MockUserCache()); provider.setForcePrincipalAsString(true); @@ -371,7 +371,7 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoReturnsNull()); + provider.setUserDetailsService(new MockAuthenticationDaoReturnsNull()); try { provider.authenticate(token); @@ -410,7 +410,7 @@ public class DaoAuthenticationProviderTests extends TestCase { MockUserCache cache = new MockUserCache(); DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(authenticationDao); + provider.setUserDetailsService(authenticationDao); provider.setUserCache(cache); // This will work, as password still "koala" @@ -449,7 +449,7 @@ public class DaoAuthenticationProviderTests extends TestCase { public void testStartupFailsIfNoUserCacheSet() throws Exception { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); - provider.setAuthenticationDao(new MockAuthenticationDaoUserMarissa()); + provider.setUserDetailsService(new MockAuthenticationDaoUserMarissa()); assertEquals(NullUserCache.class, provider.getUserCache().getClass()); provider.setUserCache(null); @@ -465,9 +465,9 @@ public class DaoAuthenticationProviderTests extends TestCase { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setMessageSource(new StaticMessageSource()); UserDetailsService dao = new MockAuthenticationDaoUserMarissa(); - provider.setAuthenticationDao(dao); + provider.setUserDetailsService(dao); provider.setUserCache(new MockUserCache()); - assertEquals(dao, provider.getAuthenticationDao()); + assertEquals(dao, provider.getUserDetailsService()); provider.afterPropertiesSet(); assertTrue(true); } diff --git a/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java b/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java index 9b92d1e0fc..4684a694e5 100644 --- a/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java +++ b/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java @@ -59,7 +59,7 @@ public class DaoX509AuthoritiesPopulatorTests extends TestCase { DaoX509AuthoritiesPopulator populator = new DaoX509AuthoritiesPopulator(); populator.setMessageSource(new StaticMessageSource()); - populator.setAuthenticationDao(new MockAuthenticationDaoMatchesNameOrEmail()); + populator.setUserDetailsService(new MockAuthenticationDaoMatchesNameOrEmail()); populator.afterPropertiesSet(); populator.getUserDetails(cert); } @@ -69,7 +69,7 @@ public class DaoX509AuthoritiesPopulatorTests extends TestCase { DaoX509AuthoritiesPopulator populator = new DaoX509AuthoritiesPopulator(); populator.setMessageSource(new StaticMessageSource()); - populator.setAuthenticationDao(new MockAuthenticationDaoMatchesNameOrEmail()); + populator.setUserDetailsService(new MockAuthenticationDaoMatchesNameOrEmail()); populator.setSubjectDNRegex("emailAddress=(.*?),"); populator.afterPropertiesSet(); populator.getUserDetails(cert); @@ -78,7 +78,7 @@ public class DaoX509AuthoritiesPopulatorTests extends TestCase { public void testInvalidRegexFails() throws Exception { DaoX509AuthoritiesPopulator populator = new DaoX509AuthoritiesPopulator(); populator.setMessageSource(new StaticMessageSource()); - populator.setAuthenticationDao(new MockAuthenticationDaoMatchesNameOrEmail()); + populator.setUserDetailsService(new MockAuthenticationDaoMatchesNameOrEmail()); populator.setSubjectDNRegex("CN=(.*?,"); // missing closing bracket on group try { @@ -94,7 +94,7 @@ public class DaoX509AuthoritiesPopulatorTests extends TestCase { DaoX509AuthoritiesPopulator populator = new DaoX509AuthoritiesPopulator(); populator.setMessageSource(new StaticMessageSource()); - populator.setAuthenticationDao(new MockAuthenticationDaoMatchesNameOrEmail()); + populator.setUserDetailsService(new MockAuthenticationDaoMatchesNameOrEmail()); populator.setSubjectDNRegex("shoeSize=(.*?),"); populator.afterPropertiesSet(); @@ -111,7 +111,7 @@ public class DaoX509AuthoritiesPopulatorTests extends TestCase { DaoX509AuthoritiesPopulator populator = new DaoX509AuthoritiesPopulator(); populator.setMessageSource(new StaticMessageSource()); - populator.setAuthenticationDao(new MockAuthenticationDaoMatchesNameOrEmail()); + populator.setUserDetailsService(new MockAuthenticationDaoMatchesNameOrEmail()); populator.setSubjectDNRegex("CN=.*?,"); populator.afterPropertiesSet(); diff --git a/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java index 158c3f1cbb..617c9ea625 100644 --- a/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java +++ b/core/src/test/java/org/acegisecurity/ui/digestauth/DigestProcessingFilterTests.java @@ -184,8 +184,8 @@ public class DigestProcessingFilterTests extends TestCase { public void testGettersSetters() { DigestProcessingFilter filter = new DigestProcessingFilter(); - filter.setAuthenticationDao(new MockAuthenticationDao()); - assertTrue(filter.getAuthenticationDao() != null); + filter.setUserDetailsService(new MockAuthenticationDao()); + assertTrue(filter.getUserDetailsService() != null); filter.setAuthenticationEntryPoint(new DigestProcessingFilterEntryPoint()); assertTrue(filter.getAuthenticationEntryPoint() != null); @@ -564,7 +564,7 @@ public class DigestProcessingFilterTests extends TestCase { throws Exception { try { DigestProcessingFilter filter = new DigestProcessingFilter(); - filter.setAuthenticationDao(new MockAuthenticationDao()); + filter.setUserDetailsService(new MockAuthenticationDao()); filter.afterPropertiesSet(); fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { diff --git a/core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java b/core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java index a3ec7322a1..fe7baf34f4 100644 --- a/core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java +++ b/core/src/test/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServicesTests.java @@ -70,7 +70,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase { throws Exception { TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(); services.setKey("key"); - services.setAuthenticationDao(new MockAuthenticationDao(null, true)); + services.setUserDetailsService(new MockAuthenticationDao(null, true)); services.afterPropertiesSet(); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -89,7 +89,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase { throws Exception { TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(); services.setKey("key"); - services.setAuthenticationDao(new MockAuthenticationDao(null, true)); + services.setUserDetailsService(new MockAuthenticationDao(null, true)); services.afterPropertiesSet(); Cookie cookie = new Cookie("unrelated_cookie", "foobar"); @@ -112,7 +112,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase { TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(); services.setKey("key"); - services.setAuthenticationDao(new MockAuthenticationDao(user, false)); + services.setUserDetailsService(new MockAuthenticationDao(user, false)); services.afterPropertiesSet(); Cookie cookie = new Cookie(TokenBasedRememberMeServices.ACEGI_SECURITY_HASHED_REMEMBER_ME_COOKIE_KEY, @@ -139,7 +139,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase { TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(); services.setKey("key"); - services.setAuthenticationDao(new MockAuthenticationDao(user, false)); + services.setUserDetailsService(new MockAuthenticationDao(user, false)); services.afterPropertiesSet(); Cookie cookie = new Cookie(TokenBasedRememberMeServices.ACEGI_SECURITY_HASHED_REMEMBER_ME_COOKIE_KEY, @@ -164,7 +164,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase { TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(); services.setKey("key"); - services.setAuthenticationDao(new MockAuthenticationDao(user, false)); + services.setUserDetailsService(new MockAuthenticationDao(user, false)); services.afterPropertiesSet(); Cookie cookie = new Cookie(TokenBasedRememberMeServices.ACEGI_SECURITY_HASHED_REMEMBER_ME_COOKIE_KEY, @@ -190,7 +190,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase { TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(); services.setKey("key"); - services.setAuthenticationDao(new MockAuthenticationDao(user, false)); + services.setUserDetailsService(new MockAuthenticationDao(user, false)); services.afterPropertiesSet(); Cookie cookie = new Cookie(TokenBasedRememberMeServices.ACEGI_SECURITY_HASHED_REMEMBER_ME_COOKIE_KEY, @@ -217,7 +217,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase { TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(); services.setKey("key"); - services.setAuthenticationDao(new MockAuthenticationDao(user, false)); + services.setUserDetailsService(new MockAuthenticationDao(user, false)); services.afterPropertiesSet(); Cookie cookie = new Cookie(TokenBasedRememberMeServices.ACEGI_SECURITY_HASHED_REMEMBER_ME_COOKIE_KEY, @@ -239,7 +239,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase { public void testAutoLoginIfUserNotFound() throws Exception { TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(); services.setKey("key"); - services.setAuthenticationDao(new MockAuthenticationDao(null, true)); + services.setUserDetailsService(new MockAuthenticationDao(null, true)); services.afterPropertiesSet(); Cookie cookie = new Cookie(TokenBasedRememberMeServices.ACEGI_SECURITY_HASHED_REMEMBER_ME_COOKIE_KEY, @@ -265,7 +265,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase { TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(); services.setKey("key"); - services.setAuthenticationDao(new MockAuthenticationDao(user, false)); + services.setUserDetailsService(new MockAuthenticationDao(user, false)); services.afterPropertiesSet(); Cookie cookie = new Cookie(TokenBasedRememberMeServices.ACEGI_SECURITY_HASHED_REMEMBER_ME_COOKIE_KEY, @@ -286,8 +286,8 @@ public class TokenBasedRememberMeServicesTests extends TestCase { public void testGettersSetters() { TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(); - services.setAuthenticationDao(new MockAuthenticationDao(null, false)); - assertTrue(services.getAuthenticationDao() != null); + services.setUserDetailsService(new MockAuthenticationDao(null, false)); + assertTrue(services.getUserDetailsService() != null); services.setKey("d"); assertEquals("d", services.getKey()); diff --git a/core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java b/core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java index 4380b0eb77..3efa03c39c 100644 --- a/core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java +++ b/core/src/test/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilterTests.java @@ -76,7 +76,7 @@ public class SwitchUserProcessingFilterTests extends TestCase { SwitchUserProcessingFilter filter = new SwitchUserProcessingFilter(); filter.setMessageSource(new StaticMessageSource()); - filter.setAuthenticationDao(new MockAuthenticationDaoUserJackLord()); + filter.setUserDetailsService(new MockAuthenticationDaoUserJackLord()); try { Authentication result = filter.attemptSwitchUser(request); @@ -100,7 +100,7 @@ public class SwitchUserProcessingFilterTests extends TestCase { SwitchUserProcessingFilter filter = new SwitchUserProcessingFilter(); filter.setMessageSource(new StaticMessageSource()); - filter.setAuthenticationDao(new MockAuthenticationDaoUserJackLord()); + filter.setUserDetailsService(new MockAuthenticationDaoUserJackLord()); try { Authentication result = filter.attemptSwitchUser(request); @@ -126,7 +126,7 @@ public class SwitchUserProcessingFilterTests extends TestCase { SwitchUserProcessingFilter filter = new SwitchUserProcessingFilter(); filter.setMessageSource(new StaticMessageSource()); - filter.setAuthenticationDao(new MockAuthenticationDaoUserJackLord()); + filter.setUserDetailsService(new MockAuthenticationDaoUserJackLord()); try { Authentication result = filter.attemptSwitchUser(request); @@ -152,7 +152,7 @@ public class SwitchUserProcessingFilterTests extends TestCase { SwitchUserProcessingFilter filter = new SwitchUserProcessingFilter(); filter.setMessageSource(new StaticMessageSource()); - filter.setAuthenticationDao(new MockAuthenticationDaoUserJackLord()); + filter.setUserDetailsService(new MockAuthenticationDaoUserJackLord()); try { Authentication result = filter.attemptSwitchUser(request); @@ -175,7 +175,7 @@ public class SwitchUserProcessingFilterTests extends TestCase { SwitchUserProcessingFilter filter = new SwitchUserProcessingFilter(); filter.setMessageSource(new StaticMessageSource()); - filter.setAuthenticationDao(new MockAuthenticationDaoUserJackLord()); + filter.setUserDetailsService(new MockAuthenticationDaoUserJackLord()); Authentication result = filter.attemptSwitchUser(request); assertTrue(result != null); @@ -199,7 +199,7 @@ public class SwitchUserProcessingFilterTests extends TestCase { public void testBadConfigMissingTargetUrl() { SwitchUserProcessingFilter filter = new SwitchUserProcessingFilter(); filter.setMessageSource(new StaticMessageSource()); - filter.setAuthenticationDao(new MockAuthenticationDaoUserJackLord()); + filter.setUserDetailsService(new MockAuthenticationDaoUserJackLord()); filter.setSwitchUserUrl("/j_acegi_switch_user"); filter.setExitUserUrl("/j_acegi_exit_user"); @@ -248,7 +248,7 @@ public class SwitchUserProcessingFilterTests extends TestCase { // setup filter SwitchUserProcessingFilter filter = new SwitchUserProcessingFilter(); filter.setMessageSource(new StaticMessageSource()); - filter.setAuthenticationDao(new MockAuthenticationDaoUserJackLord()); + filter.setUserDetailsService(new MockAuthenticationDaoUserJackLord()); filter.setExitUserUrl("/j_acegi_exit_user"); MockFilterChain chain = new MockFilterChain(true); @@ -277,7 +277,7 @@ public class SwitchUserProcessingFilterTests extends TestCase { // setup filter SwitchUserProcessingFilter filter = new SwitchUserProcessingFilter(); filter.setMessageSource(new StaticMessageSource()); - filter.setAuthenticationDao(new MockAuthenticationDaoUserJackLord()); + filter.setUserDetailsService(new MockAuthenticationDaoUserJackLord()); filter.setExitUserUrl("/j_acegi_exit_user"); MockFilterChain chain = new MockFilterChain(true); @@ -308,7 +308,7 @@ public class SwitchUserProcessingFilterTests extends TestCase { filter.setMessageSource(new StaticMessageSource()); filter.setSwitchUserUrl("/j_acegi_switch_user"); filter.setTargetUrl("/webapp/someOtherUrl"); - filter.setAuthenticationDao(new MockAuthenticationDaoUserJackLord()); + filter.setUserDetailsService(new MockAuthenticationDaoUserJackLord()); filter.doFilter(request, response, chain); @@ -356,7 +356,7 @@ public class SwitchUserProcessingFilterTests extends TestCase { // setup filter SwitchUserProcessingFilter filter = new SwitchUserProcessingFilter(); filter.setMessageSource(new StaticMessageSource()); - filter.setAuthenticationDao(new MockAuthenticationDaoUserJackLord()); + filter.setUserDetailsService(new MockAuthenticationDaoUserJackLord()); filter.setSwitchUserUrl("/j_acegi_switch_user"); MockFilterChain chain = new MockFilterChain(true); diff --git a/core/src/test/resources/org/acegisecurity/ui/basicauth/filtertest-valid.xml b/core/src/test/resources/org/acegisecurity/ui/basicauth/filtertest-valid.xml index 8d92940d4a..6fa46f1922 100644 --- a/core/src/test/resources/org/acegisecurity/ui/basicauth/filtertest-valid.xml +++ b/core/src/test/resources/org/acegisecurity/ui/basicauth/filtertest-valid.xml @@ -35,7 +35,7 @@ - + diff --git a/core/src/test/resources/org/acegisecurity/ui/digestauth/filtertest-valid.xml b/core/src/test/resources/org/acegisecurity/ui/digestauth/filtertest-valid.xml index d5b5d86e6e..ecf999fa39 100644 --- a/core/src/test/resources/org/acegisecurity/ui/digestauth/filtertest-valid.xml +++ b/core/src/test/resources/org/acegisecurity/ui/digestauth/filtertest-valid.xml @@ -35,7 +35,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml b/core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml index 047d67cb8d..df11460da7 100644 --- a/core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml +++ b/core/src/test/resources/org/acegisecurity/ui/webapp/filtertest-valid.xml @@ -22,7 +22,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -35,7 +35,7 @@ - + diff --git a/doc/docbook/acegi.xml b/doc/docbook/acegi.xml index 870e95141b..97ab095ce3 100644 --- a/doc/docbook/acegi.xml +++ b/doc/docbook/acegi.xml @@ -1335,7 +1335,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean { creation time: <bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"> - <property name="authenticationDao"><ref bean="inMemoryDaoImpl"/></property> + <property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property> <property name="saltSource"><ref bean="saltSource"/></property> <property name="passwordEncoder"><ref bean="passwordEncoder"/></property> </bean> @@ -1370,7 +1370,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean { follows: <bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"> - <property name="authenticationDao"><ref bean="authenticationDao"/></property> + <property name="userDetailsService"><ref bean="userDetailsService"/></property> <property name="userCache"><ref bean="userCache"/></property> </bean> @@ -1465,7 +1465,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean { authentication repository in the application context itself using the InMemoryDaoImpl: - <bean id="inMemoryDaoImpl" class="org.acegisecurity.providers.dao.memory.InMemoryDaoImpl"> + <bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl"> <property name="userMap"> <value> marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -1514,7 +1514,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean { <property name="password"><value></value></property> </bean> -<bean id="jdbcDaoImpl" class="org.acegisecurity.providers.dao.jdbc.JdbcDaoImpl"> +<bean id="jdbcDaoImpl" class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> <property name="dataSource"><ref bean="dataSource"/></property> </bean> @@ -2722,7 +2722,7 @@ key: A private key to prevent modification of the nonce token collaborators: <bean id="digestProcessingFilter" class="org.acegisecurity.ui.digestauth.DigestProcessingFilter"> - <property name="authenticationDao"><ref local="jdbcDaoImpl"/></property> + <property name="userDetailsService"><ref local="jdbcDaoImpl"/></property> <property name="authenticationEntryPoint"><ref local="digestProcessingFilterEntryPoint"/></property> <property name="userCache"><ref local="userCache"/></property> </bean> @@ -2907,8 +2907,8 @@ public void loginSuccess(HttpServletRequest request, HttpServletResponse respons base64(username + ":" + expirationTime + ":" + md5Hex(username + ":" + expirationTime + ":" password + ":" + key)) -username: As identifiable to TokenBasedRememberMeServices.getAuthenticationDao() -password: That matches the relevant UserDetails retrieved from TokenBasedRememberMeServices.getAuthenticationDao() +username: As identifiable to TokenBasedRememberMeServices.getUserDetailsService() +password: That matches the relevant UserDetails retrieved from TokenBasedRememberMeServices.getUserDetailsService() expirationTime: The date and time when the remember-me token expires, expressed in milliseconds key: A private key to prevent modification of the remember-me token @@ -2946,7 +2946,7 @@ key: A private key to prevent modification of the remember-me token </bean> <bean id="rememberMeServices" class="org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices"> - <property name="authenticationDao"><ref local="jdbcDaoImpl"/></property> + <property name="userDetailsService"><ref local="jdbcDaoImpl"/></property> <property name="key"><value>springRocks</value></property> </bean> @@ -3706,7 +3706,7 @@ $CATALINA_HOME/bin/startup.sh /web/WEB-INF directory. A sample applicationContext.xml is included below: - <bean id="inMemoryDaoImpl" class="org.acegisecurity.providers.dao.memory.InMemoryDaoImpl"> + <bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl"> <property name="userMap"> <value> marissa=koala,ROLES_IGNORED_BY_CAS @@ -3718,7 +3718,7 @@ $CATALINA_HOME/bin/startup.sh </bean> <bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"> - <property name="authenticationDao"><ref bean="inMemoryDaoImpl"/></property> + <property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property> </bean> <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager"> @@ -3895,7 +3895,7 @@ $CATALINA_HOME/bin/startup.sh </bean> <bean id="casAuthoritiesPopulator" class="org.acegisecurity.providers.cas.populator.DaoCasAuthoritiesPopulator"> - <property name="authenticationDao"><ref bean="inMemoryDaoImpl"/></property> + <property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property> </bean> <bean id="casProxyDecider" class="org.acegisecurity.providers.cas.proxy.RejectProxyTickets"/> diff --git a/samples/acegifier/src/test/java/acegifier/WebXmlConverterTests.java b/samples/acegifier/src/test/java/acegifier/WebXmlConverterTests.java index dc6678ed58..67b9f5ac11 100644 --- a/samples/acegifier/src/test/java/acegifier/WebXmlConverterTests.java +++ b/samples/acegifier/src/test/java/acegifier/WebXmlConverterTests.java @@ -53,7 +53,7 @@ public class WebXmlConverterTests extends TestCase { (DaoAuthenticationProvider) bf.getBean("daoAuthenticationProvider"); assertNotNull(dap); - InMemoryDaoImpl dao = (InMemoryDaoImpl) dap.getAuthenticationDao(); + InMemoryDaoImpl dao = (InMemoryDaoImpl) dap.getUserDetailsService(); UserDetails user = dao.loadUserByUsername("superuser"); assertEquals("password",user.getPassword()); assertEquals(2, user.getAuthorities().length); diff --git a/samples/contacts-tiger/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml b/samples/contacts-tiger/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml index 1691437864..b55587699a 100644 --- a/samples/contacts-tiger/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml +++ b/samples/contacts-tiger/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml @@ -45,7 +45,7 @@ - + @@ -94,7 +94,7 @@ - + springRocks diff --git a/samples/contacts/src/main/webapp/ca/WEB-INF/classes/resin-acegisecurity.xml b/samples/contacts/src/main/webapp/ca/WEB-INF/classes/resin-acegisecurity.xml index d98154f521..a2606f4377 100644 --- a/samples/contacts/src/main/webapp/ca/WEB-INF/classes/resin-acegisecurity.xml +++ b/samples/contacts/src/main/webapp/ca/WEB-INF/classes/resin-acegisecurity.xml @@ -19,7 +19,7 @@ - + marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR @@ -32,7 +32,7 @@ - + true diff --git a/samples/contacts/src/main/webapp/cas/WEB-INF/applicationContext-acegi-security.xml b/samples/contacts/src/main/webapp/cas/WEB-INF/applicationContext-acegi-security.xml index 7b6e338243..d4abdc95a2 100644 --- a/samples/contacts/src/main/webapp/cas/WEB-INF/applicationContext-acegi-security.xml +++ b/samples/contacts/src/main/webapp/cas/WEB-INF/applicationContext-acegi-security.xml @@ -34,7 +34,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/samples/contacts/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml b/samples/contacts/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml index 53c2945c82..d5883c0784 100644 --- a/samples/contacts/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml +++ b/samples/contacts/src/main/webapp/filter/WEB-INF/applicationContext-acegi-security.xml @@ -38,14 +38,14 @@ - + - + @@ -94,7 +94,7 @@ - + springRocks @@ -186,7 +186,7 @@ based on the role granted the ability to 'switch' to another user --> - + /j_acegi_switch_user /j_acegi_exit_user /acegi-security-sample-contacts-filter/secure/index.htm diff --git a/samples/contacts/src/main/webapp/x509/WEB-INF/applicationContext-acegi-security.xml b/samples/contacts/src/main/webapp/x509/WEB-INF/applicationContext-acegi-security.xml index b3058c5e6c..93a3e09a56 100644 --- a/samples/contacts/src/main/webapp/x509/WEB-INF/applicationContext-acegi-security.xml +++ b/samples/contacts/src/main/webapp/x509/WEB-INF/applicationContext-acegi-security.xml @@ -34,7 +34,7 @@ - + @@ -71,7 +71,7 @@ - +