SEC-1229: Further doc and mods to namespace config/naming to make it more consistent

web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java

@@ -400,7 +400,7 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt
      * @param sessionStrategy the implementation to use. If not set a null implementation is
      * used.
      */
-    public void setAuthenticatedSessionStrategy(SessionAuthenticationStrategy sessionStrategy) {
+    public void setSessionAuthenticationStrategy(SessionAuthenticationStrategy sessionStrategy) {
         this.sessionStrategy = sessionStrategy;
     }
 

web/src/main/java/org/springframework/security/web/session/ConcurrentSessionControlStrategy.java

@@ -22,7 +22,7 @@ import org.springframework.util.Assert;
  * @version $Id$
  * @since 3.0
  */
-public class ConcurrentSessionControlAuthenticatedSessionStrategy extends DefaultSessionAuthenticationStrategy
+public class ConcurrentSessionControlStrategy extends DefaultSessionAuthenticationStrategy
         implements MessageSourceAware {
     protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
     private final SessionRegistry sessionRegistry;
@@ -32,7 +32,7 @@ public class ConcurrentSessionControlAuthenticatedSessionStrategy extends Defaul
     /**
      * @param sessionRegistry the session registry which should be updated when the authenticated session is changed.
      */
-    public ConcurrentSessionControlAuthenticatedSessionStrategy(SessionRegistry sessionRegistry) {
+    public ConcurrentSessionControlStrategy(SessionRegistry sessionRegistry) {
         Assert.notNull(sessionRegistry, "The sessionRegistry cannot be null");
         super.setAlwaysCreateSession(true);
         this.sessionRegistry = sessionRegistry;

web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java

@@ -98,7 +98,7 @@ public class SessionManagementFilter extends GenericFilterBean {
      *
      * @param sessionStrategy the strategy object. If not set, a {@link DefaultSessionAuthenticationStrategy} is used.
      */
-    public void setAuthenticatedSessionStrategy(SessionAuthenticationStrategy sessionStrategy) {
+    public void setSessionAuthenticationStrategy(SessionAuthenticationStrategy sessionStrategy) {
         Assert.notNull(sessionStrategy, "authenticatedSessionStratedy must not be null");
         this.sessionStrategy = sessionStrategy;
     }

web/src/test/java/org/springframework/security/web/authentication/AbstractProcessingFilterTests.java

@@ -240,7 +240,7 @@ public class AbstractProcessingFilterTests extends TestCase {
         MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(true);
 
         filter.setFilterProcessesUrl("/j_mock_post");
-        filter.setAuthenticatedSessionStrategy(mock(SessionAuthenticationStrategy.class));
+        filter.setSessionAuthenticationStrategy(mock(SessionAuthenticationStrategy.class));
         filter.setAuthenticationSuccessHandler(successHandler);
         filter.setAuthenticationFailureHandler(failureHandler);
         filter.setAuthenticationManager(mock(AuthenticationManager.class));

web/src/test/java/org/springframework/security/web/session/SessionManagementFilterTests.java

@@ -48,7 +48,7 @@ public class SessionManagementFilterTests {
         // mock that repo contains a security context
         when(repo.containsContext(any(HttpServletRequest.class))).thenReturn(true);
         SessionManagementFilter filter = new SessionManagementFilter(repo);
-        filter.setAuthenticatedSessionStrategy(strategy);
+        filter.setSessionAuthenticationStrategy(strategy);
         HttpServletRequest request = new MockHttpServletRequest();
         authenticateUser();
 
@@ -62,7 +62,7 @@ public class SessionManagementFilterTests {
         SecurityContextRepository repo = mock(SecurityContextRepository.class);
         SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
         SessionManagementFilter filter = new SessionManagementFilter(repo);
-        filter.setAuthenticatedSessionStrategy(strategy);
+        filter.setSessionAuthenticationStrategy(strategy);
         HttpServletRequest request = new MockHttpServletRequest();
 
         filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
@@ -76,7 +76,7 @@ public class SessionManagementFilterTests {
         // repo will return false to containsContext()
         SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
         SessionManagementFilter filter = new SessionManagementFilter(repo);
-        filter.setAuthenticatedSessionStrategy(strategy);
+        filter.setSessionAuthenticationStrategy(strategy);
         HttpServletRequest request = new MockHttpServletRequest();
         authenticateUser();
 
@@ -94,7 +94,7 @@ public class SessionManagementFilterTests {
         // repo will return false to containsContext()
         SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
         SessionManagementFilter filter = new SessionManagementFilter(repo);
-        filter.setAuthenticatedSessionStrategy(strategy);
+        filter.setSessionAuthenticationStrategy(strategy);
         MockHttpServletRequest request = new MockHttpServletRequest();
         request.setRequestedSessionId("xxx");
         request.setRequestedSessionIdValid(false);