SEC-1158: Decoupling of Pre/Post annotations implementation from Spring EL.

web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java

@@ -4,7 +4,7 @@ import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.antlr.SpelAntlrExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.security.access.expression.support.SecurityExpressionRoot;
+import org.springframework.security.access.expression.SecurityExpressionRoot;
 import org.springframework.security.authentication.AuthenticationTrustResolver;
 import org.springframework.security.authentication.AuthenticationTrustResolverImpl;
 import org.springframework.security.core.Authentication;
@@ -16,7 +16,7 @@ import org.springframework.security.web.FilterInvocation;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class DefaultWebSecurityExpressionHandler implements WebSecurityExpressionHandler {
 

web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java

@@ -20,7 +20,7 @@ import org.springframework.util.Assert;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public final class ExpressionBasedFilterInvocationSecurityMetadataSource extends DefaultFilterInvocationSecurityMetadataSource {
     private final static Log logger = LogFactory.getLog(ExpressionBasedFilterInvocationSecurityMetadataSource.class);

web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java

@@ -8,7 +8,7 @@ import org.springframework.security.access.ConfigAttribute;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 class WebExpressionConfigAttribute implements ConfigAttribute {
     private final Expression authorizeExpression;

web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java

@@ -3,9 +3,9 @@ package org.springframework.security.web.access.expression;
 import java.util.List;
 
 import org.springframework.expression.EvaluationContext;
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.expression.ExpressionUtils;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.FilterInvocation;
 
@@ -13,7 +13,7 @@ import org.springframework.security.web.FilterInvocation;
  * Voter which handles web authorisation decisions.
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class WebExpressionVoter implements AccessDecisionVoter {
     private WebSecurityExpressionHandler expressionHandler = new DefaultWebSecurityExpressionHandler();

web/src/main/java/org/springframework/security/web/access/expression/WebSecurityExpressionRoot.java

@@ -4,7 +4,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
 
-import org.springframework.security.access.expression.support.SecurityExpressionRoot;
+import org.springframework.security.access.expression.SecurityExpressionRoot;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.FilterInvocation;
 import org.springframework.util.StringUtils;
@@ -13,7 +13,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 class WebSecurityExpressionRoot extends SecurityExpressionRoot {
     private FilterInvocation filterInvocation;

web/src/main/java/org/springframework/security/web/access/intercept/FilterInvocationSecurityMetadataSource.java

@@ -15,7 +15,7 @@
 
 package org.springframework.security.web.access.intercept;
 
-import org.springframework.security.access.intercept.SecurityMetadataSource;
+import org.springframework.security.access.SecurityMetadataSource;
 import org.springframework.security.web.FilterInvocation;
 
 

web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java

@@ -15,9 +15,9 @@
 
 package org.springframework.security.web.access.intercept;
 
+import org.springframework.security.access.SecurityMetadataSource;
 import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
 import org.springframework.security.access.intercept.InterceptorStatusToken;
-import org.springframework.security.access.intercept.SecurityMetadataSource;
 import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.FilterInvocation;
 import org.springframework.core.Ordered;

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

@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public abstract class AbstractAuthenticationTargetUrlRequestHandler {
 

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

@@ -19,7 +19,7 @@ import org.springframework.security.core.AuthenticationException;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public interface AuthenticationFailureHandler {
 

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

@@ -18,7 +18,7 @@ import org.springframework.security.core.Authentication;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  * @see
  */
 public interface AuthenticationSuccessHandler {

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

@@ -24,7 +24,7 @@ import org.springframework.util.Assert;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class ExceptionMappingAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
     private Map<String, String> failureUrlMap = new HashMap<String, String>();

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

@@ -46,7 +46,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class SavedRequestAwareAuthenticationSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
 

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

@@ -22,7 +22,7 @@ import org.springframework.util.Assert;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class SimpleUrlAuthenticationFailureHandler implements AuthenticationFailureHandler {
     private String defaultFailureUrl;

web/src/main/java/org/springframework/security/web/authentication/logout/LogoutSuccessHandler.java

@@ -18,7 +18,7 @@ import org.springframework.security.core.Authentication;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public interface LogoutSuccessHandler {
 

web/src/main/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandler.java

@@ -15,7 +15,7 @@ import org.springframework.security.web.authentication.AbstractAuthenticationTar
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class SimpleUrlLogoutSuccessHandler extends AbstractAuthenticationTargetUrlRequestHandler
         implements LogoutSuccessHandler {

web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java

@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class HttpRequestResponseHolder {
     HttpServletRequest request;

web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java

@@ -53,7 +53,7 @@ import org.springframework.util.ReflectionUtils;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class HttpSessionSecurityContextRepository implements SecurityContextRepository {
     public static final String SPRING_SECURITY_CONTEXT_KEY = "SPRING_SECURITY_CONTEXT";

web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java

@@ -20,7 +20,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * @author Luke Taylor
  * @author Marten Algesten
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public abstract class SaveContextOnUpdateOrErrorResponseWrapper extends HttpServletResponseWrapper {
 

web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java

@@ -36,7 +36,7 @@ import org.springframework.security.web.SpringSecurityFilter;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class SecurityContextPersistenceFilter extends SpringSecurityFilter {
 

web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java

@@ -17,7 +17,7 @@ import org.springframework.security.core.context.SecurityContext;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  *
  * @see SecurityContextPersistenceFilter
  * @see HttpSessionSecurityContextRepository

web/src/test/java/org/springframework/security/web/access/expression/WebSecurityExpressionRootTests.java

@@ -17,7 +17,7 @@ import org.springframework.security.web.access.expression.WebSecurityExpressionR
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class WebSecurityExpressionRootTests {
 

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

@@ -16,22 +16,6 @@
 package org.springframework.security.web.authentication;
 
 import static org.mockito.Mockito.mock;
-import junit.framework.TestCase;
-
-import org.springframework.security.MockFilterConfig;
-
-import org.springframework.security.authentication.TestingAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.memory.UserAttribute;
-
-
-import org.springframework.security.web.authentication.AnonymousProcessingFilter;
-
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
 
 import java.io.IOException;
 
@@ -42,6 +26,17 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import junit.framework.TestCase;
+
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.security.authentication.TestingAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.memory.UserAttribute;
+
 
 /**
  * Tests {@link AnonymousProcessingFilter}.

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

@@ -23,7 +23,7 @@ import org.springframework.security.web.authentication.ui.DefaultLoginPageGenera
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class DefaultLoginPageGeneratingFilterTests {
     FilterChain chain = mock(FilterChain.class);