SEC-318: Rename AuthenticationDao to UserDetailsService in local variables and logging messages

core/src/main/java/org/acegisecurity/providers/cas/populator/DaoCasAuthoritiesPopulator.java

@@ -55,7 +55,7 @@ public class DaoCasAuthoritiesPopulator implements CasAuthoritiesPopulator, Init
         return userDetailsService;
     }
 
-    public void setUserDetailsService(UserDetailsService authenticationDao) {
-        this.userDetailsService = authenticationDao;
+    public void setUserDetailsService(UserDetailsService userDetailsService) {
+        this.userDetailsService = userDetailsService;
     }
 }

core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java

@@ -63,7 +63,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
     }
 
     protected void doAfterPropertiesSet() throws Exception {
-        Assert.notNull(this.userDetailsService, "An Authentication DAO must be set");
+        Assert.notNull(this.userDetailsService, "A UserDetailsService must be set");
     }
 
     public PasswordEncoder getPasswordEncoder() {
@@ -90,7 +90,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
 
         if (loadedUser == null) {
             throw new AuthenticationServiceException(
-                "AuthenticationDao returned null, which is an interface contract violation");
+                "UserDetailsService returned null, which is an interface contract violation");
         }
 
         return loadedUser;
@@ -117,7 +117,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
         this.saltSource = saltSource;
     }
 
-    public void setUserDetailsService(UserDetailsService authenticationDao) {
-        this.userDetailsService = authenticationDao;
+    public void setUserDetailsService(UserDetailsService userDetailsService) {
+        this.userDetailsService = userDetailsService;
     }
 }

core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java

@@ -117,7 +117,7 @@ public class DaoX509AuthoritiesPopulator implements X509AuthoritiesPopulator, In
         this.subjectDNRegex = subjectDNRegex;
     }
 
-    public void setUserDetailsService(UserDetailsService authenticationDao) {
-        this.userDetailsService = authenticationDao;
+    public void setUserDetailsService(UserDetailsService userDetailsService) {
+        this.userDetailsService = userDetailsService;
     }
 }

core/src/main/java/org/acegisecurity/ui/digestauth/DigestProcessingFilter.java

@@ -431,7 +431,7 @@ public class DigestProcessingFilter implements Filter, InitializingBean, Message
         this.userCache = userCache;
     }
 
-    public void setUserDetailsService(UserDetailsService authenticationDao) {
-        this.userDetailsService = authenticationDao;
+    public void setUserDetailsService(UserDetailsService userDetailsService) {
+        this.userDetailsService = userDetailsService;
     }
 }

core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java

@@ -319,7 +319,7 @@ public class TokenBasedRememberMeServices implements RememberMeServices, Initial
         this.tokenValiditySeconds = tokenValiditySeconds;
     }
 
-    public void setUserDetailsService(UserDetailsService authenticationDao) {
-        this.userDetailsService = authenticationDao;
+    public void setUserDetailsService(UserDetailsService userDetailsService) {
+        this.userDetailsService = userDetailsService;
     }
 }

core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java

@@ -439,8 +439,8 @@ public class SwitchUserProcessingFilter implements Filter, InitializingBean, App
      *
      * @param authenticationDao The authentication dao
      */
-    public void setUserDetailsService(UserDetailsService authenticationDao) {
-        this.userDetailsService = authenticationDao;
+    public void setUserDetailsService(UserDetailsService userDetailsService) {
+        this.userDetailsService = userDetailsService;
     }
 
     /**

core/src/test/java/org/acegisecurity/providers/dao/DaoAuthenticationProviderTests.java

@@ -417,10 +417,10 @@ public class DaoAuthenticationProviderTests extends TestCase {
 
     public void testStartupSuccess() throws Exception {
         DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        UserDetailsService dao = new MockAuthenticationDaoUserMarissa();
-        provider.setUserDetailsService(dao);
+        UserDetailsService userDetailsService = new MockAuthenticationDaoUserMarissa();
+        provider.setUserDetailsService(userDetailsService);
         provider.setUserCache(new MockUserCache());
-        assertEquals(dao, provider.getUserDetailsService());
+        assertEquals(userDetailsService, provider.getUserDetailsService());
         provider.afterPropertiesSet();
         assertTrue(true);
     }