SEC-1132: Refactoring of access/intercept package to extract packages and classes which are externally depended on or potentially may be used outside of the standard interceptor model (e.g. SecurityMetadataSource)

acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java

@@ -18,8 +18,8 @@ package org.springframework.security.acls.afterinvocation;
 import java.util.Arrays;
 import java.util.List;
 
+import org.springframework.security.access.AfterInvocationProvider;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.intercept.AfterInvocationProvider;
 import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.acls.domain.ObjectIdentityRetrievalStrategyImpl;
 import org.springframework.security.acls.domain.SidRetrievalStrategyImpl;

config/src/main/java/org/springframework/security/config/ConfigUtils.java

@@ -12,8 +12,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.intercept.AfterInvocationProviderManager;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.access.vote.AffirmativeBased;
 import org.springframework.security.access.vote.AuthenticatedVoter;
 import org.springframework.security.access.vote.RoleVoter;

config/src/main/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecorator.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Node;
 
 /**
- * Adds the decorated {@link org.springframework.security.access.intercept.AfterInvocationProvider} to the
+ * Adds the decorated {@link org.springframework.security.access.AfterInvocationProvider} to the
  * AfterInvocationProviderManager's list.
  *
  * @author Luke Taylor

config/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java

@@ -27,11 +27,10 @@ import org.springframework.security.access.expression.method.DefaultMethodSecuri
 import org.springframework.security.access.expression.method.ExpressionBasedAnnotationAttributeFactory;
 import org.springframework.security.access.expression.method.ExpressionBasedPostInvocationAdvice;
 import org.springframework.security.access.expression.method.ExpressionBasedPreInvocationAdvice;
-import org.springframework.security.access.intercept.method.DelegatingMethodSecurityMetadataSource;
-import org.springframework.security.access.intercept.method.MapBasedMethodSecurityMetadataSource;
-import org.springframework.security.access.intercept.method.ProtectPointcutPostProcessor;
-import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor;
-import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityMetadataSourceAdvisor;
+import org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor;
+import org.springframework.security.access.intercept.aopalliance.MethodSecurityMetadataSourceAdvisor;
+import org.springframework.security.access.method.DelegatingMethodSecurityMetadataSource;
+import org.springframework.security.access.method.MapBasedMethodSecurityMetadataSource;
 import org.springframework.security.access.prepost.PostInvocationAdviceProvider;
 import org.springframework.security.access.prepost.PreInvocationAuthorizationAdviceVoter;
 import org.springframework.security.access.prepost.PrePostAnnotationSecurityMetadataSource;

config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java

@@ -17,10 +17,10 @@ import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.ConfigAttributeEditor;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.access.vote.AuthenticatedVoter;
 import org.springframework.security.access.vote.RoleVoter;
 import org.springframework.security.web.FilterChainProxy;

config/src/main/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecorator.java

@@ -10,7 +10,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionDecorator;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor;
+import org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;

config/src/main/java/org/springframework/security/config/MethodSecurityInterceptorPostProcessor.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.security.access.intercept.AfterInvocationManager;
-import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor;
+import org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor;
 
 /**
  * BeanPostProcessor which sets the AfterInvocationManager on the global MethodSecurityInterceptor,

core/src/main/java/org/springframework/security/access/intercept/method/ProtectPointcutPostProcessor.java → config/src/main/java/org/springframework/security/config/ProtectPointcutPostProcessor.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.intercept.method;
+package org.springframework.security.config;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
@@ -15,7 +15,8 @@ import org.aspectj.weaver.tools.PointcutPrimitive;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityMetadataSourceAdvisor;
+import org.springframework.security.access.intercept.aopalliance.MethodSecurityMetadataSourceAdvisor;
+import org.springframework.security.access.method.MapBasedMethodSecurityMetadataSource;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

config/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java

@@ -6,7 +6,7 @@ import org.junit.After;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.security.access.intercept.AfterInvocationProviderManager;
-import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor;
+import org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor;
 import org.springframework.security.config.util.InMemoryXmlApplicationContext;
 
 public class CustomAfterInvocationProviderBeanDefinitionDecoratorTests {

config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java

@@ -3,8 +3,8 @@ package org.springframework.security.config;
 import java.util.List;
 
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.AfterInvocationProvider;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.intercept.AfterInvocationProvider;
 import org.springframework.security.core.Authentication;
 
 public class MockAfterInvocationProvider implements AfterInvocationProvider {

config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java

@@ -55,7 +55,7 @@ public class MethodSecurityInterceptorWithAopConfigTests {
                 "     <aop:advisor advice-ref='securityInterceptor' pointcut-ref='targetMethods' />" +
                 "</aop:config>" +
                 "<b:bean id='target' class='org.springframework.security.TargetObject'/>" +
-                "<b:bean id='securityInterceptor' class='org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor' autowire='byType' >" +
+                "<b:bean id='securityInterceptor' class='org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor' autowire='byType' >" +
                 "     <b:property name='securityMetadataSource'>" +
                 "       <b:value>" +
                             "org.springframework.security.TargetObject.makeLower*=ROLE_A\n" +

core/src/main/java/org/springframework/security/access/vote/AccessDecisionVoter.java → core/src/main/java/org/springframework/security/access/AccessDecisionVoter.java

@@ -13,11 +13,10 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.vote;
+package org.springframework.security.access;
 
 import java.util.List;
 
-import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
 

core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProvider.java → core/src/main/java/org/springframework/security/access/AfterInvocationProvider.java

@@ -13,12 +13,11 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept;
+package org.springframework.security.access;
 
 import java.util.List;
 
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.intercept.AfterInvocationProviderManager;
 import org.springframework.security.core.Authentication;
 
 

core/src/main/java/org/springframework/security/access/intercept/SecurityMetadataSource.java → core/src/main/java/org/springframework/security/access/SecurityMetadataSource.java

@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept;
+package org.springframework.security.access;
 
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
 
 
 /**

core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java

@@ -27,7 +27,7 @@ import javax.annotation.security.RolesAllowed;
 
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.intercept.method.AbstractFallbackMethodSecurityMetadataSource;
+import org.springframework.security.access.method.AbstractFallbackMethodSecurityMetadataSource;
 
 
 /**

core/src/main/java/org/springframework/security/access/annotation/Jsr250Voter.java

@@ -2,8 +2,8 @@ package org.springframework.security.access.annotation;
 
 import java.util.List;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 

core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java

@@ -24,7 +24,7 @@ import java.util.List;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.intercept.method.AbstractFallbackMethodSecurityMetadataSource;
+import org.springframework.security.access.method.AbstractFallbackMethodSecurityMetadataSource;
 
 
 /**

core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java

@@ -32,6 +32,7 @@ import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.security.access.AccessDecisionManager;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityMetadataSource;
 import org.springframework.security.access.event.AuthenticationCredentialsNotFoundEvent;
 import org.springframework.security.access.event.AuthorizationFailureEvent;
 import org.springframework.security.access.event.AuthorizedEvent;

core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java

@@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.AfterInvocationProvider;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;

core/src/main/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluator.java → core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method;
+package org.springframework.security.access.intercept;
 
 import java.util.List;
 
@@ -23,7 +23,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
 import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 

core/src/main/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityInterceptor.java → core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptor.java

@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method.aopalliance;
+package org.springframework.security.access.intercept.aopalliance;
 
+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.access.intercept.method.MethodSecurityMetadataSource;
+import org.springframework.security.access.method.MethodSecurityMetadataSource;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

core/src/main/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisor.java → core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method.aopalliance;
+package org.springframework.security.access.intercept.aopalliance;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;
@@ -26,7 +26,7 @@ import org.springframework.aop.support.StaticMethodMatcherPointcut;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.security.access.intercept.method.MethodSecurityMetadataSource;
+import org.springframework.security.access.method.MethodSecurityMetadataSource;
 import org.springframework.util.Assert;
 
 /**

core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJAnnotationCallback.java → core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJAnnotationCallback.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.intercept.method.aspectj;
+package org.springframework.security.access.intercept.aspectj;
 
 
 /**

core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJAnnotationSecurityInterceptor.java → core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJAnnotationSecurityInterceptor.java

@@ -1,9 +1,9 @@
-package org.springframework.security.access.intercept.method.aspectj;
+package org.springframework.security.access.intercept.aspectj;
 
+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.access.intercept.method.MethodSecurityMetadataSource;
+import org.springframework.security.access.method.MethodSecurityMetadataSource;
 
 import org.aspectj.lang.JoinPoint;
 

core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJCallback.java → core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJCallback.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method.aspectj;
+package org.springframework.security.access.intercept.aspectj;
 
 /**
  * Called by the {@link AspectJSecurityInterceptor} when it wishes for the

core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJSecurityInterceptor.java → core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJSecurityInterceptor.java

@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method.aspectj;
+package org.springframework.security.access.intercept.aspectj;
 
+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.access.intercept.method.MethodSecurityMetadataSource;
+import org.springframework.security.access.method.MethodSecurityMetadataSource;
 
 import org.aspectj.lang.JoinPoint;
 

core/src/main/java/org/springframework/security/access/intercept/method/AbstractFallbackMethodSecurityMetadataSource.java → core/src/main/java/org/springframework/security/access/method/AbstractFallbackMethodSecurityMetadataSource.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.intercept.method;
+package org.springframework.security.access.method;
 
 import java.lang.reflect.Method;
 import java.util.List;

core/src/main/java/org/springframework/security/access/intercept/method/AbstractMethodSecurityMetadataSource.java → core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method;
+package org.springframework.security.access.method;
 
 import org.springframework.security.access.ConfigAttribute;
 

core/src/main/java/org/springframework/security/access/intercept/method/DelegatingMethodSecurityMetadataSource.java → core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.intercept.method;
+package org.springframework.security.access.method;
 
 import java.lang.reflect.Method;
 import java.util.Collection;

core/src/main/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSource.java → core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method;
+package org.springframework.security.access.method;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

core/src/main/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSource.java → core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java

@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method;
+package org.springframework.security.access.method;
 
 import java.lang.reflect.Method;
 import java.util.List;
 
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.intercept.SecurityMetadataSource;
+import org.springframework.security.access.SecurityMetadataSource;
 
 
 /**

core/src/main/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSourceEditor.java → core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSourceEditor.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method;
+package org.springframework.security.access.method;
 
 import java.beans.PropertyEditorSupport;
 import java.util.ArrayList;

core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java

@@ -6,8 +6,8 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.AfterInvocationProvider;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.intercept.AfterInvocationProvider;
 import org.springframework.security.core.Authentication;
 
 /**

core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoter.java

@@ -5,8 +5,8 @@ import java.util.List;
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.core.Authentication;
 
 /**

core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.intercept.method.AbstractMethodSecurityMetadataSource;
+import org.springframework.security.access.method.AbstractMethodSecurityMetadataSource;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -81,7 +81,7 @@ public class PrePostAnnotationSecurityMetadataSource extends AbstractMethodSecur
     }
 
     /**
-     * See {@link org.springframework.security.access.intercept.method.AbstractFallbackMethodSecurityMetadataSource#getAttributes(Method, Class)}
+     * See {@link org.springframework.security.access.method.AbstractFallbackMethodSecurityMetadataSource#getAttributes(Method, Class)}
      * for the logic of this method. The ordering here is slightly different in that we consider method-specific
      * annotations on an interface before class-level ones.
      */

core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java

@@ -21,6 +21,7 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.security.access.AccessDecisionManager;
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.SpringSecurityMessageSource;

core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java

@@ -14,6 +14,7 @@
  */
 package org.springframework.security.access.vote;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AuthorizationServiceException;
 
 import org.aopalliance.intercept.MethodInvocation;

core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java

@@ -17,6 +17,7 @@ package org.springframework.security.access.vote;
 
 import java.util.List;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;

core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java

@@ -17,6 +17,7 @@ package org.springframework.security.access.vote;
 
 import java.util.List;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.authentication.AuthenticationTrustResolver;
 import org.springframework.security.authentication.AuthenticationTrustResolverImpl;

core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java

@@ -17,6 +17,7 @@ package org.springframework.security.access.vote;
 
 import java.util.List;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;

core/src/main/java/org/springframework/security/access/vote/LabelBasedAclVoter.java

@@ -43,7 +43,7 @@ import org.springframework.util.Assert;
  * @author Greg Turnquist
  * @version $Id$
  *
- * @see org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor
+ * @see org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor
  * @deprecated Use new spring-security-acl module instead
  */
 public class LabelBasedAclVoter extends AbstractAclVoter {
@@ -141,7 +141,7 @@ public class LabelBasedAclVoter extends AbstractAclVoter {
      * configuration with the attribute stored in attributeIndicatingLabeledOperation.
      *
      * @see org.springframework.security.access.vote.AbstractAclVoter
-     * @see org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor
+     * @see org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor
      */
     public boolean supports(ConfigAttribute attribute) {
         if (attribute.getAttribute().equals(attributeIndicatingLabeledOperation)) {

core/src/main/java/org/springframework/security/access/vote/RoleVoter.java

@@ -17,6 +17,7 @@ package org.springframework.security.access.vote;
 
 import java.util.List;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;

core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java

@@ -18,6 +18,7 @@ package org.springframework.security.access.vote;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;

core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java

@@ -21,7 +21,7 @@ import org.springframework.security.core.AuthenticationException;
 /**
  * Thrown if an authentication request is rejected because the credentials are not sufficiently trusted.
  * <p>
- * {@link org.springframework.security.access.vote.AccessDecisionVoter}s will typically throw this exception if
+ * {@link org.springframework.security.access.AccessDecisionVoter}s will typically throw this exception if
  * they are dissatisfied with the level of the authentication, such as if performed using a remember-me mechanism or
  * anonymously. The commonly used {@link org.springframework.security.web.ExceptionTranslationFilter} will thus cause
  * the <code>AuthenticationEntryPoint</code> to be called, allowing the principal to authenticate with a stronger

core/src/test/java/org/springframework/security/access/annotation/MethodDefinitionSourceEditorTigerTests.java

@@ -26,9 +26,9 @@ import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.access.annotation.test.Entity;
 import org.springframework.security.access.annotation.test.PersonServiceImpl;
 import org.springframework.security.access.annotation.test.Service;
-import org.springframework.security.access.intercept.method.MapBasedMethodSecurityMetadataSource;
-import org.springframework.security.access.intercept.method.MethodSecurityMetadataSourceEditor;
 import org.springframework.security.access.intercept.method.MockMethodInvocation;
+import org.springframework.security.access.method.MapBasedMethodSecurityMetadataSource;
+import org.springframework.security.access.method.MethodSecurityMetadataSourceEditor;
 
 
 /**

core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java

@@ -10,10 +10,10 @@ import java.util.List;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.expression.method.PreInvocationExpressionAttribute;
 import org.springframework.security.access.prepost.PreInvocationAuthorizationAdviceVoter;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.util.SimpleMethodInvocation;
 

core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java

@@ -20,9 +20,9 @@ import org.jmock.Mockery;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Test;
 import org.springframework.security.access.AccessDecisionManager;
+import org.springframework.security.access.SecurityMetadataSource;
 import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
 import org.springframework.security.access.intercept.RunAsManager;
-import org.springframework.security.access.intercept.SecurityMetadataSource;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.util.SimpleMethodInvocation;
 

core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java

@@ -22,9 +22,9 @@ import junit.framework.TestCase;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.AfterInvocationProvider;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.intercept.AfterInvocationProvider;
 import org.springframework.security.access.intercept.AfterInvocationProviderManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.util.SimpleMethodInvocation;

core/src/test/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityInterceptorTests.java → core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method.aopalliance;
+package org.springframework.security.access.intercept.aopalliance;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -37,8 +37,8 @@ import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.access.intercept.AfterInvocationManager;
 import org.springframework.security.access.intercept.RunAsManager;
 import org.springframework.security.access.intercept.RunAsUserToken;
-import org.springframework.security.access.intercept.method.MethodSecurityMetadataSource;
-import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor;
+import org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor;
+import org.springframework.security.access.method.MethodSecurityMetadataSource;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;

core/src/test/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java → core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java

@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method.aopalliance;
+package org.springframework.security.access.intercept.aopalliance;
 
 import java.lang.reflect.Method;
 
 import junit.framework.TestCase;
 
 import org.springframework.security.TargetObject;
-import org.springframework.security.access.intercept.method.MapBasedMethodSecurityMetadataSource;
-import org.springframework.security.access.intercept.method.MethodSecurityMetadataSourceEditor;
-import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor;
-import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityMetadataSourceAdvisor;
+import org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor;
+import org.springframework.security.access.intercept.aopalliance.MethodSecurityMetadataSourceAdvisor;
+import org.springframework.security.access.method.MapBasedMethodSecurityMetadataSource;
+import org.springframework.security.access.method.MethodSecurityMetadataSourceEditor;
 
 /**
  * Tests {@link MethodSecurityMetadataSourceAdvisor}.

core/src/test/java/org/springframework/security/access/intercept/method/aspectj/AspectJSecurityInterceptorTests.java → core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJSecurityInterceptorTests.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.access.intercept.method.aspectj;
+package org.springframework.security.access.intercept.aspectj;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -30,9 +30,9 @@ import org.springframework.security.TargetObject;
 import org.springframework.security.access.AccessDecisionManager;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.intercept.method.MethodSecurityMetadataSource;
-import org.springframework.security.access.intercept.method.aspectj.AspectJCallback;
-import org.springframework.security.access.intercept.method.aspectj.AspectJSecurityInterceptor;
+import org.springframework.security.access.intercept.aspectj.AspectJCallback;
+import org.springframework.security.access.intercept.aspectj.AspectJSecurityInterceptor;
+import org.springframework.security.access.method.MethodSecurityMetadataSource;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;

core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java

@@ -9,7 +9,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.intercept.method.MapBasedMethodSecurityMetadataSource;
+import org.springframework.security.access.method.MapBasedMethodSecurityMetadataSource;
 
 /**
  * Tests for {@link MapBasedMethodSecurityMetadataSource}.

core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java

@@ -32,9 +32,9 @@ import org.springframework.security.access.AccessDecisionManager;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.intercept.method.MethodInvocationPrivilegeEvaluator;
-import org.springframework.security.access.intercept.method.MethodSecurityMetadataSource;
-import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor;
+import org.springframework.security.access.intercept.MethodInvocationPrivilegeEvaluator;
+import org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor;
+import org.springframework.security.access.method.MethodSecurityMetadataSource;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -42,7 +42,7 @@ import org.springframework.security.util.MethodInvocationUtils;
 
 
 /**
- * Tests {@link org.springframework.security.access.intercept.method.MethodInvocationPrivilegeEvaluator}.
+ * Tests {@link org.springframework.security.access.intercept.MethodInvocationPrivilegeEvaluator}.
  *
  * @author Ben Alex
  * @version $Id$

core/src/test/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSourceEditorTests.java

@@ -28,8 +28,8 @@ import org.springframework.security.OtherTargetObject;
 import org.springframework.security.TargetObject;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.intercept.method.MapBasedMethodSecurityMetadataSource;
-import org.springframework.security.access.intercept.method.MethodSecurityMetadataSourceEditor;
+import org.springframework.security.access.method.MapBasedMethodSecurityMetadataSource;
+import org.springframework.security.access.method.MethodSecurityMetadataSourceEditor;
 
 
 /**

core/src/test/java/org/springframework/security/access/intercept/method/MockMethodSecurityMetadataSource.java

@@ -24,7 +24,7 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.aspectj.lang.JoinPoint;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.intercept.method.MethodSecurityMetadataSource;
+import org.springframework.security.access.method.MethodSecurityMetadataSource;
 
 
 /**

core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java

@@ -17,11 +17,11 @@ package org.springframework.security.access.vote;
 
 import junit.framework.TestCase;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.access.vote.AbstractAccessDecisionManager;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.access.vote.RoleVoter;
 import org.springframework.security.core.Authentication;
 

core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java

@@ -21,9 +21,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.access.vote.AffirmativeBased;
 import org.springframework.security.access.vote.RoleVoter;
 import org.springframework.security.authentication.TestingAuthenticationToken;

core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java

@@ -19,9 +19,9 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.access.vote.AuthenticatedVoter;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.RememberMeAuthenticationToken;

core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java

@@ -21,10 +21,10 @@ import java.util.List;
 import java.util.Vector;
 
 import org.junit.Test;
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.access.vote.ConsensusBased;
 import org.springframework.security.access.vote.RoleVoter;
 import org.springframework.security.authentication.TestingAuthenticationToken;

core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java

@@ -15,8 +15,8 @@
 
 package org.springframework.security.access.vote;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.core.Authentication;
 
 import java.util.Iterator;

core/src/test/java/org/springframework/security/access/vote/DenyVoter.java

@@ -15,8 +15,8 @@
 
 package org.springframework.security.access.vote;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.core.Authentication;
 
 import java.util.Iterator;

core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java

@@ -20,10 +20,10 @@ import java.util.Vector;
 
 import junit.framework.TestCase;
 
+import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.access.vote.RoleVoter;
 import org.springframework.security.access.vote.UnanimousBased;
 import org.springframework.security.authentication.TestingAuthenticationToken;

core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml

@@ -60,7 +60,7 @@
     </bean>
 
     <bean id="securityInteceptor"
-        class="org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor">
+        class="org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor">
       <property name="validateConfigAttributes"><value>false</value></property>
       <property name="authenticationManager"><ref bean="authenticationManager"/></property>
       <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>

itest/context/src/test/resources/sec-936-app-context.xml

@@ -25,7 +25,7 @@
         </property>
     </bean>
 
-    <bean id="securityInterceptor" class="org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor">
+    <bean id="securityInterceptor" class="org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor">
         <property name="validateConfigAttributes" value="true"/>
         <property name="rejectPublicInvocations" value="true"/>
         <property name="authenticationManager" ref="authenticationManager"/>