From 9efb5a7007569dd30eca7ca192ec8b79050df89b Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sun, 12 Apr 2009 12:23:23 +0000 Subject: [PATCH] SEC-1132: Moved access-control/authorization specific code to org.sf.security.access package. Created provisioning package for user management classes to remove cyclical deps. Some other moving of classes to remove code tangles. Restructuring of portlet module under org.sf.security.portlet --- .../security/acls/AclPermissionEvaluator.java | 4 +- .../afterinvocation/AbstractAclProvider.java | 4 +- ...InvocationCollectionFilteringProvider.java | 6 +-- .../AclEntryAfterInvocationProvider.java | 4 +- .../domain/AclAuthorizationStrategyImpl.java | 2 +- .../security/acls/vote/AclEntryVoter.java | 8 ++-- .../AclImplementationSecurityCheckTests.java | 2 +- .../CasAuthenticationProvider.java | 2 +- .../security/cas/web/CasProcessingFilter.java | 2 +- .../security/config/ConfigUtils.java | 12 +++--- ...cationProviderBeanDefinitionDecorator.java | 2 +- .../config/FilterChainProxyPostProcessor.java | 2 +- ...ityMetadataSourceBeanDefinitionParser.java | 2 +- ...balMethodSecurityBeanDefinitionParser.java | 34 +++++++-------- .../HttpSecurityBeanDefinitionParser.java | 12 +++--- ...terceptMethodsBeanDefinitionDecorator.java | 2 +- .../JdbcUserServiceBeanDefinitionParser.java | 12 +++--- ...ethodSecurityInterceptorPostProcessor.java | 4 +- .../OrderedFilterBeanDefinitionDecorator.java | 2 +- ...nProviderBeanDefinitionDecoratorTests.java | 4 +- ...tadataSourceBeanDefinitionParserTests.java | 6 +-- ...thodSecurityBeanDefinitionParserTests.java | 42 +++++++++---------- ...HttpSecurityBeanDefinitionParserTests.java | 8 ++-- ...ptMethodsBeanDefinitionDecoratorTests.java | 2 +- ...cUserServiceBeanDefinitionParserTests.java | 9 +++- ...tationDrivenBeanDefinitionParserTests.java | 6 +-- .../config/MockAfterInvocationProvider.java | 6 +-- ...tationDrivenBeanDefinitionParserTests.java | 6 +-- ...SecurityInterceptorWithAopConfigTests.java | 6 +-- .../security/GrantedAuthority.java | 1 + .../InsufficientAuthenticationException.java | 2 +- .../security/SpringSecurityException.java | 6 ++- .../AbstractAuthorizationEvent.java | 4 +- .../{ => access}/AccessDecisionManager.java | 5 ++- .../{ => access}/AccessDeniedException.java | 5 ++- ...uthenticationCredentialsNotFoundEvent.java | 3 +- .../AuthorizationFailureEvent.java | 8 ++-- .../AuthorizationServiceException.java | 12 +++--- .../AuthorizedEvent.java | 3 +- .../{ => access}/ConfigAttribute.java | 6 ++- .../{ => access}/ConfigAttributeEditor.java | 2 +- .../LoggerListener.java | 2 +- .../PublicInvocationEvent.java | 2 +- .../security/{ => access}/SecurityConfig.java | 2 +- .../Jsr250MethodSecurityMetadataSource.java | 6 +-- .../annotation/Jsr250SecurityConfig.java | 4 +- .../{ => access}/annotation/Jsr250Voter.java | 6 +-- .../{ => access}/annotation/Secured.java | 2 +- .../SecuredMethodSecurityMetadataSource.java | 8 ++-- .../Attributes2GrantedAuthoritiesMapper.java | 2 +- ...edAttributes2GrantedAuthoritiesMapper.java | 4 +- .../MappableAttributesRetriever.java | 2 +- ...leAttributes2GrantedAuthoritiesMapper.java | 2 +- .../SimpleMappableAttributesRetriever.java | 4 +- .../XmlMappableAttributesRetriever.java | 2 +- .../expression/ExpressionUtils.java | 2 +- .../MethodSecurityExpressionHandler.java | 2 +- .../expression/PermissionEvaluator.java | 2 +- .../expression/annotation/PostAuthorize.java | 2 +- .../expression/annotation/PostFilter.java | 2 +- .../expression/annotation/PreAuthorize.java | 2 +- .../expression/annotation/PreFilter.java | 2 +- ...tExpressionBasedMethodConfigAttribute.java | 4 +- ...nnotationMethodSecurityMetadataSource.java | 18 ++++---- ...thodExpressionAfterInvocationProvider.java | 14 +++---- .../method/MethodExpressionVoter.java | 12 +++--- .../PostInvocationExpressionAttribute.java | 2 +- .../PreInvocationExpressionAttribute.java | 2 +- .../AbstractSecurityExpressionHandler.java | 5 +++ ...efaultMethodSecurityExpressionHandler.java | 8 ++-- .../support/DenyAllPermissionEvaluator.java | 4 +- .../MethodSecurityEvaluationContext.java | 2 +- .../support/MethodSecurityExpressionRoot.java | 4 +- .../support/SecurityExpressionRoot.java | 2 +- .../CycleInRoleHierarchyException.java | 2 +- .../hierarchicalroles/RoleHierarchy.java | 2 +- .../hierarchicalroles/RoleHierarchyImpl.java | 2 +- .../UserDetailsServiceWrapper.java | 2 +- .../hierarchicalroles/UserDetailsWrapper.java | 2 +- .../AbstractSecurityInterceptor.java | 19 ++++----- .../intercept}/AfterInvocationManager.java | 6 ++- .../intercept}/AfterInvocationProvider.java | 6 +-- .../AfterInvocationProviderManager.java | 7 ++-- .../intercept/InterceptorStatusToken.java | 6 +-- .../intercept}/NullRunAsManager.java | 7 ++-- .../RunAsImplAuthenticationProvider.java | 2 +- .../{ => access/intercept}/RunAsManager.java | 7 +++- .../intercept}/RunAsManagerImpl.java | 5 +-- .../intercept}/RunAsUserToken.java | 2 +- .../intercept/SecurityMetadataSource.java | 4 +- ...tFallbackMethodSecurityMetadataSource.java | 4 +- .../AbstractMethodSecurityMetadataSource.java | 4 +- ...elegatingMethodSecurityMetadataSource.java | 4 +- .../MapBasedMethodSecurityMetadataSource.java | 4 +- .../MethodInvocationPrivilegeEvaluator.java | 10 ++--- .../method/MethodSecurityMetadataSource.java | 6 +-- .../MethodSecurityMetadataSourceEditor.java | 6 +-- .../method/ProtectPointcutPostProcessor.java | 6 +-- .../MethodSecurityInterceptor.java | 10 ++--- .../MethodSecurityMetadataSourceAdvisor.java | 4 +- .../intercept/method/aopalliance/package.html | 0 .../aspectj/AspectJAnnotationCallback.java | 2 +- .../AspectJAnnotationSecurityInterceptor.java | 10 ++--- .../method/aspectj/AspectJCallback.java | 2 +- .../aspectj/AspectJSecurityInterceptor.java | 10 ++--- .../intercept/method/aspectj/package.html | 0 .../intercept/method/package.html | 0 .../{ => access}/intercept/package.html | 4 +- .../security/access/package.html | 11 +++++ .../vote/AbstractAccessDecisionManager.java | 8 ++-- .../{ => access}/vote/AbstractAclVoter.java | 4 +- .../vote/AccessDecisionVoter.java | 8 ++-- .../{ => access}/vote/AffirmativeBased.java | 8 ++-- .../{ => access}/vote/AuthenticatedVoter.java | 4 +- .../{ => access}/vote/ConsensusBased.java | 8 ++-- .../InterfaceBasedLabelParameterStrategy.java | 2 +- .../{ => access}/vote/LabelBasedAclVoter.java | 16 +++---- .../vote/LabelParameterStrategy.java | 2 +- .../{ => access}/vote/LabeledData.java | 2 +- .../{ => access}/vote/RoleHierarchyVoter.java | 4 +- .../security/{ => access}/vote/RoleVoter.java | 4 +- .../{ => access}/vote/UnanimousBased.java | 8 ++-- .../security/{ => access}/vote/package.html | 0 .../security/afterinvocation/package.html | 5 --- .../security/event/authorization/package.html | 5 --- .../AbstractSecurityExpressionHandler.java | 5 --- .../AccountStatusUserDetailsChecker.java | 2 +- ...reAuthenticatedAuthenticationProvider.java | 2 +- .../GroupManager.java | 2 +- .../JdbcUserDetailsManager.java | 7 ++-- .../UserDetailsManager.java | 5 ++- .../security/provisioning/package.html | 6 +++ .../security/runas/package.html | 5 --- .../userdetails/UserDetailsChecker.java | 16 ++++--- .../security/SecurityConfigTests.java | 2 + ...ticationCredentialsNotFoundEventTests.java | 5 ++- .../AuthorizationFailureEventTests.java | 7 ++-- .../AuthorizedEventTests.java | 5 ++- .../annotation/BusinessService.java | 5 ++- .../annotation/BusinessServiceImpl.java | 4 +- .../{ => access}/annotation/Department.java | 2 +- .../annotation/DepartmentService.java | 4 +- .../annotation/DepartmentServiceImpl.java | 4 +- .../{ => access}/annotation/Entity.java | 2 +- ...xpressionProtectedBusinessServiceImpl.java | 6 +-- .../annotation/Jsr250BusinessServiceImpl.java | 2 +- .../Jsr250MethodDefinitionSourceTests.java | 5 ++- ...ethodDefinitionSourceEditorTigerTests.java | 30 ++++++------- .../SecuredMethodDefinitionSourceTests.java | 9 ++-- .../{ => access}/annotation/test/Entity.java | 2 +- .../annotation/test/Organisation.java | 2 +- .../annotation/test/OrganisationService.java | 2 +- .../test/OrganisationServiceImpl.java | 2 +- .../{ => access}/annotation/test/Person.java | 2 +- .../annotation/test/PersonService.java | 2 +- .../annotation/test/PersonServiceImpl.java | 2 +- .../{ => access}/annotation/test/Service.java | 2 +- .../annotation/test/ServiceImpl.java | 2 +- ...tributes2GrantedAuthoritiesMapperTest.java | 4 +- .../SimpleMappableRolesRetrieverTests.java | 6 +-- ...leRoles2GrantedAuthoritiesMapperTests.java | 3 +- .../XmlMappableRolesRetrieverTests.java | 4 +- ...AnnotationMethodDefinitionSourceTests.java | 20 ++++----- .../method/MethodExpressionVoterTests.java | 12 +++--- .../expression/method/SecurityRules.java | 2 +- .../MethodSecurityExpressionRootTests.java | 7 ++-- .../HierarchicalRolesTestHelper.java | 2 +- .../RoleHierarchyImplTests.java | 4 +- .../hierarchicalroles/TestHelperTests.java | 2 +- .../UserDetailsServiceWrapperTests.java | 4 +- .../UserDetailsWrapperTests.java | 4 +- .../AbstractSecurityInterceptorTests.java | 9 ++-- .../AfterInvocationProviderManagerTests.java | 10 +++-- .../InterceptorStatusTokenTests.java | 7 ++-- .../intercept}/NullRunAsManagerTests.java | 19 ++------- .../RunAsImplAuthenticationProviderTests.java | 4 +- .../intercept}/RunAsManagerImplTests.java | 8 ++-- .../intercept}/RunAsUserTokenTests.java | 3 +- ...asedMethodSecurityMetadataSourceTests.java | 7 ++-- ...thodInvocationPrivilegeEvaluatorTests.java | 16 +++---- ...thodSecurityMetadataSourceEditorTests.java | 8 ++-- .../method/MockMethodInvocation.java | 2 +- .../MockMethodSecurityMetadataSource.java | 7 ++-- .../MethodSecurityInterceptorTests.java | 21 +++++----- ...hodSecurityMetadataSourceAdvisorTests.java | 8 ++-- .../AspectJSecurityInterceptorTests.java | 12 +++--- .../AbstractAccessDecisionManagerTests.java | 11 +++-- .../vote/AbstractAclVoterTests.java | 5 ++- .../vote/AffirmativeBasedTests.java | 9 ++-- .../vote/AuthenticatedVoterTests.java | 8 ++-- .../vote/ConsensusBasedTests.java | 11 +++-- .../{ => access}/vote/DenyAgainVoter.java | 5 ++- .../security/{ => access}/vote/DenyVoter.java | 5 ++- .../vote/LabelBasedAclVoterTests.java | 4 +- .../vote/RoleHierarchyVoterTests.java | 7 ++-- .../{ => access}/vote/SampleBlockOfData.java | 4 +- .../{ => access}/vote/SampleService.java | 2 +- .../{ => access}/vote/SampleServiceImpl.java | 2 +- .../{ => access}/vote/SomeDomainObject.java | 2 +- .../vote/SomeDomainObjectManager.java | 2 +- .../vote/UnanimousBasedTests.java | 11 +++-- .../JdbcUserDetailsManagerTests.java | 5 ++- .../labelBasedSecurityApplicationContext.xml | 14 +++---- .../SEC936ApplicationContextTests.java | 2 +- .../filter-chain-performance-app-context.xml | 4 +- .../test/resources/sec-936-app-context.xml | 8 ++-- .../userdetails/LdapUserDetailsManager.java | 2 +- ntlm/applicationContext.xml | 6 +-- .../ui/ntlm/NtlmProcessingFilter.java | 2 +- .../OpenIDAuthenticationProcessingFilter.java | 2 +- .../portlet/PortletAuthenticationDetails.java | 2 +- ...PreAuthenticatedAuthenticationDetails.java | 2 +- ...henticatedAuthenticationDetailsSource.java | 2 +- .../portlet/PortletProcessingInterceptor.java | 2 +- ...tSessionContextIntegrationInterceptor.java | 7 +++- .../security/{ui => }/portlet/package.html | 0 .../PortletProcessingInterceptorTests.java | 4 +- ...ionContextIntegrationInterceptorTests.java | 7 +++- .../portlet/PortletTestUtils.java | 4 +- .../java/sample/contact/ContactManager.java | 4 +- .../sample/contact/SecureIndexController.java | 2 +- .../WEB-INF/applicationContext-security.xml | 2 +- .../applicationContext-contacts-test.xml | 2 +- .../applicationContext-dms-secure.xml | 10 ++--- .../sample/SecurityContextPortlet.java | 8 ++-- .../portlet/securityContextPortlet.xml | 8 ++-- .../WEB-INF/applicationContext-security.xml | 6 +-- samples/runall.sh | 2 +- .../src/main/java/bigbank/BankService.java | 2 +- .../security/web/AccessDeniedHandler.java | 2 +- .../security/web/AccessDeniedHandlerImpl.java | 2 +- .../web/ExceptionTranslationFilter.java | 5 +-- .../web/{util => }/FilterChainOrder.java | 2 +- .../security/web/FilterChainProxy.java | 1 - .../web/{intercept => }/FilterInvocation.java | 2 +- .../web/SessionFixationProtectionFilter.java | 1 - .../AnonymousProcessingFilter.java | 2 +- .../AuthenticationProcessingFilter.java | 2 +- .../DefaultLoginPageGeneratingFilter.java | 2 +- ...eaderPreAuthenticatedProcessingFilter.java | 2 +- ...henticatedAuthenticationDetailsSource.java | 6 +-- ...ticatedWebAuthenticationDetailsSource.java | 2 +- .../WebXmlMappableAttributesRetriever.java | 2 +- ...henticatedAuthenticationDetailsSource.java | 4 +- .../X509PreAuthenticatedProcessingFilter.java | 2 +- .../AbstractRememberMeServices.java | 2 +- .../RememberMeProcessingFilter.java | 2 +- .../SwitchUserProcessingFilter.java | 4 +- .../www/BasicProcessingFilter.java | 2 +- .../www/DigestProcessingFilter.java | 2 +- .../concurrent/ConcurrentSessionFilter.java | 2 +- .../HttpSessionContextIntegrationFilter.java | 2 +- .../SecurityContextPersistenceFilter.java | 2 +- .../DefaultWebSecurityExpressionHandler.java | 4 +- ...ilterInvocationSecurityMetadataSource.java | 2 +- .../WebExpressionConfigAttribute.java | 2 +- .../web/expression/WebExpressionVoter.java | 8 ++-- .../WebSecurityExpressionHandler.java | 2 +- .../expression/WebSecurityExpressionRoot.java | 4 +- ...ilterInvocationSecurityMetadataSource.java | 3 +- ...ilterInvocationSecurityMetadataSource.java | 3 +- .../intercept/FilterSecurityInterceptor.java | 9 ++-- .../WebInvocationPrivilegeEvaluator.java | 7 ++-- .../security/web/logout/LogoutFilter.java | 2 +- .../web/savedrequest/SavedRequest.java | 6 ++- .../securechannel/ChannelDecisionManager.java | 4 +- .../ChannelDecisionManagerImpl.java | 4 +- .../ChannelProcessingFilter.java | 6 +-- .../web/securechannel/ChannelProcessor.java | 4 +- .../InsecureChannelProcessor.java | 4 +- .../securechannel/SecureChannelProcessor.java | 4 +- .../web/util/FilterInvocationUtils.java | 2 +- .../security/web/util/UrlUtils.java | 16 ++----- ...curityContextHolderAwareRequestFilter.java | 2 +- .../web/ExceptionTranslationFilterTests.java | 2 +- ...DefaultLoginPageGeneratingFilterTests.java | 2 +- ...PreAuthenticatedProcessingFilterTests.java | 2 +- ...edWebAuthenticationDetailsSourceTests.java | 8 ++-- ...SecurityContextPersistenceFilterTests.java | 2 +- .../WebSecurityExpressionRootTests.java | 2 +- ...InvocationSecurityMetadataSourceTests.java | 6 +-- .../web/intercept/FilterInvocationTests.java | 2 +- .../FilterSecurityInterceptorTests.java | 10 ++--- .../WebInvocationPrivilegeEvaluatorTests.java | 8 ++-- .../ChannelDecisionManagerImplTests.java | 6 +-- .../ChannelProcessingFilterTests.java | 6 +-- .../InsecureChannelProcessorTests.java | 4 +- .../SecureChannelProcessorTests.java | 4 +- 288 files changed, 773 insertions(+), 705 deletions(-) rename core/src/main/java/org/springframework/security/{event/authorization => access}/AbstractAuthorizationEvent.java (95%) rename core/src/main/java/org/springframework/security/{ => access}/AccessDecisionManager.java (94%) rename core/src/main/java/org/springframework/security/{ => access}/AccessDeniedException.java (90%) rename core/src/main/java/org/springframework/security/{event/authorization => access}/AuthenticationCredentialsNotFoundEvent.java (95%) rename core/src/main/java/org/springframework/security/{event/authorization => access}/AuthorizationFailureEvent.java (89%) rename core/src/main/java/org/springframework/security/{ => access}/AuthorizationServiceException.java (86%) rename core/src/main/java/org/springframework/security/{event/authorization => access}/AuthorizedEvent.java (95%) rename core/src/main/java/org/springframework/security/{ => access}/ConfigAttribute.java (91%) rename core/src/main/java/org/springframework/security/{ => access}/ConfigAttributeEditor.java (97%) rename core/src/main/java/org/springframework/security/{event/authorization => access}/LoggerListener.java (98%) rename core/src/main/java/org/springframework/security/{event/authorization => access}/PublicInvocationEvent.java (96%) rename core/src/main/java/org/springframework/security/{ => access}/SecurityConfig.java (98%) rename core/src/main/java/org/springframework/security/{ => access}/annotation/Jsr250MethodSecurityMetadataSource.java (92%) rename core/src/main/java/org/springframework/security/{ => access}/annotation/Jsr250SecurityConfig.java (83%) rename core/src/main/java/org/springframework/security/{ => access}/annotation/Jsr250Voter.java (91%) rename core/src/main/java/org/springframework/security/{ => access}/annotation/Secured.java (97%) rename core/src/main/java/org/springframework/security/{ => access}/annotation/SecuredMethodSecurityMetadataSource.java (87%) rename core/src/main/java/org/springframework/security/{ => access}/authoritymapping/Attributes2GrantedAuthoritiesMapper.java (91%) rename core/src/main/java/org/springframework/security/{ => access}/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java (94%) rename core/src/main/java/org/springframework/security/{ => access}/authoritymapping/MappableAttributesRetriever.java (87%) rename core/src/main/java/org/springframework/security/{ => access}/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java (95%) rename core/src/main/java/org/springframework/security/{ => access}/authoritymapping/SimpleMappableAttributesRetriever.java (80%) rename core/src/main/java/org/springframework/security/{ => access}/authoritymapping/XmlMappableAttributesRetriever.java (96%) rename core/src/main/java/org/springframework/security/{ => access}/expression/ExpressionUtils.java (90%) rename core/src/main/java/org/springframework/security/{ => access}/expression/MethodSecurityExpressionHandler.java (97%) rename core/src/main/java/org/springframework/security/{ => access}/expression/PermissionEvaluator.java (96%) rename core/src/main/java/org/springframework/security/{ => access}/expression/annotation/PostAuthorize.java (91%) rename core/src/main/java/org/springframework/security/{ => access}/expression/annotation/PostFilter.java (91%) rename core/src/main/java/org/springframework/security/{ => access}/expression/annotation/PreAuthorize.java (91%) rename core/src/main/java/org/springframework/security/{ => access}/expression/annotation/PreFilter.java (96%) rename core/src/main/java/org/springframework/security/{ => access}/expression/method/AbstractExpressionBasedMethodConfigAttribute.java (94%) rename core/src/main/java/org/springframework/security/{ => access}/expression/method/ExpressionAnnotationMethodSecurityMetadataSource.java (89%) rename core/src/main/java/org/springframework/security/{ => access}/expression/method/MethodExpressionAfterInvocationProvider.java (85%) rename core/src/main/java/org/springframework/security/{ => access}/expression/method/MethodExpressionVoter.java (89%) rename core/src/main/java/org/springframework/security/{ => access}/expression/method/PostInvocationExpressionAttribute.java (90%) rename core/src/main/java/org/springframework/security/{ => access}/expression/method/PreInvocationExpressionAttribute.java (94%) create mode 100644 core/src/main/java/org/springframework/security/access/expression/support/AbstractSecurityExpressionHandler.java rename core/src/main/java/org/springframework/security/{ => access}/expression/support/DefaultMethodSecurityExpressionHandler.java (94%) rename core/src/main/java/org/springframework/security/{ => access}/expression/support/DenyAllPermissionEvaluator.java (89%) rename core/src/main/java/org/springframework/security/{ => access}/expression/support/MethodSecurityEvaluationContext.java (97%) rename core/src/main/java/org/springframework/security/{ => access}/expression/support/MethodSecurityExpressionRoot.java (91%) rename core/src/main/java/org/springframework/security/{ => access}/expression/support/SecurityExpressionRoot.java (97%) rename core/src/main/java/org/springframework/security/{userdetails => access}/hierarchicalroles/CycleInRoleHierarchyException.java (90%) rename core/src/main/java/org/springframework/security/{userdetails => access}/hierarchicalroles/RoleHierarchy.java (92%) rename core/src/main/java/org/springframework/security/{userdetails => access}/hierarchicalroles/RoleHierarchyImpl.java (96%) rename core/src/main/java/org/springframework/security/{userdetails => access}/hierarchicalroles/UserDetailsServiceWrapper.java (94%) rename core/src/main/java/org/springframework/security/{userdetails => access}/hierarchicalroles/UserDetailsWrapper.java (94%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/AbstractSecurityInterceptor.java (96%) rename core/src/main/java/org/springframework/security/{ => access/intercept}/AfterInvocationManager.java (94%) rename core/src/main/java/org/springframework/security/{afterinvocation => access/intercept}/AfterInvocationProvider.java (92%) rename core/src/main/java/org/springframework/security/{afterinvocation => access/intercept}/AfterInvocationProviderManager.java (95%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/InterceptorStatusToken.java (89%) rename core/src/main/java/org/springframework/security/{runas => access/intercept}/NullRunAsManager.java (86%) rename core/src/main/java/org/springframework/security/{runas => access/intercept}/RunAsImplAuthenticationProvider.java (98%) rename core/src/main/java/org/springframework/security/{ => access/intercept}/RunAsManager.java (94%) rename core/src/main/java/org/springframework/security/{runas => access/intercept}/RunAsManagerImpl.java (97%) rename core/src/main/java/org/springframework/security/{runas => access/intercept}/RunAsUserToken.java (98%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/SecurityMetadataSource.java (95%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/AbstractFallbackMethodSecurityMetadataSource.java (97%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/AbstractMethodSecurityMetadataSource.java (95%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/DelegatingMethodSecurityMetadataSource.java (97%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/MapBasedMethodSecurityMetadataSource.java (98%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/MethodInvocationPrivilegeEvaluator.java (90%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/MethodSecurityMetadataSource.java (83%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/MethodSecurityMetadataSourceEditor.java (93%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/ProtectPointcutPostProcessor.java (96%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/aopalliance/MethodSecurityInterceptor.java (87%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisor.java (97%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/aopalliance/package.html (100%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/aspectj/AspectJAnnotationCallback.java (84%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/aspectj/AspectJAnnotationSecurityInterceptor.java (82%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/aspectj/AspectJCallback.java (93%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/aspectj/AspectJSecurityInterceptor.java (88%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/aspectj/package.html (100%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/method/package.html (100%) rename core/src/main/java/org/springframework/security/{ => access}/intercept/package.html (87%) create mode 100644 core/src/main/java/org/springframework/security/access/package.html rename core/src/main/java/org/springframework/security/{ => access}/vote/AbstractAccessDecisionManager.java (94%) rename core/src/main/java/org/springframework/security/{ => access}/vote/AbstractAclVoter.java (96%) rename core/src/main/java/org/springframework/security/{ => access}/vote/AccessDecisionVoter.java (94%) rename core/src/main/java/org/springframework/security/{ => access}/vote/AffirmativeBased.java (92%) rename core/src/main/java/org/springframework/security/{ => access}/vote/AuthenticatedVoter.java (97%) rename core/src/main/java/org/springframework/security/{ => access}/vote/ConsensusBased.java (94%) rename core/src/main/java/org/springframework/security/{ => access}/vote/InterfaceBasedLabelParameterStrategy.java (98%) rename core/src/main/java/org/springframework/security/{ => access}/vote/LabelBasedAclVoter.java (94%) rename core/src/main/java/org/springframework/security/{ => access}/vote/LabelParameterStrategy.java (97%) rename core/src/main/java/org/springframework/security/{ => access}/vote/LabeledData.java (96%) rename core/src/main/java/org/springframework/security/{ => access}/vote/RoleHierarchyVoter.java (88%) rename core/src/main/java/org/springframework/security/{ => access}/vote/RoleVoter.java (97%) rename core/src/main/java/org/springframework/security/{ => access}/vote/UnanimousBased.java (93%) rename core/src/main/java/org/springframework/security/{ => access}/vote/package.html (100%) delete mode 100644 core/src/main/java/org/springframework/security/afterinvocation/package.html delete mode 100644 core/src/main/java/org/springframework/security/event/authorization/package.html delete mode 100644 core/src/main/java/org/springframework/security/expression/support/AbstractSecurityExpressionHandler.java rename core/src/main/java/org/springframework/security/{userdetails/checker => providers}/AccountStatusUserDetailsChecker.java (96%) rename core/src/main/java/org/springframework/security/{userdetails => provisioning}/GroupManager.java (98%) rename core/src/main/java/org/springframework/security/{userdetails/jdbc => provisioning}/JdbcUserDetailsManager.java (98%) rename core/src/main/java/org/springframework/security/{userdetails => provisioning}/UserDetailsManager.java (83%) create mode 100644 core/src/main/java/org/springframework/security/provisioning/package.html delete mode 100644 core/src/main/java/org/springframework/security/runas/package.html rename core/src/test/java/org/springframework/security/{event/authorization => access}/AuthenticationCredentialsNotFoundEventTests.java (90%) rename core/src/test/java/org/springframework/security/{event/authorization => access}/AuthorizationFailureEventTests.java (89%) rename core/src/test/java/org/springframework/security/{event/authorization => access}/AuthorizedEventTests.java (90%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/BusinessService.java (89%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/BusinessServiceImpl.java (89%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/Department.java (90%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/DepartmentService.java (59%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/DepartmentServiceImpl.java (70%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/Entity.java (73%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/ExpressionProtectedBusinessServiceImpl.java (81%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/Jsr250BusinessServiceImpl.java (94%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/Jsr250MethodDefinitionSourceTests.java (94%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/MethodDefinitionSourceEditorTigerTests.java (67%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/SecuredMethodDefinitionSourceTests.java (92%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/test/Entity.java (96%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/test/Organisation.java (95%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/test/OrganisationService.java (93%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/test/OrganisationServiceImpl.java (93%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/test/Person.java (95%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/test/PersonService.java (93%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/test/PersonServiceImpl.java (94%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/test/Service.java (94%) rename core/src/test/java/org/springframework/security/{ => access}/annotation/test/ServiceImpl.java (95%) rename core/src/test/java/org/springframework/security/{ => access}/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java (94%) rename core/src/test/java/org/springframework/security/{ => access}/authoritymapping/SimpleMappableRolesRetrieverTests.java (84%) rename core/src/test/java/org/springframework/security/{ => access}/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java (94%) rename core/src/test/java/org/springframework/security/{ => access}/authoritymapping/XmlMappableRolesRetrieverTests.java (93%) rename core/src/test/java/org/springframework/security/{ => access}/expression/method/ExpressionAnnotationMethodDefinitionSourceTests.java (90%) rename core/src/test/java/org/springframework/security/{ => access}/expression/method/MethodExpressionVoterTests.java (92%) rename core/src/test/java/org/springframework/security/{ => access}/expression/method/SecurityRules.java (79%) rename core/src/test/java/org/springframework/security/{ => access}/expression/support/MethodSecurityExpressionRootTests.java (93%) rename core/src/test/java/org/springframework/security/{userdetails => access}/hierarchicalroles/HierarchicalRolesTestHelper.java (92%) rename core/src/test/java/org/springframework/security/{userdetails => access}/hierarchicalroles/RoleHierarchyImplTests.java (94%) rename core/src/test/java/org/springframework/security/{userdetails => access}/hierarchicalroles/TestHelperTests.java (95%) rename core/src/test/java/org/springframework/security/{userdetails => access}/hierarchicalroles/UserDetailsServiceWrapperTests.java (92%) rename core/src/test/java/org/springframework/security/{userdetails => access}/hierarchicalroles/UserDetailsWrapperTests.java (91%) rename core/src/test/java/org/springframework/security/{ => access}/intercept/AbstractSecurityInterceptorTests.java (92%) rename core/src/test/java/org/springframework/security/{afterinvocation => access/intercept}/AfterInvocationProviderManagerTests.java (94%) rename core/src/test/java/org/springframework/security/{ => access}/intercept/InterceptorStatusTokenTests.java (86%) rename core/src/test/java/org/springframework/security/{runas => access/intercept}/NullRunAsManagerTests.java (75%) rename core/src/test/java/org/springframework/security/{runas => access/intercept}/RunAsImplAuthenticationProviderTests.java (95%) rename core/src/test/java/org/springframework/security/{runas => access/intercept}/RunAsManagerImplTests.java (94%) rename core/src/test/java/org/springframework/security/{runas => access/intercept}/RunAsUserTokenTests.java (96%) rename core/src/test/java/org/springframework/security/{ => access}/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java (86%) rename core/src/test/java/org/springframework/security/{ => access}/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java (87%) rename core/src/test/java/org/springframework/security/{ => access}/intercept/method/MethodSecurityMetadataSourceEditorTests.java (96%) rename core/src/test/java/org/springframework/security/{ => access}/intercept/method/MockMethodInvocation.java (93%) rename core/src/test/java/org/springframework/security/{ => access}/intercept/method/MockMethodSecurityMetadataSource.java (90%) rename core/src/test/java/org/springframework/security/{ => access}/intercept/method/aopalliance/MethodSecurityInterceptorTests.java (93%) rename core/src/test/java/org/springframework/security/{ => access}/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java (89%) rename core/src/test/java/org/springframework/security/{ => access}/intercept/method/aspectj/AspectJSecurityInterceptorTests.java (88%) rename core/src/test/java/org/springframework/security/{ => access}/vote/AbstractAccessDecisionManagerTests.java (92%) rename core/src/test/java/org/springframework/security/{ => access}/vote/AbstractAclVoterTests.java (93%) rename core/src/test/java/org/springframework/security/{ => access}/vote/AffirmativeBasedTests.java (91%) rename core/src/test/java/org/springframework/security/{ => access}/vote/AuthenticatedVoterTests.java (93%) rename core/src/test/java/org/springframework/security/{ => access}/vote/ConsensusBasedTests.java (91%) rename core/src/test/java/org/springframework/security/{ => access}/vote/DenyAgainVoter.java (91%) rename core/src/test/java/org/springframework/security/{ => access}/vote/DenyVoter.java (91%) rename core/src/test/java/org/springframework/security/{ => access}/vote/LabelBasedAclVoterTests.java (98%) rename core/src/test/java/org/springframework/security/{ => access}/vote/RoleHierarchyVoterTests.java (74%) rename core/src/test/java/org/springframework/security/{ => access}/vote/SampleBlockOfData.java (94%) rename core/src/test/java/org/springframework/security/{ => access}/vote/SampleService.java (95%) rename core/src/test/java/org/springframework/security/{ => access}/vote/SampleServiceImpl.java (98%) rename core/src/test/java/org/springframework/security/{ => access}/vote/SomeDomainObject.java (96%) rename core/src/test/java/org/springframework/security/{ => access}/vote/SomeDomainObjectManager.java (95%) rename core/src/test/java/org/springframework/security/{ => access}/vote/UnanimousBasedTests.java (93%) rename core/src/test/java/org/springframework/security/{userdetails/jdbc => provisioning}/JdbcUserDetailsManagerTests.java (98%) rename portlet/src/main/java/org/springframework/security/{ui => }/portlet/PortletAuthenticationDetails.java (95%) rename portlet/src/main/java/org/springframework/security/{ui => }/portlet/PortletPreAuthenticatedAuthenticationDetails.java (96%) rename portlet/src/main/java/org/springframework/security/{ui => }/portlet/PortletPreAuthenticatedAuthenticationDetailsSource.java (94%) rename portlet/src/main/java/org/springframework/security/{ui => }/portlet/PortletProcessingInterceptor.java (99%) rename portlet/src/main/java/org/springframework/security/{context => portlet}/PortletSessionContextIntegrationInterceptor.java (98%) rename portlet/src/main/java/org/springframework/security/{ui => }/portlet/package.html (100%) rename portlet/src/test/java/org/springframework/security/{ui => }/portlet/PortletProcessingInterceptorTests.java (99%) rename portlet/src/test/java/org/springframework/security/{context => portlet}/PortletSessionContextIntegrationInterceptorTests.java (98%) rename portlet/src/test/java/org/springframework/security/{providers => }/portlet/PortletTestUtils.java (97%) rename web/src/main/java/org/springframework/security/web/{util => }/FilterChainOrder.java (99%) rename web/src/main/java/org/springframework/security/web/{intercept => }/FilterInvocation.java (98%) diff --git a/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java b/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java index 8504800228..ae5d88c331 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java +++ b/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java @@ -7,6 +7,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.security.Authentication; +import org.springframework.security.access.expression.PermissionEvaluator; import org.springframework.security.acls.domain.BasePermission; import org.springframework.security.acls.objectidentity.ObjectIdentity; import org.springframework.security.acls.objectidentity.ObjectIdentityGenerator; @@ -15,12 +16,11 @@ import org.springframework.security.acls.objectidentity.ObjectIdentityRetrievalS import org.springframework.security.acls.sid.Sid; import org.springframework.security.acls.sid.SidRetrievalStrategy; import org.springframework.security.acls.sid.SidRetrievalStrategyImpl; -import org.springframework.security.expression.PermissionEvaluator; /** * Used by Spring Security's expression-based access control implementation to evaluate permissions for a particular * object using the ACL module. Similar in behaviour to - * {@link org.springframework.security.vote.AclEntryVoter AclEntryVoter}. + * {@link org.springframework.security.access.vote.AclEntryVoter AclEntryVoter}. * * @author Luke Taylor * @version $Id$ diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java index 1627ef5008..15333cde40 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java @@ -19,8 +19,9 @@ import java.util.Arrays; import java.util.List; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.intercept.AfterInvocationProvider; import org.springframework.security.acls.Acl; import org.springframework.security.acls.AclService; import org.springframework.security.acls.NotFoundException; @@ -32,7 +33,6 @@ import org.springframework.security.acls.objectidentity.ObjectIdentityRetrievalS import org.springframework.security.acls.sid.Sid; import org.springframework.security.acls.sid.SidRetrievalStrategy; import org.springframework.security.acls.sid.SidRetrievalStrategyImpl; -import org.springframework.security.afterinvocation.AfterInvocationProvider; import org.springframework.util.Assert; diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java index 4fd17d5e8b..22eef3f03c 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java @@ -19,10 +19,10 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; -import org.springframework.security.AuthorizationServiceException; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.AuthorizationServiceException; +import org.springframework.security.access.ConfigAttribute; import org.springframework.security.acls.AclService; import org.springframework.security.acls.Permission; diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java index 359affa64c..b6c685dbca 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java @@ -21,10 +21,10 @@ import org.apache.commons.logging.LogFactory; import org.springframework.context.MessageSource; import org.springframework.context.MessageSourceAware; import org.springframework.context.support.MessageSourceAccessor; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; import org.springframework.security.SpringSecurityMessageSource; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; import org.springframework.security.acls.AclService; import org.springframework.security.acls.Permission; diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java index b8992c4f15..b945b9424d 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java @@ -18,9 +18,9 @@ package org.springframework.security.acls.domain; import java.util.Arrays; import java.util.List; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; import org.springframework.security.GrantedAuthority; +import org.springframework.security.access.AccessDeniedException; import org.springframework.security.acls.Acl; import org.springframework.security.acls.sid.PrincipalSid; import org.springframework.security.acls.sid.Sid; diff --git a/acl/src/main/java/org/springframework/security/acls/vote/AclEntryVoter.java b/acl/src/main/java/org/springframework/security/acls/vote/AclEntryVoter.java index a8a4d18e6f..b6a260bdf5 100644 --- a/acl/src/main/java/org/springframework/security/acls/vote/AclEntryVoter.java +++ b/acl/src/main/java/org/springframework/security/acls/vote/AclEntryVoter.java @@ -22,8 +22,9 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.security.Authentication; -import org.springframework.security.AuthorizationServiceException; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.AuthorizationServiceException; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.vote.AbstractAclVoter; import org.springframework.security.acls.Acl; import org.springframework.security.acls.AclService; import org.springframework.security.acls.NotFoundException; @@ -34,7 +35,6 @@ import org.springframework.security.acls.objectidentity.ObjectIdentityRetrievalS import org.springframework.security.acls.sid.Sid; import org.springframework.security.acls.sid.SidRetrievalStrategy; import org.springframework.security.acls.sid.SidRetrievalStrategyImpl; -import org.springframework.security.vote.AbstractAclVoter; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -55,7 +55,7 @@ import org.springframework.util.StringUtils; * method. *

* If the method argument is null, the voter will abstain from voting. If the method argument - * could not be found, an {@link org.springframework.security.AuthorizationServiceException} will be thrown. + * could not be found, an {@link org.springframework.security.access.AuthorizationServiceException} will be thrown. *

* In practical terms users will typically setup a number of AclEntryVoters. Each will have a * different {@link #processDomainObjectClass}, {@link #processConfigAttribute} and {@link #requirePermission} diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java index f7787f0694..e241a26ba8 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java @@ -3,10 +3,10 @@ package org.springframework.security.acls.domain; import junit.framework.Assert; import junit.framework.TestCase; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.access.AccessDeniedException; import org.springframework.security.acls.Acl; import org.springframework.security.acls.MutableAcl; import org.springframework.security.acls.NotFoundException; diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java index 049b9cfce5..e3bf1ab233 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java @@ -29,12 +29,12 @@ import org.springframework.security.SpringSecurityMessageSource; import org.springframework.security.cas.ServiceProperties; import org.springframework.security.cas.authentication.cache.NullStatelessTicketCache; import org.springframework.security.cas.web.CasProcessingFilter; +import org.springframework.security.providers.AccountStatusUserDetailsChecker; import org.springframework.security.providers.AuthenticationProvider; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.userdetails.UserDetails; import org.springframework.security.userdetails.UserDetailsChecker; import org.springframework.security.userdetails.UserDetailsService; -import org.springframework.security.userdetails.checker.AccountStatusUserDetailsChecker; import org.springframework.util.Assert; diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasProcessingFilter.java b/cas/src/main/java/org/springframework/security/cas/web/CasProcessingFilter.java index a2c4923093..94d4de01bd 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/CasProcessingFilter.java +++ b/cas/src/main/java/org/springframework/security/cas/web/CasProcessingFilter.java @@ -26,8 +26,8 @@ import org.springframework.security.AuthenticationException; import org.springframework.security.cas.ServiceProperties; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.web.FilterChainOrder; import org.springframework.security.web.authentication.AbstractProcessingFilter; -import org.springframework.security.web.util.FilterChainOrder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/config/src/main/java/org/springframework/security/config/ConfigUtils.java b/config/src/main/java/org/springframework/security/config/ConfigUtils.java index 8c8c98b08e..c92f646b6b 100644 --- a/config/src/main/java/org/springframework/security/config/ConfigUtils.java +++ b/config/src/main/java/org/springframework/security/config/ConfigUtils.java @@ -12,12 +12,12 @@ 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.afterinvocation.AfterInvocationProviderManager; -import org.springframework.security.expression.method.MethodExpressionVoter; -import org.springframework.security.vote.AccessDecisionVoter; -import org.springframework.security.vote.AffirmativeBased; -import org.springframework.security.vote.AuthenticatedVoter; -import org.springframework.security.vote.RoleVoter; +import org.springframework.security.access.expression.method.MethodExpressionVoter; +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; import org.springframework.security.web.util.UrlUtils; import org.springframework.util.StringUtils; import org.w3c.dom.Element; diff --git a/config/src/main/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecorator.java index 326a863d8c..d0bd223418 100644 --- a/config/src/main/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecorator.java +++ b/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.afterinvocation.AfterInvocationProvider} to the + * Adds the decorated {@link org.springframework.security.access.intercept.AfterInvocationProvider} to the * AfterInvocationProviderManager's list. * * @author Luke Taylor diff --git a/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java b/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java index 753f80c8d5..a0f377201e 100644 --- a/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.OrderComparator; import org.springframework.core.Ordered; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; import org.springframework.security.config.ConfigUtils.FilterChainList; import org.springframework.security.providers.AnonymousAuthenticationToken; import org.springframework.security.web.ExceptionTranslationFilter; diff --git a/config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java index b8b5c751b8..bf94d50a9f 100644 --- a/config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java @@ -6,7 +6,7 @@ import java.util.List; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; import org.springframework.security.util.AntUrlPathMatcher; import org.springframework.security.util.UrlMatcher; import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource; diff --git a/config/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java index d502a68269..0c5bdb2835 100644 --- a/config/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java @@ -16,19 +16,19 @@ 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.ConfigAttribute; -import org.springframework.security.SecurityConfig; -import org.springframework.security.expression.method.MethodExpressionAfterInvocationProvider; -import org.springframework.security.expression.method.MethodExpressionVoter; -import org.springframework.security.expression.support.DefaultMethodSecurityExpressionHandler; -import org.springframework.security.intercept.method.DelegatingMethodSecurityMetadataSource; -import org.springframework.security.intercept.method.MapBasedMethodSecurityMetadataSource; -import org.springframework.security.intercept.method.ProtectPointcutPostProcessor; -import org.springframework.security.intercept.method.aopalliance.MethodSecurityMetadataSourceAdvisor; -import org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor; -import org.springframework.security.vote.AffirmativeBased; -import org.springframework.security.vote.AuthenticatedVoter; -import org.springframework.security.vote.RoleVoter; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.SecurityConfig; +import org.springframework.security.access.expression.method.MethodExpressionAfterInvocationProvider; +import org.springframework.security.access.expression.method.MethodExpressionVoter; +import org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler; +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.vote.AffirmativeBased; +import org.springframework.security.access.vote.AuthenticatedVoter; +import org.springframework.security.access.vote.RoleVoter; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; @@ -45,10 +45,10 @@ class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser { private final Log logger = LogFactory.getLog(getClass()); - static final String SECURED_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.annotation.SecuredMethodSecurityMetadataSource"; - static final String EXPRESSION_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.expression.method.ExpressionAnnotationMethodSecurityMetadataSource"; - static final String JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.annotation.Jsr250MethodSecurityMetadataSource"; - static final String JSR_250_VOTER_CLASS = "org.springframework.security.annotation.Jsr250Voter"; + static final String SECURED_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.access.annotation.SecuredMethodSecurityMetadataSource"; + static final String EXPRESSION_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.access.expression.method.ExpressionAnnotationMethodSecurityMetadataSource"; + static final String JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.access.annotation.Jsr250MethodSecurityMetadataSource"; + static final String JSR_250_VOTER_CLASS = "org.springframework.security.access.annotation.Jsr250Voter"; /* * Internal Bean IDs which are only used within this class diff --git a/config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java index b6337ae1ac..dc4b96942c 100644 --- a/config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java @@ -16,15 +16,15 @@ 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.ConfigAttribute; -import org.springframework.security.ConfigAttributeEditor; -import org.springframework.security.SecurityConfig; +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.util.AntUrlPathMatcher; import org.springframework.security.util.RegexUrlPathMatcher; import org.springframework.security.util.UrlMatcher; -import org.springframework.security.vote.AccessDecisionVoter; -import org.springframework.security.vote.AuthenticatedVoter; -import org.springframework.security.vote.RoleVoter; import org.springframework.security.web.AccessDeniedHandlerImpl; import org.springframework.security.web.ExceptionTranslationFilter; import org.springframework.security.web.FilterChainProxy; diff --git a/config/src/main/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecorator.java index 0bf2d53be7..7de40855d7 100644 --- a/config/src/main/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecorator.java +++ b/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.intercept.method.aopalliance.MethodSecurityInterceptor; +import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; diff --git a/config/src/main/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParser.java index 4a78a92e61..427425833a 100644 --- a/config/src/main/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParser.java @@ -18,7 +18,7 @@ public class JdbcUserServiceBeanDefinitionParser extends AbstractUserDetailsServ static final String ATT_ROLE_PREFIX = "role-prefix"; protected String getBeanClassName(Element element) { - return "org.springframework.security.userdetails.jdbc.JdbcUserDetailsManager"; + return "org.springframework.security.provisioning.JdbcUserDetailsManager"; } protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { @@ -30,24 +30,24 @@ public class JdbcUserServiceBeanDefinitionParser extends AbstractUserDetailsServ parserContext.getReaderContext().error(ATT_DATA_SOURCE + " is required for " + Elements.JDBC_USER_SERVICE, parserContext.extractSource(element)); } - + String usersQuery = element.getAttribute(ATT_USERS_BY_USERNAME_QUERY); String authoritiesQuery = element.getAttribute(ATT_AUTHORITIES_BY_USERNAME_QUERY); String groupAuthoritiesQuery = element.getAttribute(ATT_GROUP_AUTHORITIES_QUERY); String rolePrefix = element.getAttribute(ATT_ROLE_PREFIX); - + if (StringUtils.hasText(rolePrefix)) { builder.addPropertyValue("rolePrefix", rolePrefix); } - + if (StringUtils.hasText(usersQuery)) { builder.addPropertyValue("usersByUsernameQuery", usersQuery); } - + if (StringUtils.hasText(authoritiesQuery)) { builder.addPropertyValue("authoritiesByUsernameQuery", authoritiesQuery); } - + if (StringUtils.hasText(groupAuthoritiesQuery)) { builder.addPropertyValue("enableGroups", Boolean.TRUE); builder.addPropertyValue("groupAuthoritiesByUsernameQuery", groupAuthoritiesQuery); diff --git a/config/src/main/java/org/springframework/security/config/MethodSecurityInterceptorPostProcessor.java b/config/src/main/java/org/springframework/security/config/MethodSecurityInterceptorPostProcessor.java index 852c1dc9f2..2150380d01 100644 --- a/config/src/main/java/org/springframework/security/config/MethodSecurityInterceptorPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/MethodSecurityInterceptorPostProcessor.java @@ -6,8 +6,8 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.security.AfterInvocationManager; -import org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor; +import org.springframework.security.access.intercept.AfterInvocationManager; +import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor; /** * BeanPostProcessor which sets the AfterInvocationManager on the global MethodSecurityInterceptor, diff --git a/config/src/main/java/org/springframework/security/config/OrderedFilterBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/OrderedFilterBeanDefinitionDecorator.java index e9e5114232..bfc679c05e 100644 --- a/config/src/main/java/org/springframework/security/config/OrderedFilterBeanDefinitionDecorator.java +++ b/config/src/main/java/org/springframework/security/config/OrderedFilterBeanDefinitionDecorator.java @@ -15,7 +15,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.BeanDefinitionDecorator; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.core.Ordered; -import org.springframework.security.web.util.FilterChainOrder; +import org.springframework.security.web.FilterChainOrder; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.w3c.dom.Element; diff --git a/config/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java b/config/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java index e1d495624a..1673e6d424 100644 --- a/config/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java +++ b/config/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java @@ -5,9 +5,9 @@ import static org.junit.Assert.*; import org.junit.After; import org.junit.Test; import org.springframework.context.support.AbstractXmlApplicationContext; -import org.springframework.security.afterinvocation.AfterInvocationProviderManager; +import org.springframework.security.access.intercept.AfterInvocationProviderManager; +import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor; import org.springframework.security.config.util.InMemoryXmlApplicationContext; -import org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor; public class CustomAfterInvocationProviderBeanDefinitionDecoratorTests { private AbstractXmlApplicationContext appContext; diff --git a/config/src/test/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParserTests.java index 656229e6da..f8c35eb468 100644 --- a/config/src/test/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParserTests.java @@ -11,11 +11,11 @@ import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.mock.web.MockFilterChain; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.SecurityConfig; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.SecurityConfig; import org.springframework.security.config.util.InMemoryXmlApplicationContext; +import org.springframework.security.web.FilterInvocation; import org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource; -import org.springframework.security.web.intercept.FilterInvocation; import org.w3c.dom.Element; /** diff --git a/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java index b12471df78..6958f122bc 100644 --- a/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java @@ -11,24 +11,24 @@ import org.junit.After; import org.junit.Test; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.AbstractXmlApplicationContext; -import org.springframework.security.AccessDeniedException; import org.springframework.security.AuthenticationCredentialsNotFoundException; -import org.springframework.security.afterinvocation.AfterInvocationProviderManager; -import org.springframework.security.annotation.BusinessService; -import org.springframework.security.annotation.Jsr250MethodSecurityMetadataSource; -import org.springframework.security.annotation.Jsr250Voter; -import org.springframework.security.annotation.SecuredMethodSecurityMetadataSource; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.annotation.BusinessService; +import org.springframework.security.access.annotation.Jsr250MethodSecurityMetadataSource; +import org.springframework.security.access.annotation.Jsr250Voter; +import org.springframework.security.access.annotation.SecuredMethodSecurityMetadataSource; +import org.springframework.security.access.expression.method.ExpressionAnnotationMethodSecurityMetadataSource; +import org.springframework.security.access.expression.method.MethodExpressionAfterInvocationProvider; +import org.springframework.security.access.expression.method.MethodExpressionVoter; +import org.springframework.security.access.intercept.AfterInvocationProviderManager; +import org.springframework.security.access.vote.AffirmativeBased; import org.springframework.security.config.util.InMemoryXmlApplicationContext; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.expression.method.ExpressionAnnotationMethodSecurityMetadataSource; -import org.springframework.security.expression.method.MethodExpressionAfterInvocationProvider; -import org.springframework.security.expression.method.MethodExpressionVoter; import org.springframework.security.providers.TestingAuthenticationToken; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.userdetails.UserDetailsService; import org.springframework.security.util.AuthorityUtils; import org.springframework.security.util.FieldUtils; -import org.springframework.security.vote.AffirmativeBased; /** * @author Ben Alex @@ -42,7 +42,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { public void loadContext() { setContext( - "" + + "" + "" + " " + " " + @@ -132,10 +132,10 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { @Test public void supportsMethodArgumentsInPointcut() { setContext( - "" + + "" + "" + - " " + - " " + + " " + + " " + "" + ConfigTestUtils.AUTH_PROVIDER_XML ); SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("user", "password")); @@ -154,11 +154,11 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { @Test public void supportsBooleanPointcutExpressions() { setContext( - "" + + "" + "" + " " + "" + ConfigTestUtils.AUTH_PROVIDER_XML ); @@ -191,7 +191,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { "" + "" + " " + - " " + + " " + "" + AUTH_PROVIDER_XML ); @@ -220,7 +220,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { public void accessIsDeniedForHasRoleExpression() { setContext( "" + - "" + + "" + AUTH_PROVIDER_XML); SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("bob","bobspassword")); target = (BusinessService) appContext.getBean("target"); @@ -231,7 +231,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { public void preAndPostFilterAnnotationsWorkWithLists() { setContext( "" + - "" + + "" + AUTH_PROVIDER_XML); SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("bob","bobspassword")); target = (BusinessService) appContext.getBean("target"); @@ -250,7 +250,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { public void prePostFilterAnnotationWorksWithArrays() { setContext( "" + - "" + + "" + AUTH_PROVIDER_XML); SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("bob","bobspassword")); target = (BusinessService) appContext.getBean("target"); diff --git a/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java index 302daecc5e..b722325e3b 100644 --- a/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java @@ -19,10 +19,10 @@ import org.springframework.mock.web.MockFilterChain; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpSession; -import org.springframework.security.AccessDeniedException; -import org.springframework.security.ConfigAttribute; import org.springframework.security.MockAuthenticationEntryPoint; -import org.springframework.security.SecurityConfig; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.SecurityConfig; import org.springframework.security.concurrent.ConcurrentLoginException; import org.springframework.security.concurrent.ConcurrentSessionControllerImpl; import org.springframework.security.config.util.InMemoryXmlApplicationContext; @@ -34,6 +34,7 @@ import org.springframework.security.providers.UsernamePasswordAuthenticationToke import org.springframework.security.util.FieldUtils; import org.springframework.security.web.ExceptionTranslationFilter; import org.springframework.security.web.FilterChainProxy; +import org.springframework.security.web.FilterInvocation; import org.springframework.security.web.PortMapperImpl; import org.springframework.security.web.SessionFixationProtectionFilter; import org.springframework.security.web.WebAuthenticationDetails; @@ -55,7 +56,6 @@ import org.springframework.security.web.context.HttpSessionSecurityContextReposi import org.springframework.security.web.context.SecurityContextPersistenceFilter; import org.springframework.security.web.expression.DefaultWebSecurityExpressionHandler; import org.springframework.security.web.expression.ExpressionBasedFilterInvocationSecurityMetadataSource; -import org.springframework.security.web.intercept.FilterInvocation; import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource; import org.springframework.security.web.intercept.FilterSecurityInterceptor; import org.springframework.security.web.logout.LogoutFilter; diff --git a/config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java b/config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java index d7cd60c3ab..025e18ba52 100644 --- a/config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java +++ b/config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java @@ -6,8 +6,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.security.AccessDeniedException; import org.springframework.security.AuthenticationCredentialsNotFoundException; +import org.springframework.security.access.AccessDeniedException; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.util.AuthorityUtils; diff --git a/config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java index 330fe16367..17e371437b 100644 --- a/config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java @@ -1,6 +1,7 @@ package org.springframework.security.config; import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import org.junit.After; import org.junit.Test; @@ -9,10 +10,11 @@ import org.springframework.security.config.util.InMemoryXmlApplicationContext; import org.springframework.security.providers.ProviderManager; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.providers.dao.DaoAuthenticationProvider; +import org.springframework.security.provisioning.JdbcUserDetailsManager; import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.jdbc.JdbcUserDetailsManager; import org.springframework.security.util.AuthorityUtils; import org.springframework.security.util.FieldUtils; +import org.w3c.dom.Element; /** * @author Ben Alex @@ -40,6 +42,11 @@ public class JdbcUserServiceBeanDefinitionParserTests { } } + @Test + public void beanNameIsCorrect() throws Exception { + assertEquals(JdbcUserDetailsManager.class.getName(), new JdbcUserServiceBeanDefinitionParser().getBeanClassName(mock(Element.class))); + } + @Test public void validUsernameIsFound() { setContext("" + DATA_SOURCE); diff --git a/config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java index 95e5be7401..62a7101cdc 100644 --- a/config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java @@ -3,9 +3,9 @@ package org.springframework.security.config; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.security.AccessDeniedException; import org.springframework.security.AuthenticationCredentialsNotFoundException; -import org.springframework.security.annotation.BusinessService; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.annotation.BusinessService; import org.springframework.security.config.util.InMemoryXmlApplicationContext; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; @@ -23,7 +23,7 @@ public class Jsr250AnnotationDrivenBeanDefinitionParserTests { @Before public void loadContext() { appContext = new InMemoryXmlApplicationContext( - "" + + "" + "" + ConfigTestUtils.AUTH_PROVIDER_XML ); target = (BusinessService) appContext.getBean("target"); diff --git a/config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java b/config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java index 68c3d3a3bb..857d23c4e8 100644 --- a/config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java +++ b/config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java @@ -2,10 +2,10 @@ package org.springframework.security.config; import java.util.List; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.afterinvocation.AfterInvocationProvider; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.intercept.AfterInvocationProvider; public class MockAfterInvocationProvider implements AfterInvocationProvider { diff --git a/config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java index 43627ee34b..04c2006420 100644 --- a/config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java @@ -3,9 +3,9 @@ package org.springframework.security.config; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.security.AccessDeniedException; import org.springframework.security.AuthenticationCredentialsNotFoundException; -import org.springframework.security.annotation.BusinessService; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.annotation.BusinessService; import org.springframework.security.config.util.InMemoryXmlApplicationContext; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; @@ -24,7 +24,7 @@ public class SecuredAnnotationDrivenBeanDefinitionParserTests { public void loadContext() { SecurityContextHolder.clearContext(); appContext = new InMemoryXmlApplicationContext( - "" + + "" + "" + ConfigTestUtils.AUTH_PROVIDER_XML ); target = (BusinessService) appContext.getBean("target"); diff --git a/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java b/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java index 66720a92df..67c0d5369a 100644 --- a/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java +++ b/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java @@ -25,9 +25,9 @@ public class MethodSecurityInterceptorWithAopConfigTests { " "; static final String ACCESS_MANAGER_XML = - "" + + "" + " " + - " " + + " " + " " + ""; @@ -55,7 +55,7 @@ public class MethodSecurityInterceptorWithAopConfigTests { " " + "" + "" + - "" + + "" + " " + " " + "org.springframework.security.TargetObject.makeLower*=ROLE_A\n" + diff --git a/core/src/main/java/org/springframework/security/GrantedAuthority.java b/core/src/main/java/org/springframework/security/GrantedAuthority.java index f35c1b67e3..79591071ba 100644 --- a/core/src/main/java/org/springframework/security/GrantedAuthority.java +++ b/core/src/main/java/org/springframework/security/GrantedAuthority.java @@ -17,6 +17,7 @@ package org.springframework.security; import java.io.Serializable; +import org.springframework.security.access.AccessDecisionManager; import org.springframework.security.userdetails.UserDetails; /** diff --git a/core/src/main/java/org/springframework/security/InsufficientAuthenticationException.java b/core/src/main/java/org/springframework/security/InsufficientAuthenticationException.java index 6864ea5fac..5f79204349 100644 --- a/core/src/main/java/org/springframework/security/InsufficientAuthenticationException.java +++ b/core/src/main/java/org/springframework/security/InsufficientAuthenticationException.java @@ -17,7 +17,7 @@ package org.springframework.security; /** * Thrown if an authentication request is rejected because the credentials are not sufficiently trusted.

{{@link - * org.springframework.security.vote.AccessDecisionVoter}s will typically throw this exception if they are dissatisfied with the + * org.springframework.security.access.vote.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.ui.ExceptionTranslationFilter} will thus cause the AuthenticationEntryPoint * to be called, allowing the principal to authenticate with a stronger level of authentication.}

diff --git a/core/src/main/java/org/springframework/security/SpringSecurityException.java b/core/src/main/java/org/springframework/security/SpringSecurityException.java index 56a5e7c1d3..175144a0ff 100644 --- a/core/src/main/java/org/springframework/security/SpringSecurityException.java +++ b/core/src/main/java/org/springframework/security/SpringSecurityException.java @@ -19,8 +19,10 @@ import org.springframework.core.NestedRuntimeException; /** - * Abstract superclass for all exceptions thrown in the security package and subpackages.

Note that this is a - * runtime (unchecked) exception. Security exceptions are usually fatal; there is no reason for them to be checked.

+ * Abstract superclass for all exceptions thrown in the security package and subpackages. + *

+ * Note that this is a runtime (unchecked) exception. Security exceptions are usually fatal; there is no reason for + * them to be checked. * * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/springframework/security/event/authorization/AbstractAuthorizationEvent.java b/core/src/main/java/org/springframework/security/access/AbstractAuthorizationEvent.java similarity index 95% rename from core/src/main/java/org/springframework/security/event/authorization/AbstractAuthorizationEvent.java rename to core/src/main/java/org/springframework/security/access/AbstractAuthorizationEvent.java index b274c6ca43..7f1981da6e 100644 --- a/core/src/main/java/org/springframework/security/event/authorization/AbstractAuthorizationEvent.java +++ b/core/src/main/java/org/springframework/security/access/AbstractAuthorizationEvent.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.event.authorization; +package org.springframework.security.access; import org.springframework.context.ApplicationEvent; @@ -27,7 +27,7 @@ import org.springframework.context.ApplicationEvent; public abstract class AbstractAuthorizationEvent extends ApplicationEvent { //~ Constructors =================================================================================================== -/** + /** * Construct the event, passing in the secure object being intercepted. * * @param secureObject the secure object diff --git a/core/src/main/java/org/springframework/security/AccessDecisionManager.java b/core/src/main/java/org/springframework/security/access/AccessDecisionManager.java similarity index 94% rename from core/src/main/java/org/springframework/security/AccessDecisionManager.java rename to core/src/main/java/org/springframework/security/access/AccessDecisionManager.java index 058179cd48..2b71b30852 100644 --- a/core/src/main/java/org/springframework/security/AccessDecisionManager.java +++ b/core/src/main/java/org/springframework/security/access/AccessDecisionManager.java @@ -13,10 +13,13 @@ * limitations under the License. */ -package org.springframework.security; +package org.springframework.security.access; import java.util.List; +import org.springframework.security.Authentication; +import org.springframework.security.InsufficientAuthenticationException; + /** * Makes a final access control (authorization) decision. * diff --git a/core/src/main/java/org/springframework/security/AccessDeniedException.java b/core/src/main/java/org/springframework/security/access/AccessDeniedException.java similarity index 90% rename from core/src/main/java/org/springframework/security/AccessDeniedException.java rename to core/src/main/java/org/springframework/security/access/AccessDeniedException.java index c06f9ede68..cf4be9d31e 100644 --- a/core/src/main/java/org/springframework/security/AccessDeniedException.java +++ b/core/src/main/java/org/springframework/security/access/AccessDeniedException.java @@ -13,7 +13,10 @@ * limitations under the License. */ -package org.springframework.security; +package org.springframework.security.access; + +import org.springframework.security.Authentication; +import org.springframework.security.SpringSecurityException; /** * Thrown if an {@link Authentication} object does not hold a required authority. diff --git a/core/src/main/java/org/springframework/security/event/authorization/AuthenticationCredentialsNotFoundEvent.java b/core/src/main/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEvent.java similarity index 95% rename from core/src/main/java/org/springframework/security/event/authorization/AuthenticationCredentialsNotFoundEvent.java rename to core/src/main/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEvent.java index 8fb2070d9a..0da8de0707 100644 --- a/core/src/main/java/org/springframework/security/event/authorization/AuthenticationCredentialsNotFoundEvent.java +++ b/core/src/main/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEvent.java @@ -13,12 +13,11 @@ * limitations under the License. */ -package org.springframework.security.event.authorization; +package org.springframework.security.access; import java.util.List; import org.springframework.security.AuthenticationCredentialsNotFoundException; -import org.springframework.security.ConfigAttribute; /** diff --git a/core/src/main/java/org/springframework/security/event/authorization/AuthorizationFailureEvent.java b/core/src/main/java/org/springframework/security/access/AuthorizationFailureEvent.java similarity index 89% rename from core/src/main/java/org/springframework/security/event/authorization/AuthorizationFailureEvent.java rename to core/src/main/java/org/springframework/security/access/AuthorizationFailureEvent.java index 958bfe258a..8cfd5144c0 100644 --- a/core/src/main/java/org/springframework/security/event/authorization/AuthorizationFailureEvent.java +++ b/core/src/main/java/org/springframework/security/access/AuthorizationFailureEvent.java @@ -13,13 +13,11 @@ * limitations under the License. */ -package org.springframework.security.event.authorization; +package org.springframework.security.access; import java.util.List; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; /** @@ -27,8 +25,8 @@ import org.springframework.security.ConfigAttribute; * be authorized for the request. * *

This event might be thrown as a result of either an - * {@link org.springframework.security.AccessDecisionManager AccessDecisionManager} or an - * {@link org.springframework.security.AfterInvocationManager AfterInvocationManager}. + * {@link org.springframework.security.access.AccessDecisionManager AccessDecisionManager} or an + * {@link org.springframework.security.access.intercept.AfterInvocationManager AfterInvocationManager}. * * @author Ben Alex * @version $Id$ diff --git a/core/src/main/java/org/springframework/security/AuthorizationServiceException.java b/core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java similarity index 86% rename from core/src/main/java/org/springframework/security/AuthorizationServiceException.java rename to core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java index ba506ca789..9a530b7bb9 100644 --- a/core/src/main/java/org/springframework/security/AuthorizationServiceException.java +++ b/core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java @@ -13,11 +13,13 @@ * limitations under the License. */ -package org.springframework.security; +package org.springframework.security.access; /** - * Thrown if an authorization request could not be processed due to a system problem.

This might be thrown if an - * AccessDecisionManager implementation could not locate a required method argument, for example.

+ * Thrown if an authorization request could not be processed due to a system problem. + *

+ * This might be thrown if an AccessDecisionManager implementation could not locate a required method + * argument, for example. * * @author Ben Alex * @version $Id$ @@ -25,7 +27,7 @@ package org.springframework.security; public class AuthorizationServiceException extends AccessDeniedException { //~ Constructors =================================================================================================== -/** + /** * Constructs an AuthorizationServiceException with the * specified message. * @@ -35,7 +37,7 @@ public class AuthorizationServiceException extends AccessDeniedException { super(msg); } -/** + /** * Constructs an AuthorizationServiceException with the * specified message and root cause. * diff --git a/core/src/main/java/org/springframework/security/event/authorization/AuthorizedEvent.java b/core/src/main/java/org/springframework/security/access/AuthorizedEvent.java similarity index 95% rename from core/src/main/java/org/springframework/security/event/authorization/AuthorizedEvent.java rename to core/src/main/java/org/springframework/security/access/AuthorizedEvent.java index 3e4632fe50..9e3827b8fe 100644 --- a/core/src/main/java/org/springframework/security/event/authorization/AuthorizedEvent.java +++ b/core/src/main/java/org/springframework/security/access/AuthorizedEvent.java @@ -13,12 +13,11 @@ * limitations under the License. */ -package org.springframework.security.event.authorization; +package org.springframework.security.access; import java.util.List; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; /** diff --git a/core/src/main/java/org/springframework/security/ConfigAttribute.java b/core/src/main/java/org/springframework/security/access/ConfigAttribute.java similarity index 91% rename from core/src/main/java/org/springframework/security/ConfigAttribute.java rename to core/src/main/java/org/springframework/security/access/ConfigAttribute.java index ab8ed4f438..051efb13b3 100644 --- a/core/src/main/java/org/springframework/security/ConfigAttribute.java +++ b/core/src/main/java/org/springframework/security/access/ConfigAttribute.java @@ -13,16 +13,18 @@ * limitations under the License. */ -package org.springframework.security; +package org.springframework.security.access; import java.io.Serializable; +import org.springframework.security.access.intercept.RunAsManager; + /** * Stores a security system related configuration attribute. * *

- * When an {@link org.springframework.security.intercept.AbstractSecurityInterceptor} + * When an {@link org.springframework.security.access.intercept.AbstractSecurityInterceptor} * is set up, a list of configuration attributes is defined for secure object * patterns. These configuration attributes have special meaning to a {@link RunAsManager}, * {@link AccessDecisionManager} or AccessDecisionManager delegate. diff --git a/core/src/main/java/org/springframework/security/ConfigAttributeEditor.java b/core/src/main/java/org/springframework/security/access/ConfigAttributeEditor.java similarity index 97% rename from core/src/main/java/org/springframework/security/ConfigAttributeEditor.java rename to core/src/main/java/org/springframework/security/access/ConfigAttributeEditor.java index c2d76343bf..163237011c 100644 --- a/core/src/main/java/org/springframework/security/ConfigAttributeEditor.java +++ b/core/src/main/java/org/springframework/security/access/ConfigAttributeEditor.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security; +package org.springframework.security.access; import org.springframework.util.StringUtils; diff --git a/core/src/main/java/org/springframework/security/event/authorization/LoggerListener.java b/core/src/main/java/org/springframework/security/access/LoggerListener.java similarity index 98% rename from core/src/main/java/org/springframework/security/event/authorization/LoggerListener.java rename to core/src/main/java/org/springframework/security/access/LoggerListener.java index 0f7eca4a4e..fb9cbeaa7f 100644 --- a/core/src/main/java/org/springframework/security/event/authorization/LoggerListener.java +++ b/core/src/main/java/org/springframework/security/access/LoggerListener.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.event.authorization; +package org.springframework.security.access; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/springframework/security/event/authorization/PublicInvocationEvent.java b/core/src/main/java/org/springframework/security/access/PublicInvocationEvent.java similarity index 96% rename from core/src/main/java/org/springframework/security/event/authorization/PublicInvocationEvent.java rename to core/src/main/java/org/springframework/security/access/PublicInvocationEvent.java index 09951e9598..80f907e6af 100644 --- a/core/src/main/java/org/springframework/security/event/authorization/PublicInvocationEvent.java +++ b/core/src/main/java/org/springframework/security/access/PublicInvocationEvent.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.event.authorization; +package org.springframework.security.access; /** * Event that is generated whenever a public secure object is invoked.

A public secure object is a secure object diff --git a/core/src/main/java/org/springframework/security/SecurityConfig.java b/core/src/main/java/org/springframework/security/access/SecurityConfig.java similarity index 98% rename from core/src/main/java/org/springframework/security/SecurityConfig.java rename to core/src/main/java/org/springframework/security/access/SecurityConfig.java index af0ada3be2..3bd5c3dbed 100644 --- a/core/src/main/java/org/springframework/security/SecurityConfig.java +++ b/core/src/main/java/org/springframework/security/access/SecurityConfig.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security; +package org.springframework.security.access; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/org/springframework/security/annotation/Jsr250MethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java similarity index 92% rename from core/src/main/java/org/springframework/security/annotation/Jsr250MethodSecurityMetadataSource.java rename to core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java index 0bef070f6a..8be5e9f8bb 100644 --- a/core/src/main/java/org/springframework/security/annotation/Jsr250MethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.annotation; +package org.springframework.security.access.annotation; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -26,8 +26,8 @@ import javax.annotation.security.PermitAll; import javax.annotation.security.RolesAllowed; import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.intercept.method.AbstractFallbackMethodSecurityMetadataSource; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.intercept.method.AbstractFallbackMethodSecurityMetadataSource; /** diff --git a/core/src/main/java/org/springframework/security/annotation/Jsr250SecurityConfig.java b/core/src/main/java/org/springframework/security/access/annotation/Jsr250SecurityConfig.java similarity index 83% rename from core/src/main/java/org/springframework/security/annotation/Jsr250SecurityConfig.java rename to core/src/main/java/org/springframework/security/access/annotation/Jsr250SecurityConfig.java index 3e2302f47b..f69cccf4c8 100644 --- a/core/src/main/java/org/springframework/security/annotation/Jsr250SecurityConfig.java +++ b/core/src/main/java/org/springframework/security/access/annotation/Jsr250SecurityConfig.java @@ -1,6 +1,6 @@ -package org.springframework.security.annotation; +package org.springframework.security.access.annotation; -import org.springframework.security.SecurityConfig; +import org.springframework.security.access.SecurityConfig; import javax.annotation.security.PermitAll; import javax.annotation.security.DenyAll; diff --git a/core/src/main/java/org/springframework/security/annotation/Jsr250Voter.java b/core/src/main/java/org/springframework/security/access/annotation/Jsr250Voter.java similarity index 91% rename from core/src/main/java/org/springframework/security/annotation/Jsr250Voter.java rename to core/src/main/java/org/springframework/security/access/annotation/Jsr250Voter.java index 8f35337c98..18c869b6fa 100644 --- a/core/src/main/java/org/springframework/security/annotation/Jsr250Voter.java +++ b/core/src/main/java/org/springframework/security/access/annotation/Jsr250Voter.java @@ -1,11 +1,11 @@ -package org.springframework.security.annotation; +package org.springframework.security.access.annotation; import java.util.List; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; import org.springframework.security.GrantedAuthority; -import org.springframework.security.vote.AccessDecisionVoter; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.vote.AccessDecisionVoter; /** * Voter on JSR-250 configuration attributes. diff --git a/core/src/main/java/org/springframework/security/annotation/Secured.java b/core/src/main/java/org/springframework/security/access/annotation/Secured.java similarity index 97% rename from core/src/main/java/org/springframework/security/annotation/Secured.java rename to core/src/main/java/org/springframework/security/access/annotation/Secured.java index 974be4a5e0..2c5ffe1ec2 100644 --- a/core/src/main/java/org/springframework/security/annotation/Secured.java +++ b/core/src/main/java/org/springframework/security/access/annotation/Secured.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.annotation; +package org.springframework.security.access.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/core/src/main/java/org/springframework/security/annotation/SecuredMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/annotation/SecuredMethodSecurityMetadataSource.java similarity index 87% rename from core/src/main/java/org/springframework/security/annotation/SecuredMethodSecurityMetadataSource.java rename to core/src/main/java/org/springframework/security/access/annotation/SecuredMethodSecurityMetadataSource.java index db493aa352..1bb49483cb 100644 --- a/core/src/main/java/org/springframework/security/annotation/SecuredMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/annotation/SecuredMethodSecurityMetadataSource.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.annotation; +package org.springframework.security.access.annotation; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -22,9 +22,9 @@ import java.util.Collection; import java.util.List; import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.SecurityConfig; -import org.springframework.security.intercept.method.AbstractFallbackMethodSecurityMetadataSource; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.SecurityConfig; +import org.springframework.security.access.intercept.method.AbstractFallbackMethodSecurityMetadataSource; /** diff --git a/core/src/main/java/org/springframework/security/authoritymapping/Attributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/access/authoritymapping/Attributes2GrantedAuthoritiesMapper.java similarity index 91% rename from core/src/main/java/org/springframework/security/authoritymapping/Attributes2GrantedAuthoritiesMapper.java rename to core/src/main/java/org/springframework/security/access/authoritymapping/Attributes2GrantedAuthoritiesMapper.java index f8c38860d6..ba5a673f11 100755 --- a/core/src/main/java/org/springframework/security/authoritymapping/Attributes2GrantedAuthoritiesMapper.java +++ b/core/src/main/java/org/springframework/security/access/authoritymapping/Attributes2GrantedAuthoritiesMapper.java @@ -1,4 +1,4 @@ -package org.springframework.security.authoritymapping; +package org.springframework.security.access.authoritymapping; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/org/springframework/security/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/access/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java similarity index 94% rename from core/src/main/java/org/springframework/security/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java rename to core/src/main/java/org/springframework/security/access/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java index f47f3da531..31a1f21306 100755 --- a/core/src/main/java/org/springframework/security/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java +++ b/core/src/main/java/org/springframework/security/access/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapper.java @@ -1,4 +1,4 @@ -package org.springframework.security.authoritymapping; +package org.springframework.security.access.authoritymapping; import java.util.ArrayList; import java.util.Collection; @@ -144,7 +144,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper implements Attributes2G /** * - * @see org.springframework.security.authoritymapping.MappableAttributesRetriever#getMappableAttributes() + * @see org.springframework.security.access.authoritymapping.MappableAttributesRetriever#getMappableAttributes() */ public Set getMappableAttributes() { return mappableAttributes; diff --git a/core/src/main/java/org/springframework/security/authoritymapping/MappableAttributesRetriever.java b/core/src/main/java/org/springframework/security/access/authoritymapping/MappableAttributesRetriever.java similarity index 87% rename from core/src/main/java/org/springframework/security/authoritymapping/MappableAttributesRetriever.java rename to core/src/main/java/org/springframework/security/access/authoritymapping/MappableAttributesRetriever.java index b5f3365d62..0b8430111a 100755 --- a/core/src/main/java/org/springframework/security/authoritymapping/MappableAttributesRetriever.java +++ b/core/src/main/java/org/springframework/security/access/authoritymapping/MappableAttributesRetriever.java @@ -1,4 +1,4 @@ -package org.springframework.security.authoritymapping; +package org.springframework.security.access.authoritymapping; import java.util.Set; diff --git a/core/src/main/java/org/springframework/security/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/access/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java similarity index 95% rename from core/src/main/java/org/springframework/security/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java rename to core/src/main/java/org/springframework/security/access/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java index eacd176d0a..d093245d38 100755 --- a/core/src/main/java/org/springframework/security/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java +++ b/core/src/main/java/org/springframework/security/access/authoritymapping/SimpleAttributes2GrantedAuthoritiesMapper.java @@ -1,4 +1,4 @@ -package org.springframework.security.authoritymapping; +package org.springframework.security.access.authoritymapping; import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthorityImpl; diff --git a/core/src/main/java/org/springframework/security/authoritymapping/SimpleMappableAttributesRetriever.java b/core/src/main/java/org/springframework/security/access/authoritymapping/SimpleMappableAttributesRetriever.java similarity index 80% rename from core/src/main/java/org/springframework/security/authoritymapping/SimpleMappableAttributesRetriever.java rename to core/src/main/java/org/springframework/security/access/authoritymapping/SimpleMappableAttributesRetriever.java index d1d6543c68..beccfe0daa 100755 --- a/core/src/main/java/org/springframework/security/authoritymapping/SimpleMappableAttributesRetriever.java +++ b/core/src/main/java/org/springframework/security/access/authoritymapping/SimpleMappableAttributesRetriever.java @@ -1,4 +1,4 @@ -package org.springframework.security.authoritymapping; +package org.springframework.security.access.authoritymapping; import java.util.Collections; import java.util.HashSet; @@ -18,7 +18,7 @@ public class SimpleMappableAttributesRetriever implements MappableAttributesRetr /* * (non-Javadoc) * - * @see org.springframework.security.authoritymapping.MappableAttributesRetriever#getMappableAttributes() + * @see org.springframework.security.access.authoritymapping.MappableAttributesRetriever#getMappableAttributes() */ public Set getMappableAttributes() { return mappableAttributes; diff --git a/core/src/main/java/org/springframework/security/authoritymapping/XmlMappableAttributesRetriever.java b/core/src/main/java/org/springframework/security/access/authoritymapping/XmlMappableAttributesRetriever.java similarity index 96% rename from core/src/main/java/org/springframework/security/authoritymapping/XmlMappableAttributesRetriever.java rename to core/src/main/java/org/springframework/security/access/authoritymapping/XmlMappableAttributesRetriever.java index dcef6eaf6a..9fe2af2e84 100755 --- a/core/src/main/java/org/springframework/security/authoritymapping/XmlMappableAttributesRetriever.java +++ b/core/src/main/java/org/springframework/security/access/authoritymapping/XmlMappableAttributesRetriever.java @@ -1,4 +1,4 @@ -package org.springframework.security.authoritymapping; +package org.springframework.security.access.authoritymapping; import java.io.FilterInputStream; import java.io.IOException; diff --git a/core/src/main/java/org/springframework/security/expression/ExpressionUtils.java b/core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java similarity index 90% rename from core/src/main/java/org/springframework/security/expression/ExpressionUtils.java rename to core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java index 5455771490..79538b2a65 100644 --- a/core/src/main/java/org/springframework/security/expression/ExpressionUtils.java +++ b/core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression; +package org.springframework.security.access.expression; import org.springframework.expression.EvaluationContext; import org.springframework.expression.EvaluationException; diff --git a/core/src/main/java/org/springframework/security/expression/MethodSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/MethodSecurityExpressionHandler.java similarity index 97% rename from core/src/main/java/org/springframework/security/expression/MethodSecurityExpressionHandler.java rename to core/src/main/java/org/springframework/security/access/expression/MethodSecurityExpressionHandler.java index 55a95a91c1..b672a06359 100644 --- a/core/src/main/java/org/springframework/security/expression/MethodSecurityExpressionHandler.java +++ b/core/src/main/java/org/springframework/security/access/expression/MethodSecurityExpressionHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression; +package org.springframework.security.access.expression; import org.aopalliance.intercept.MethodInvocation; import org.springframework.expression.EvaluationContext; diff --git a/core/src/main/java/org/springframework/security/expression/PermissionEvaluator.java b/core/src/main/java/org/springframework/security/access/expression/PermissionEvaluator.java similarity index 96% rename from core/src/main/java/org/springframework/security/expression/PermissionEvaluator.java rename to core/src/main/java/org/springframework/security/access/expression/PermissionEvaluator.java index 5406aea545..4b27b8b958 100644 --- a/core/src/main/java/org/springframework/security/expression/PermissionEvaluator.java +++ b/core/src/main/java/org/springframework/security/access/expression/PermissionEvaluator.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression; +package org.springframework.security.access.expression; import java.io.Serializable; diff --git a/core/src/main/java/org/springframework/security/expression/annotation/PostAuthorize.java b/core/src/main/java/org/springframework/security/access/expression/annotation/PostAuthorize.java similarity index 91% rename from core/src/main/java/org/springframework/security/expression/annotation/PostAuthorize.java rename to core/src/main/java/org/springframework/security/access/expression/annotation/PostAuthorize.java index 3b044b1d6b..00e89cc260 100644 --- a/core/src/main/java/org/springframework/security/expression/annotation/PostAuthorize.java +++ b/core/src/main/java/org/springframework/security/access/expression/annotation/PostAuthorize.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.annotation; +package org.springframework.security.access.expression.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/core/src/main/java/org/springframework/security/expression/annotation/PostFilter.java b/core/src/main/java/org/springframework/security/access/expression/annotation/PostFilter.java similarity index 91% rename from core/src/main/java/org/springframework/security/expression/annotation/PostFilter.java rename to core/src/main/java/org/springframework/security/access/expression/annotation/PostFilter.java index 6672174302..935ac1fc7d 100644 --- a/core/src/main/java/org/springframework/security/expression/annotation/PostFilter.java +++ b/core/src/main/java/org/springframework/security/access/expression/annotation/PostFilter.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.annotation; +package org.springframework.security.access.expression.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/core/src/main/java/org/springframework/security/expression/annotation/PreAuthorize.java b/core/src/main/java/org/springframework/security/access/expression/annotation/PreAuthorize.java similarity index 91% rename from core/src/main/java/org/springframework/security/expression/annotation/PreAuthorize.java rename to core/src/main/java/org/springframework/security/access/expression/annotation/PreAuthorize.java index 97c78aef9c..387da38cc4 100644 --- a/core/src/main/java/org/springframework/security/expression/annotation/PreAuthorize.java +++ b/core/src/main/java/org/springframework/security/access/expression/annotation/PreAuthorize.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.annotation; +package org.springframework.security.access.expression.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/core/src/main/java/org/springframework/security/expression/annotation/PreFilter.java b/core/src/main/java/org/springframework/security/access/expression/annotation/PreFilter.java similarity index 96% rename from core/src/main/java/org/springframework/security/expression/annotation/PreFilter.java rename to core/src/main/java/org/springframework/security/access/expression/annotation/PreFilter.java index d53a2d1126..e615c60a7a 100644 --- a/core/src/main/java/org/springframework/security/expression/annotation/PreFilter.java +++ b/core/src/main/java/org/springframework/security/access/expression/annotation/PreFilter.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.annotation; +package org.springframework.security.access.expression.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/core/src/main/java/org/springframework/security/expression/method/AbstractExpressionBasedMethodConfigAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java similarity index 94% rename from core/src/main/java/org/springframework/security/expression/method/AbstractExpressionBasedMethodConfigAttribute.java rename to core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java index 7f47cd4b6c..8f6b3b6d86 100644 --- a/core/src/main/java/org/springframework/security/expression/method/AbstractExpressionBasedMethodConfigAttribute.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java @@ -1,9 +1,9 @@ -package org.springframework.security.expression.method; +package org.springframework.security.access.expression.method; import org.springframework.expression.Expression; import org.springframework.expression.ParseException; import org.springframework.expression.spel.antlr.SpelAntlrExpressionParser; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; import org.springframework.util.Assert; /** diff --git a/core/src/main/java/org/springframework/security/expression/method/ExpressionAnnotationMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionAnnotationMethodSecurityMetadataSource.java similarity index 89% rename from core/src/main/java/org/springframework/security/expression/method/ExpressionAnnotationMethodSecurityMetadataSource.java rename to core/src/main/java/org/springframework/security/access/expression/method/ExpressionAnnotationMethodSecurityMetadataSource.java index d4d0ce8cc9..81cb45fbe0 100644 --- a/core/src/main/java/org/springframework/security/expression/method/ExpressionAnnotationMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionAnnotationMethodSecurityMetadataSource.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.method; +package org.springframework.security.access.expression.method; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -11,13 +11,13 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.ParseException; import org.springframework.expression.spel.antlr.SpelAntlrExpressionParser; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.expression.MethodSecurityExpressionHandler; -import org.springframework.security.expression.annotation.PostAuthorize; -import org.springframework.security.expression.annotation.PostFilter; -import org.springframework.security.expression.annotation.PreAuthorize; -import org.springframework.security.expression.annotation.PreFilter; -import org.springframework.security.intercept.method.AbstractMethodSecurityMetadataSource; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.expression.MethodSecurityExpressionHandler; +import org.springframework.security.access.expression.annotation.PostAuthorize; +import org.springframework.security.access.expression.annotation.PostFilter; +import org.springframework.security.access.expression.annotation.PreAuthorize; +import org.springframework.security.access.expression.annotation.PreFilter; +import org.springframework.security.access.intercept.method.AbstractMethodSecurityMetadataSource; import org.springframework.util.ClassUtils; /** @@ -75,7 +75,7 @@ public class ExpressionAnnotationMethodSecurityMetadataSource extends AbstractMe } /** - * See {@link org.springframework.security.intercept.method.AbstractFallbackMethodSecurityMetadataSource#getAttributes(Method, Class)} + * See {@link org.springframework.security.access.intercept.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. */ diff --git a/core/src/main/java/org/springframework/security/expression/method/MethodExpressionAfterInvocationProvider.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionAfterInvocationProvider.java similarity index 85% rename from core/src/main/java/org/springframework/security/expression/method/MethodExpressionAfterInvocationProvider.java rename to core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionAfterInvocationProvider.java index 5c41dfc8ba..aaa02d859f 100644 --- a/core/src/main/java/org/springframework/security/expression/method/MethodExpressionAfterInvocationProvider.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionAfterInvocationProvider.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.method; +package org.springframework.security.access.expression.method; import java.util.List; @@ -7,13 +7,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.afterinvocation.AfterInvocationProvider; -import org.springframework.security.expression.ExpressionUtils; -import org.springframework.security.expression.MethodSecurityExpressionHandler; -import org.springframework.security.expression.support.DefaultMethodSecurityExpressionHandler; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.expression.ExpressionUtils; +import org.springframework.security.access.expression.MethodSecurityExpressionHandler; +import org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler; +import org.springframework.security.access.intercept.AfterInvocationProvider; /** * AfterInvocationProvider which handles the @PostAuthorize and @PostFilter annotation expressions. diff --git a/core/src/main/java/org/springframework/security/expression/method/MethodExpressionVoter.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionVoter.java similarity index 89% rename from core/src/main/java/org/springframework/security/expression/method/MethodExpressionVoter.java rename to core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionVoter.java index c105751e9f..20c7359835 100644 --- a/core/src/main/java/org/springframework/security/expression/method/MethodExpressionVoter.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionVoter.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.method; +package org.springframework.security.access.expression.method; import java.util.Collection; import java.util.List; @@ -9,11 +9,11 @@ import org.apache.commons.logging.LogFactory; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.expression.ExpressionUtils; -import org.springframework.security.expression.MethodSecurityExpressionHandler; -import org.springframework.security.expression.support.DefaultMethodSecurityExpressionHandler; -import org.springframework.security.vote.AccessDecisionVoter; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.expression.ExpressionUtils; +import org.springframework.security.access.expression.MethodSecurityExpressionHandler; +import org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler; +import org.springframework.security.access.vote.AccessDecisionVoter; /** * Voter which performs the actions for @PreFilter and @PostAuthorize annotations. diff --git a/core/src/main/java/org/springframework/security/expression/method/PostInvocationExpressionAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java similarity index 90% rename from core/src/main/java/org/springframework/security/expression/method/PostInvocationExpressionAttribute.java rename to core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java index c8e7c26ea6..ec62866e07 100644 --- a/core/src/main/java/org/springframework/security/expression/method/PostInvocationExpressionAttribute.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.method; +package org.springframework.security.access.expression.method; import org.springframework.expression.Expression; import org.springframework.expression.ParseException; diff --git a/core/src/main/java/org/springframework/security/expression/method/PreInvocationExpressionAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java similarity index 94% rename from core/src/main/java/org/springframework/security/expression/method/PreInvocationExpressionAttribute.java rename to core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java index ef54b67725..a9be7b45b1 100644 --- a/core/src/main/java/org/springframework/security/expression/method/PreInvocationExpressionAttribute.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.method; +package org.springframework.security.access.expression.method; import org.springframework.expression.Expression; import org.springframework.expression.ParseException; diff --git a/core/src/main/java/org/springframework/security/access/expression/support/AbstractSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/support/AbstractSecurityExpressionHandler.java new file mode 100644 index 0000000000..a1a90f2f3a --- /dev/null +++ b/core/src/main/java/org/springframework/security/access/expression/support/AbstractSecurityExpressionHandler.java @@ -0,0 +1,5 @@ +package org.springframework.security.access.expression.support; + +public class AbstractSecurityExpressionHandler { + +} diff --git a/core/src/main/java/org/springframework/security/expression/support/DefaultMethodSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java similarity index 94% rename from core/src/main/java/org/springframework/security/expression/support/DefaultMethodSecurityExpressionHandler.java rename to core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java index dd6661ba91..48f7afffd2 100644 --- a/core/src/main/java/org/springframework/security/expression/support/DefaultMethodSecurityExpressionHandler.java +++ b/core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.support; +package org.springframework.security.access.expression.support; import java.lang.reflect.Array; import java.util.ArrayList; @@ -17,9 +17,9 @@ import org.springframework.expression.spel.antlr.SpelAntlrExpressionParser; import org.springframework.security.Authentication; import org.springframework.security.AuthenticationTrustResolver; import org.springframework.security.AuthenticationTrustResolverImpl; -import org.springframework.security.expression.ExpressionUtils; -import org.springframework.security.expression.PermissionEvaluator; -import org.springframework.security.expression.MethodSecurityExpressionHandler; +import org.springframework.security.access.expression.ExpressionUtils; +import org.springframework.security.access.expression.MethodSecurityExpressionHandler; +import org.springframework.security.access.expression.PermissionEvaluator; /** * The standard implementation of SecurityExpressionHandler. diff --git a/core/src/main/java/org/springframework/security/expression/support/DenyAllPermissionEvaluator.java b/core/src/main/java/org/springframework/security/access/expression/support/DenyAllPermissionEvaluator.java similarity index 89% rename from core/src/main/java/org/springframework/security/expression/support/DenyAllPermissionEvaluator.java rename to core/src/main/java/org/springframework/security/access/expression/support/DenyAllPermissionEvaluator.java index 6c07502cce..035ba3c8b8 100644 --- a/core/src/main/java/org/springframework/security/expression/support/DenyAllPermissionEvaluator.java +++ b/core/src/main/java/org/springframework/security/access/expression/support/DenyAllPermissionEvaluator.java @@ -1,11 +1,11 @@ -package org.springframework.security.expression.support; +package org.springframework.security.access.expression.support; import java.io.Serializable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.security.Authentication; -import org.springframework.security.expression.PermissionEvaluator; +import org.springframework.security.access.expression.PermissionEvaluator; /** * A null PermissionEvaluator which denies all access. Used by default for situations when permission diff --git a/core/src/main/java/org/springframework/security/expression/support/MethodSecurityEvaluationContext.java b/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityEvaluationContext.java similarity index 97% rename from core/src/main/java/org/springframework/security/expression/support/MethodSecurityEvaluationContext.java rename to core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityEvaluationContext.java index 0aef42ebac..4d1198b4d5 100644 --- a/core/src/main/java/org/springframework/security/expression/support/MethodSecurityEvaluationContext.java +++ b/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityEvaluationContext.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.support; +package org.springframework.security.access.expression.support; import java.lang.reflect.Method; diff --git a/core/src/main/java/org/springframework/security/expression/support/MethodSecurityExpressionRoot.java b/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRoot.java similarity index 91% rename from core/src/main/java/org/springframework/security/expression/support/MethodSecurityExpressionRoot.java rename to core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRoot.java index b061e50237..292cb4eb01 100644 --- a/core/src/main/java/org/springframework/security/expression/support/MethodSecurityExpressionRoot.java +++ b/core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRoot.java @@ -1,9 +1,9 @@ -package org.springframework.security.expression.support; +package org.springframework.security.access.expression.support; import java.io.Serializable; import org.springframework.security.Authentication; -import org.springframework.security.expression.PermissionEvaluator; +import org.springframework.security.access.expression.PermissionEvaluator; /** diff --git a/core/src/main/java/org/springframework/security/expression/support/SecurityExpressionRoot.java b/core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java similarity index 97% rename from core/src/main/java/org/springframework/security/expression/support/SecurityExpressionRoot.java rename to core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java index 03fcfbeb5f..b7d89a6eb8 100644 --- a/core/src/main/java/org/springframework/security/expression/support/SecurityExpressionRoot.java +++ b/core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.support; +package org.springframework.security.access.expression.support; import java.util.Set; diff --git a/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/CycleInRoleHierarchyException.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/CycleInRoleHierarchyException.java similarity index 90% rename from core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/CycleInRoleHierarchyException.java rename to core/src/main/java/org/springframework/security/access/hierarchicalroles/CycleInRoleHierarchyException.java index 131b37877a..3e1588d10a 100755 --- a/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/CycleInRoleHierarchyException.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/CycleInRoleHierarchyException.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.springframework.security.userdetails.hierarchicalroles; +package org.springframework.security.access.hierarchicalroles; /** * Exception that is thrown because of a cycle in the role hierarchy definition diff --git a/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchy.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java similarity index 92% rename from core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchy.java rename to core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java index 8cae4ca393..f08ee94e68 100755 --- a/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchy.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.springframework.security.userdetails.hierarchicalroles; +package org.springframework.security.access.hierarchicalroles; import java.util.List; diff --git a/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImpl.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java similarity index 96% rename from core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImpl.java rename to core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java index b98ece9955..a639c34b05 100755 --- a/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImpl.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.springframework.security.userdetails.hierarchicalroles; +package org.springframework.security.access.hierarchicalroles; import org.springframework.security.GrantedAuthority; diff --git a/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapper.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapper.java similarity index 94% rename from core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapper.java rename to core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapper.java index 97c2e990a9..528fa04cdb 100755 --- a/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapper.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapper.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.springframework.security.userdetails.hierarchicalroles; +package org.springframework.security.access.hierarchicalroles; import org.springframework.security.userdetails.UserDetails; import org.springframework.security.userdetails.UserDetailsService; diff --git a/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapper.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java similarity index 94% rename from core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapper.java rename to core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java index f9a4b678f0..5cb67b8bba 100755 --- a/core/src/main/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapper.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapper.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.springframework.security.userdetails.hierarchicalroles; +package org.springframework.security.access.hierarchicalroles; import java.util.List; diff --git a/core/src/main/java/org/springframework/security/intercept/AbstractSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java similarity index 96% rename from core/src/main/java/org/springframework/security/intercept/AbstractSecurityInterceptor.java rename to core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java index afd9dcb456..741b6943ed 100644 --- a/core/src/main/java/org/springframework/security/intercept/AbstractSecurityInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept; +package org.springframework.security.access.intercept; import java.util.Collection; import java.util.HashSet; @@ -29,21 +29,18 @@ import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.MessageSource; import org.springframework.context.MessageSourceAware; import org.springframework.context.support.MessageSourceAccessor; -import org.springframework.security.AccessDecisionManager; -import org.springframework.security.AccessDeniedException; -import org.springframework.security.AfterInvocationManager; import org.springframework.security.Authentication; import org.springframework.security.AuthenticationCredentialsNotFoundException; import org.springframework.security.AuthenticationManager; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.RunAsManager; import org.springframework.security.SpringSecurityMessageSource; +import org.springframework.security.access.AccessDecisionManager; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.AuthenticationCredentialsNotFoundEvent; +import org.springframework.security.access.AuthorizationFailureEvent; +import org.springframework.security.access.AuthorizedEvent; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.PublicInvocationEvent; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.event.authorization.AuthenticationCredentialsNotFoundEvent; -import org.springframework.security.event.authorization.AuthorizationFailureEvent; -import org.springframework.security.event.authorization.AuthorizedEvent; -import org.springframework.security.event.authorization.PublicInvocationEvent; -import org.springframework.security.runas.NullRunAsManager; import org.springframework.util.Assert; /** diff --git a/core/src/main/java/org/springframework/security/AfterInvocationManager.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java similarity index 94% rename from core/src/main/java/org/springframework/security/AfterInvocationManager.java rename to core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java index 6853642242..7dc567955f 100644 --- a/core/src/main/java/org/springframework/security/AfterInvocationManager.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java @@ -13,10 +13,14 @@ * limitations under the License. */ -package org.springframework.security; +package org.springframework.security.access.intercept; import java.util.List; +import org.springframework.security.Authentication; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; + /** * Reviews the Object returned from a secure object invocation, * being able to modify the Object or throw an {@link diff --git a/core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProvider.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProvider.java similarity index 92% rename from core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProvider.java rename to core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProvider.java index 2e16df4603..7baadf7ba9 100644 --- a/core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProvider.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProvider.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.springframework.security.afterinvocation; +package org.springframework.security.access.intercept; import java.util.List; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; /** diff --git a/core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProviderManager.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java similarity index 95% rename from core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProviderManager.java rename to core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java index 7ad8e5ab7a..6afe1f3148 100644 --- a/core/src/main/java/org/springframework/security/afterinvocation/AfterInvocationProviderManager.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.afterinvocation; +package org.springframework.security.access.intercept; import java.util.ArrayList; import java.util.List; @@ -21,10 +21,9 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.security.AccessDeniedException; -import org.springframework.security.AfterInvocationManager; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/springframework/security/intercept/InterceptorStatusToken.java b/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java similarity index 89% rename from core/src/main/java/org/springframework/security/intercept/InterceptorStatusToken.java rename to core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java index 89468796c1..7fdfdf3d7a 100644 --- a/core/src/main/java/org/springframework/security/intercept/InterceptorStatusToken.java +++ b/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java @@ -13,19 +13,19 @@ * limitations under the License. */ -package org.springframework.security.intercept; +package org.springframework.security.access.intercept; import java.util.List; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; /** * A return object received by {@link AbstractSecurityInterceptor} subclasses. *

* This class reflects the status of the security interception, so that the final call to - * {@link org.springframework.security.intercept.AbstractSecurityInterceptor#afterInvocation(InterceptorStatusToken, Object)} + * {@link org.springframework.security.access.intercept.AbstractSecurityInterceptor#afterInvocation(InterceptorStatusToken, Object)} * can tidy up correctly. * * @author Ben Alex diff --git a/core/src/main/java/org/springframework/security/runas/NullRunAsManager.java b/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java similarity index 86% rename from core/src/main/java/org/springframework/security/runas/NullRunAsManager.java rename to core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java index a4068ee536..1a9ad1a6d6 100644 --- a/core/src/main/java/org/springframework/security/runas/NullRunAsManager.java +++ b/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java @@ -13,13 +13,12 @@ * limitations under the License. */ -package org.springframework.security.runas; +package org.springframework.security.access.intercept; import java.util.List; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.RunAsManager; +import org.springframework.security.access.ConfigAttribute; /** @@ -30,7 +29,7 @@ import org.springframework.security.RunAsManager; * @author Ben Alex * @version $Id$ */ -public class NullRunAsManager implements RunAsManager { +final class NullRunAsManager implements RunAsManager { //~ Methods ======================================================================================================== public Authentication buildRunAs(Authentication authentication, Object object, List config) { diff --git a/core/src/main/java/org/springframework/security/runas/RunAsImplAuthenticationProvider.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java similarity index 98% rename from core/src/main/java/org/springframework/security/runas/RunAsImplAuthenticationProvider.java rename to core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java index 37161efc5b..33b3caa3af 100644 --- a/core/src/main/java/org/springframework/security/runas/RunAsImplAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.runas; +package org.springframework.security.access.intercept; import org.springframework.security.SpringSecurityMessageSource; import org.springframework.security.Authentication; diff --git a/core/src/main/java/org/springframework/security/RunAsManager.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java similarity index 94% rename from core/src/main/java/org/springframework/security/RunAsManager.java rename to core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java index 5172a19d31..1efc9921e3 100644 --- a/core/src/main/java/org/springframework/security/RunAsManager.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java @@ -13,10 +13,13 @@ * limitations under the License. */ -package org.springframework.security; +package org.springframework.security.access.intercept; import java.util.List; +import org.springframework.security.Authentication; +import org.springframework.security.access.ConfigAttribute; + /** * Creates a new temporary {@link Authentication} object for the current secure * object invocation only. @@ -25,7 +28,7 @@ import java.util.List; * This interface permits implementations to replace the * Authentication object that applies to the current secure * object invocation only. The {@link - * org.springframework.security.intercept.AbstractSecurityInterceptor} will replace + * org.springframework.security.access.intercept.AbstractSecurityInterceptor} will replace * the Authentication object held in the * {@link org.springframework.security.context.SecurityContext SecurityContext} * for the duration of the secure object callback only, returning it to diff --git a/core/src/main/java/org/springframework/security/runas/RunAsManagerImpl.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java similarity index 97% rename from core/src/main/java/org/springframework/security/runas/RunAsManagerImpl.java rename to core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java index aaaf744c59..1641f67548 100644 --- a/core/src/main/java/org/springframework/security/runas/RunAsManagerImpl.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java @@ -13,17 +13,16 @@ * limitations under the License. */ -package org.springframework.security.runas; +package org.springframework.security.access.intercept; import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.RunAsManager; +import org.springframework.security.access.ConfigAttribute; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/springframework/security/runas/RunAsUserToken.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java similarity index 98% rename from core/src/main/java/org/springframework/security/runas/RunAsUserToken.java rename to core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java index 586b0c4c45..8ee38c096d 100644 --- a/core/src/main/java/org/springframework/security/runas/RunAsUserToken.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.runas; +package org.springframework.security.access.intercept; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/org/springframework/security/intercept/SecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/intercept/SecurityMetadataSource.java similarity index 95% rename from core/src/main/java/org/springframework/security/intercept/SecurityMetadataSource.java rename to core/src/main/java/org/springframework/security/access/intercept/SecurityMetadataSource.java index b6a854b34d..2a70dd01ed 100644 --- a/core/src/main/java/org/springframework/security/intercept/SecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/intercept/SecurityMetadataSource.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.springframework.security.intercept; +package org.springframework.security.access.intercept; import java.util.Collection; import java.util.List; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; /** diff --git a/core/src/main/java/org/springframework/security/intercept/method/AbstractFallbackMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/intercept/method/AbstractFallbackMethodSecurityMetadataSource.java similarity index 97% rename from core/src/main/java/org/springframework/security/intercept/method/AbstractFallbackMethodSecurityMetadataSource.java rename to core/src/main/java/org/springframework/security/access/intercept/method/AbstractFallbackMethodSecurityMetadataSource.java index b49cd768b8..c20d9cb6f4 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/AbstractFallbackMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/AbstractFallbackMethodSecurityMetadataSource.java @@ -1,9 +1,9 @@ -package org.springframework.security.intercept.method; +package org.springframework.security.access.intercept.method; import java.lang.reflect.Method; import java.util.List; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; import org.springframework.util.ClassUtils; /** diff --git a/core/src/main/java/org/springframework/security/intercept/method/AbstractMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/intercept/method/AbstractMethodSecurityMetadataSource.java similarity index 95% rename from core/src/main/java/org/springframework/security/intercept/method/AbstractMethodSecurityMetadataSource.java rename to core/src/main/java/org/springframework/security/access/intercept/method/AbstractMethodSecurityMetadataSource.java index 4dfc38eb87..78b0602e9d 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/AbstractMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/AbstractMethodSecurityMetadataSource.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.springframework.security.intercept.method; +package org.springframework.security.access.intercept.method; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; import org.aopalliance.intercept.MethodInvocation; diff --git a/core/src/main/java/org/springframework/security/intercept/method/DelegatingMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/intercept/method/DelegatingMethodSecurityMetadataSource.java similarity index 97% rename from core/src/main/java/org/springframework/security/intercept/method/DelegatingMethodSecurityMetadataSource.java rename to core/src/main/java/org/springframework/security/access/intercept/method/DelegatingMethodSecurityMetadataSource.java index 90a47707a3..2d1cff53d0 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/DelegatingMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/DelegatingMethodSecurityMetadataSource.java @@ -1,4 +1,4 @@ -package org.springframework.security.intercept.method; +package org.springframework.security.access.intercept.method; import java.lang.reflect.Method; import java.util.Collection; @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Set; import org.springframework.beans.factory.InitializingBean; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/core/src/main/java/org/springframework/security/intercept/method/MapBasedMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSource.java similarity index 98% rename from core/src/main/java/org/springframework/security/intercept/method/MapBasedMethodSecurityMetadataSource.java rename to core/src/main/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSource.java index 0ff788bd83..3b9fec30b8 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/MapBasedMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSource.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.method; +package org.springframework.security.access.intercept.method; import java.lang.reflect.Method; import java.util.ArrayList; @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; import org.springframework.beans.factory.BeanClassLoaderAware; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; diff --git a/core/src/main/java/org/springframework/security/intercept/method/MethodInvocationPrivilegeEvaluator.java b/core/src/main/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluator.java similarity index 90% rename from core/src/main/java/org/springframework/security/intercept/method/MethodInvocationPrivilegeEvaluator.java rename to core/src/main/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluator.java index ccc82521c9..1014182bfb 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/MethodInvocationPrivilegeEvaluator.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluator.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.method; +package org.springframework.security.access.intercept.method; import java.util.List; @@ -21,17 +21,17 @@ import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.intercept.AbstractSecurityInterceptor; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.intercept.AbstractSecurityInterceptor; import org.springframework.util.Assert; /** * Allows users to determine whether they have "before invocation" privileges for a given method invocation. *

- * Of course, if an {@link org.springframework.security.AfterInvocationManager} is used to authorize the + * Of course, if an {@link org.springframework.security.access.intercept.AfterInvocationManager} is used to authorize the * result of a method invocation, this class cannot assist determine whether or not the * AfterInvocationManager will enable * access. Instead this class aims to allow applications to determine whether or not the current principal would be diff --git a/core/src/main/java/org/springframework/security/intercept/method/MethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSource.java similarity index 83% rename from core/src/main/java/org/springframework/security/intercept/method/MethodSecurityMetadataSource.java rename to core/src/main/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSource.java index e3465465d4..c1c25a5f87 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/MethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSource.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.springframework.security.intercept.method; +package org.springframework.security.access.intercept.method; import java.lang.reflect.Method; import java.util.List; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.intercept.SecurityMetadataSource; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.intercept.SecurityMetadataSource; /** diff --git a/core/src/main/java/org/springframework/security/intercept/method/MethodSecurityMetadataSourceEditor.java b/core/src/main/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSourceEditor.java similarity index 93% rename from core/src/main/java/org/springframework/security/intercept/method/MethodSecurityMetadataSourceEditor.java rename to core/src/main/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSourceEditor.java index 6d68a22f73..d5f4352377 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/MethodSecurityMetadataSourceEditor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSourceEditor.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.method; +package org.springframework.security.access.intercept.method; import java.beans.PropertyEditorSupport; import java.util.ArrayList; @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Properties; import org.springframework.beans.propertyeditors.PropertiesEditor; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.SecurityConfig; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.SecurityConfig; import org.springframework.util.StringUtils; diff --git a/core/src/main/java/org/springframework/security/intercept/method/ProtectPointcutPostProcessor.java b/core/src/main/java/org/springframework/security/access/intercept/method/ProtectPointcutPostProcessor.java similarity index 96% rename from core/src/main/java/org/springframework/security/intercept/method/ProtectPointcutPostProcessor.java rename to core/src/main/java/org/springframework/security/access/intercept/method/ProtectPointcutPostProcessor.java index 5a78cc1875..2c102158a9 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/ProtectPointcutPostProcessor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/ProtectPointcutPostProcessor.java @@ -1,4 +1,4 @@ -package org.springframework.security.intercept.method; +package org.springframework.security.access.intercept.method; import java.lang.reflect.Method; import java.util.HashSet; @@ -14,8 +14,8 @@ import org.aspectj.weaver.tools.PointcutParser; import org.aspectj.weaver.tools.PointcutPrimitive; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.security.ConfigAttribute; -import org.springframework.security.intercept.method.aopalliance.MethodSecurityMetadataSourceAdvisor; +import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityMetadataSourceAdvisor; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/core/src/main/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityInterceptor.java similarity index 87% rename from core/src/main/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptor.java rename to core/src/main/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityInterceptor.java index 40c3114145..444faa0a44 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityInterceptor.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.springframework.security.intercept.method.aopalliance; +package org.springframework.security.access.intercept.method.aopalliance; -import org.springframework.security.intercept.AbstractSecurityInterceptor; -import org.springframework.security.intercept.InterceptorStatusToken; -import org.springframework.security.intercept.SecurityMetadataSource; -import org.springframework.security.intercept.method.MethodSecurityMetadataSource; +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.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/core/src/main/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisor.java b/core/src/main/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisor.java similarity index 97% rename from core/src/main/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisor.java rename to core/src/main/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisor.java index dafbff9367..4786c70d95 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisor.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.method.aopalliance; +package org.springframework.security.access.intercept.method.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.intercept.method.MethodSecurityMetadataSource; +import org.springframework.security.access.intercept.method.MethodSecurityMetadataSource; import org.springframework.util.Assert; /** diff --git a/core/src/main/java/org/springframework/security/intercept/method/aopalliance/package.html b/core/src/main/java/org/springframework/security/access/intercept/method/aopalliance/package.html similarity index 100% rename from core/src/main/java/org/springframework/security/intercept/method/aopalliance/package.html rename to core/src/main/java/org/springframework/security/access/intercept/method/aopalliance/package.html diff --git a/core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJAnnotationCallback.java b/core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJAnnotationCallback.java similarity index 84% rename from core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJAnnotationCallback.java rename to core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJAnnotationCallback.java index 3743570615..7c284ae4a6 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJAnnotationCallback.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJAnnotationCallback.java @@ -1,4 +1,4 @@ -package org.springframework.security.intercept.method.aspectj; +package org.springframework.security.access.intercept.method.aspectj; /** diff --git a/core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJAnnotationSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJAnnotationSecurityInterceptor.java similarity index 82% rename from core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJAnnotationSecurityInterceptor.java rename to core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJAnnotationSecurityInterceptor.java index c32b0d1730..79ea3da23c 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJAnnotationSecurityInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJAnnotationSecurityInterceptor.java @@ -1,9 +1,9 @@ -package org.springframework.security.intercept.method.aspectj; +package org.springframework.security.access.intercept.method.aspectj; -import org.springframework.security.intercept.AbstractSecurityInterceptor; -import org.springframework.security.intercept.InterceptorStatusToken; -import org.springframework.security.intercept.SecurityMetadataSource; -import org.springframework.security.intercept.method.MethodSecurityMetadataSource; +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.aspectj.lang.JoinPoint; diff --git a/core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJCallback.java b/core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJCallback.java similarity index 93% rename from core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJCallback.java rename to core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJCallback.java index e5aaf45a29..3f4f612427 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJCallback.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJCallback.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.method.aspectj; +package org.springframework.security.access.intercept.method.aspectj; /** * Called by the {@link AspectJSecurityInterceptor} when it wishes for the diff --git a/core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJSecurityInterceptor.java similarity index 88% rename from core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJSecurityInterceptor.java rename to core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJSecurityInterceptor.java index 05feb297af..d673bb11af 100644 --- a/core/src/main/java/org/springframework/security/intercept/method/aspectj/AspectJSecurityInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/method/aspectj/AspectJSecurityInterceptor.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.springframework.security.intercept.method.aspectj; +package org.springframework.security.access.intercept.method.aspectj; -import org.springframework.security.intercept.AbstractSecurityInterceptor; -import org.springframework.security.intercept.InterceptorStatusToken; -import org.springframework.security.intercept.SecurityMetadataSource; -import org.springframework.security.intercept.method.MethodSecurityMetadataSource; +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.aspectj.lang.JoinPoint; diff --git a/core/src/main/java/org/springframework/security/intercept/method/aspectj/package.html b/core/src/main/java/org/springframework/security/access/intercept/method/aspectj/package.html similarity index 100% rename from core/src/main/java/org/springframework/security/intercept/method/aspectj/package.html rename to core/src/main/java/org/springframework/security/access/intercept/method/aspectj/package.html diff --git a/core/src/main/java/org/springframework/security/intercept/method/package.html b/core/src/main/java/org/springframework/security/access/intercept/method/package.html similarity index 100% rename from core/src/main/java/org/springframework/security/intercept/method/package.html rename to core/src/main/java/org/springframework/security/access/intercept/method/package.html diff --git a/core/src/main/java/org/springframework/security/intercept/package.html b/core/src/main/java/org/springframework/security/access/intercept/package.html similarity index 87% rename from core/src/main/java/org/springframework/security/intercept/package.html rename to core/src/main/java/org/springframework/security/access/intercept/package.html index 0367103dd4..a28a64046e 100644 --- a/core/src/main/java/org/springframework/security/intercept/package.html +++ b/core/src/main/java/org/springframework/security/access/intercept/package.html @@ -17,8 +17,8 @@ objects or HTTP request URLs.

Each secure object typically has its own org.springframwork.security.intercept package. Each package usually includes a concrete security interceptor (which -subclasses {@link org.springframework.security.intercept.AbstractSecurityInterceptor}, -an appropriate {@link org.springframework.security.intercept.ObjectDefinitionSource} +subclasses {@link org.springframework.security.access.intercept.AbstractSecurityInterceptor}, +an appropriate {@link org.springframework.security.access.intercept.ObjectDefinitionSource} for the type of resources the secure object represents, and a property editor to populate the ObjectDefinitionSource. diff --git a/core/src/main/java/org/springframework/security/access/package.html b/core/src/main/java/org/springframework/security/access/package.html new file mode 100644 index 0000000000..7691e1e9e9 --- /dev/null +++ b/core/src/main/java/org/springframework/security/access/package.html @@ -0,0 +1,11 @@ + + +Core access-control related code, including +

+ + diff --git a/core/src/main/java/org/springframework/security/vote/AbstractAccessDecisionManager.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java similarity index 94% rename from core/src/main/java/org/springframework/security/vote/AbstractAccessDecisionManager.java rename to core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java index e9643c5b06..021a9bc38e 100644 --- a/core/src/main/java/org/springframework/security/vote/AbstractAccessDecisionManager.java +++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package org.springframework.security.vote; +package org.springframework.security.access.vote; import java.util.Iterator; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.security.AccessDecisionManager; -import org.springframework.security.AccessDeniedException; import org.springframework.security.SpringSecurityMessageSource; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.AccessDecisionManager; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.MessageSource; import org.springframework.context.MessageSourceAware; diff --git a/core/src/main/java/org/springframework/security/vote/AbstractAclVoter.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java similarity index 96% rename from core/src/main/java/org/springframework/security/vote/AbstractAclVoter.java rename to core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java index 2b624fdf07..f0deebff55 100644 --- a/core/src/main/java/org/springframework/security/vote/AbstractAclVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.vote; +package org.springframework.security.access.vote; -import org.springframework.security.AuthorizationServiceException; +import org.springframework.security.access.AuthorizationServiceException; import org.aopalliance.intercept.MethodInvocation; diff --git a/core/src/main/java/org/springframework/security/vote/AccessDecisionVoter.java b/core/src/main/java/org/springframework/security/access/vote/AccessDecisionVoter.java similarity index 94% rename from core/src/main/java/org/springframework/security/vote/AccessDecisionVoter.java rename to core/src/main/java/org/springframework/security/access/vote/AccessDecisionVoter.java index e79e622a93..5582523a11 100644 --- a/core/src/main/java/org/springframework/security/vote/AccessDecisionVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/AccessDecisionVoter.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.springframework.security.vote; +package org.springframework.security.access.vote; import java.util.List; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; /** @@ -27,7 +27,7 @@ import org.springframework.security.ConfigAttribute; *

* The coordination of voting (ie polling AccessDecisionVoters, * tallying their responses, and making the final authorization decision) is - * performed by an {@link org.springframework.security.AccessDecisionManager}. + * performed by an {@link org.springframework.security.access.AccessDecisionManager}. *

* * @author Ben Alex @@ -70,7 +70,7 @@ public interface AccessDecisionVoter { *

The decision must be affirmative (ACCESS_GRANTED), negative (ACCESS_DENIED) * or the AccessDecisionVoter can abstain (ACCESS_ABSTAIN) from voting. * Under no circumstances should implementing classes return any other value. If a weighting of results is desired, - * this should be handled in a custom {@link org.springframework.security.AccessDecisionManager} instead. + * this should be handled in a custom {@link org.springframework.security.access.AccessDecisionManager} instead. *

*

Unless an AccessDecisionVoter is specifically intended to vote on an access control * decision due to a passed method invocation or configuration attribute parameter, it must return diff --git a/core/src/main/java/org/springframework/security/vote/AffirmativeBased.java b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java similarity index 92% rename from core/src/main/java/org/springframework/security/vote/AffirmativeBased.java rename to core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java index 4b5d8f0941..6639a6dbee 100644 --- a/core/src/main/java/org/springframework/security/vote/AffirmativeBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package org.springframework.security.vote; +package org.springframework.security.access.vote; import java.util.List; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; /** - * Simple concrete implementation of {@link org.springframework.security.AccessDecisionManager} that grants access if any + * Simple concrete implementation of {@link org.springframework.security.access.AccessDecisionManager} that grants access if any * AccessDecisionVoter returns an affirmative response. */ public class AffirmativeBased extends AbstractAccessDecisionManager { diff --git a/core/src/main/java/org/springframework/security/vote/AuthenticatedVoter.java b/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java similarity index 97% rename from core/src/main/java/org/springframework/security/vote/AuthenticatedVoter.java rename to core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java index 2dde5b35e5..e70b683b75 100644 --- a/core/src/main/java/org/springframework/security/vote/AuthenticatedVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package org.springframework.security.vote; +package org.springframework.security.access.vote; import java.util.List; import org.springframework.security.Authentication; import org.springframework.security.AuthenticationTrustResolver; import org.springframework.security.AuthenticationTrustResolverImpl; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/springframework/security/vote/ConsensusBased.java b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java similarity index 94% rename from core/src/main/java/org/springframework/security/vote/ConsensusBased.java rename to core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java index cf16e1c6a9..b28ccfa563 100644 --- a/core/src/main/java/org/springframework/security/vote/ConsensusBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package org.springframework.security.vote; +package org.springframework.security.access.vote; import java.util.List; -import org.springframework.security.AccessDeniedException; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.access.ConfigAttribute; /** - * Simple concrete implementation of {@link org.springframework.security.AccessDecisionManager} that uses a + * Simple concrete implementation of {@link org.springframework.security.access.AccessDecisionManager} that uses a * consensus-based approach. *

* "Consensus" here means majority-rule (ignoring abstains) rather than unanimous agreement (ignoring abstains). diff --git a/core/src/main/java/org/springframework/security/vote/InterfaceBasedLabelParameterStrategy.java b/core/src/main/java/org/springframework/security/access/vote/InterfaceBasedLabelParameterStrategy.java similarity index 98% rename from core/src/main/java/org/springframework/security/vote/InterfaceBasedLabelParameterStrategy.java rename to core/src/main/java/org/springframework/security/access/vote/InterfaceBasedLabelParameterStrategy.java index 5edbaa2bf5..fd05070c32 100644 --- a/core/src/main/java/org/springframework/security/vote/InterfaceBasedLabelParameterStrategy.java +++ b/core/src/main/java/org/springframework/security/access/vote/InterfaceBasedLabelParameterStrategy.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.vote; +package org.springframework.security.access.vote; import java.lang.reflect.Method; diff --git a/core/src/main/java/org/springframework/security/vote/LabelBasedAclVoter.java b/core/src/main/java/org/springframework/security/access/vote/LabelBasedAclVoter.java similarity index 94% rename from core/src/main/java/org/springframework/security/vote/LabelBasedAclVoter.java rename to core/src/main/java/org/springframework/security/access/vote/LabelBasedAclVoter.java index da224dbc72..652cfe7462 100644 --- a/core/src/main/java/org/springframework/security/vote/LabelBasedAclVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/LabelBasedAclVoter.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.vote; +package org.springframework.security.access.vote; import java.util.ArrayList; import java.util.List; @@ -22,7 +22,7 @@ import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.security.Authentication; -import org.springframework.security.ConfigAttribute; +import org.springframework.security.access.ConfigAttribute; import org.springframework.util.Assert; @@ -43,7 +43,7 @@ import org.springframework.util.Assert; * @author Greg Turnquist * @version $Id$ * - * @see org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor + * @see org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor * @deprecated Use new spring-security-acl module instead */ public class LabelBasedAclVoter extends AbstractAclVoter { @@ -86,12 +86,12 @@ public class LabelBasedAclVoter extends AbstractAclVoter { * labels. An example application context configuration of a labelMap: * * 

-     * <bean id="accessDecisionManager" class="org.springframework.security.vote.UnanimousBased">
+     * <bean id="accessDecisionManager" class="org.springframework.security.access.vote.UnanimousBased">
      *     <property name="allowIfAllAbstainDecisions"><value>false</value></property>
      *     <property name="decisionVoters">
      *       <list>
-     *         <bean class="org.springframework.security.vote.RoleVoter"/>
-     *         <bean class="org.springframework.security.vote.LabelBasedAclVoter">
+     *         <bean class="org.springframework.security.access.vote.RoleVoter"/>
+     *         <bean class="org.springframework.security.access.vote.LabelBasedAclVoter">
      *           <property name="attributeIndicatingLabeledOperation">
      *             <value>LABELED_OPERATION</value>
      *           </property>
@@ -140,8 +140,8 @@ public class LabelBasedAclVoter extends AbstractAclVoter {
      * This acl voter will only evaluate labeled methods if they are marked in the security interceptor's
      * configuration with the attribute stored in attributeIndicatingLabeledOperation.
      *
-     * @see org.springframework.security.vote.AbstractAclVoter
-     * @see org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor
+     * @see org.springframework.security.access.vote.AbstractAclVoter
+     * @see org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor
      */
     public boolean supports(ConfigAttribute attribute) {
         if (attribute.getAttribute().equals(attributeIndicatingLabeledOperation)) {
diff --git a/core/src/main/java/org/springframework/security/vote/LabelParameterStrategy.java b/core/src/main/java/org/springframework/security/access/vote/LabelParameterStrategy.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/vote/LabelParameterStrategy.java
rename to core/src/main/java/org/springframework/security/access/vote/LabelParameterStrategy.java
index da4612dfbc..6640654175 100644
--- a/core/src/main/java/org/springframework/security/vote/LabelParameterStrategy.java
+++ b/core/src/main/java/org/springframework/security/access/vote/LabelParameterStrategy.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import java.lang.reflect.Method;
 
diff --git a/core/src/main/java/org/springframework/security/vote/LabeledData.java b/core/src/main/java/org/springframework/security/access/vote/LabeledData.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/vote/LabeledData.java
rename to core/src/main/java/org/springframework/security/access/vote/LabeledData.java
index cb5c9e7665..3517dc900e 100644
--- a/core/src/main/java/org/springframework/security/vote/LabeledData.java
+++ b/core/src/main/java/org/springframework/security/access/vote/LabeledData.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 /**
  * This interface indicates data objects that carry a label. The purpose is to support
diff --git a/core/src/main/java/org/springframework/security/vote/RoleHierarchyVoter.java b/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java
similarity index 88%
rename from core/src/main/java/org/springframework/security/vote/RoleHierarchyVoter.java
rename to core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java
index 400f89a38c..840979b762 100644
--- a/core/src/main/java/org/springframework/security/vote/RoleHierarchyVoter.java
+++ b/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java
@@ -1,10 +1,10 @@
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import java.util.List;
 
 import org.springframework.security.Authentication;
 import org.springframework.security.GrantedAuthority;
-import org.springframework.security.userdetails.hierarchicalroles.RoleHierarchy;
+import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
 import org.springframework.util.Assert;
 
 /**
diff --git a/core/src/main/java/org/springframework/security/vote/RoleVoter.java b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java
similarity index 97%
rename from core/src/main/java/org/springframework/security/vote/RoleVoter.java
rename to core/src/main/java/org/springframework/security/access/vote/RoleVoter.java
index 2af79dd4d6..3b60a75b31 100644
--- a/core/src/main/java/org/springframework/security/vote/RoleVoter.java
+++ b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import java.util.List;
 
 import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
 import org.springframework.security.GrantedAuthority;
+import org.springframework.security.access.ConfigAttribute;
 
 /**
  * Votes if any {@link ConfigAttribute#getAttribute()} starts with a prefix
diff --git a/core/src/main/java/org/springframework/security/vote/UnanimousBased.java b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java
similarity index 93%
rename from core/src/main/java/org/springframework/security/vote/UnanimousBased.java
rename to core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java
index 0aa349f20c..36068f4bd8 100644
--- a/core/src/main/java/org/springframework/security/vote/UnanimousBased.java
+++ b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.ConfigAttribute;
 
 
 /**
- * Simple concrete implementation of  {@link org.springframework.security.AccessDecisionManager} that requires all
+ * Simple concrete implementation of  {@link org.springframework.security.access.AccessDecisionManager} that requires all
  * voters to abstain or grant access.
  */
 public class UnanimousBased extends AbstractAccessDecisionManager {
diff --git a/core/src/main/java/org/springframework/security/vote/package.html b/core/src/main/java/org/springframework/security/access/vote/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/security/vote/package.html
rename to core/src/main/java/org/springframework/security/access/vote/package.html
diff --git a/core/src/main/java/org/springframework/security/afterinvocation/package.html b/core/src/main/java/org/springframework/security/afterinvocation/package.html
deleted file mode 100644
index 9446663d6b..0000000000
--- a/core/src/main/java/org/springframework/security/afterinvocation/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-Used for post-processing of an object returned from a secure object invocation.
-
-
diff --git a/core/src/main/java/org/springframework/security/event/authorization/package.html b/core/src/main/java/org/springframework/security/event/authorization/package.html
deleted file mode 100644
index bfc42fba44..0000000000
--- a/core/src/main/java/org/springframework/security/event/authorization/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-Provides support objects for security event interception (ie authorization).
-
-
diff --git a/core/src/main/java/org/springframework/security/expression/support/AbstractSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/expression/support/AbstractSecurityExpressionHandler.java
deleted file mode 100644
index cd684edd6a..0000000000
--- a/core/src/main/java/org/springframework/security/expression/support/AbstractSecurityExpressionHandler.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.springframework.security.expression.support;
-
-public class AbstractSecurityExpressionHandler {
-
-}
diff --git a/core/src/main/java/org/springframework/security/userdetails/checker/AccountStatusUserDetailsChecker.java b/core/src/main/java/org/springframework/security/providers/AccountStatusUserDetailsChecker.java
similarity index 96%
rename from core/src/main/java/org/springframework/security/userdetails/checker/AccountStatusUserDetailsChecker.java
rename to core/src/main/java/org/springframework/security/providers/AccountStatusUserDetailsChecker.java
index 378048b401..de28c595c4 100644
--- a/core/src/main/java/org/springframework/security/userdetails/checker/AccountStatusUserDetailsChecker.java
+++ b/core/src/main/java/org/springframework/security/providers/AccountStatusUserDetailsChecker.java
@@ -1,4 +1,4 @@
-package org.springframework.security.userdetails.checker;
+package org.springframework.security.providers;
 
 import org.springframework.security.userdetails.UserDetailsChecker;
 import org.springframework.security.userdetails.UserDetails;
diff --git a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java b/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java
index 30c98416a3..d92a30caa1 100644
--- a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java
@@ -7,11 +7,11 @@ import org.springframework.core.Ordered;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.BadCredentialsException;
+import org.springframework.security.providers.AccountStatusUserDetailsChecker;
 import org.springframework.security.providers.AuthenticationProvider;
 import org.springframework.security.userdetails.AuthenticationUserDetailsService;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UserDetailsChecker;
-import org.springframework.security.userdetails.checker.AccountStatusUserDetailsChecker;
 import org.springframework.util.Assert;
 
 /**
diff --git a/core/src/main/java/org/springframework/security/userdetails/GroupManager.java b/core/src/main/java/org/springframework/security/provisioning/GroupManager.java
similarity index 98%
rename from core/src/main/java/org/springframework/security/userdetails/GroupManager.java
rename to core/src/main/java/org/springframework/security/provisioning/GroupManager.java
index ac492ebd0e..712d6829a7 100644
--- a/core/src/main/java/org/springframework/security/userdetails/GroupManager.java
+++ b/core/src/main/java/org/springframework/security/provisioning/GroupManager.java
@@ -1,4 +1,4 @@
-package org.springframework.security.userdetails;
+package org.springframework.security.provisioning;
 
 import java.util.List;
 
diff --git a/core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
similarity index 98%
rename from core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManager.java
rename to core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
index 50d9570215..9f6f3c8e71 100644
--- a/core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManager.java
+++ b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
@@ -1,19 +1,18 @@
-package org.springframework.security.userdetails.jdbc;
+package org.springframework.security.provisioning;
 
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.AuthenticationManager;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
 import org.springframework.security.util.AuthorityUtils;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.userdetails.UserCache;
 import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsManager;
-import org.springframework.security.userdetails.GroupManager;
 import org.springframework.security.userdetails.cache.NullUserCache;
+import org.springframework.security.userdetails.jdbc.JdbcDaoImpl;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.jdbc.core.PreparedStatementSetter;
diff --git a/core/src/main/java/org/springframework/security/userdetails/UserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java
similarity index 83%
rename from core/src/main/java/org/springframework/security/userdetails/UserDetailsManager.java
rename to core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java
index 1daea3a711..a464bd6a50 100644
--- a/core/src/main/java/org/springframework/security/userdetails/UserDetailsManager.java
+++ b/core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java
@@ -1,4 +1,7 @@
-package org.springframework.security.userdetails;
+package org.springframework.security.provisioning;
+
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsService;
 
 /**
  * An extension of the {@link UserDetailsService} which provides the ability
diff --git a/core/src/main/java/org/springframework/security/provisioning/package.html b/core/src/main/java/org/springframework/security/provisioning/package.html
new file mode 100644
index 0000000000..f0dd2b0856
--- /dev/null
+++ b/core/src/main/java/org/springframework/security/provisioning/package.html
@@ -0,0 +1,6 @@
+
+
+
Contains simple user and authority group account provisioning interfaces together with a
+a JDBC-based implementation.

+
+
diff --git a/core/src/main/java/org/springframework/security/runas/package.html b/core/src/main/java/org/springframework/security/runas/package.html
deleted file mode 100644
index 0ab08f2463..0000000000
--- a/core/src/main/java/org/springframework/security/runas/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-Allows secure objects to be run under a different authentication identity.
-
-
diff --git a/core/src/main/java/org/springframework/security/userdetails/UserDetailsChecker.java b/core/src/main/java/org/springframework/security/userdetails/UserDetailsChecker.java
index 3de1621e12..950c5ec703 100644
--- a/core/src/main/java/org/springframework/security/userdetails/UserDetailsChecker.java
+++ b/core/src/main/java/org/springframework/security/userdetails/UserDetailsChecker.java
@@ -1,21 +1,19 @@
 package org.springframework.security.userdetails;
 
-import org.springframework.security.userdetails.checker.AccountStatusUserDetailsChecker;
-
 /**
- * Called by classes which make use of a {@link UserDetailsService} to check the status of the loaded 
+ * Called by classes which make use of a {@link UserDetailsService} to check the status of the loaded
  * UserDetails object. Typically this will involve examining the various flags associated with the account and
- * raising an exception if the information cannot be used (for example if the user account is locked or disabled), but 
+ * raising an exception if the information cannot be used (for example if the user account is locked or disabled), but
  * a custom implementation could perform any checks it wished.
- * 
 
+ * 

  * The intention is that this interface should only be used for checks on the persistent data associated with the user.
- * It should not involved in making any authentication decisions based on a submitted authentication request. 
- * 
+ * It should not involved in making any authentication decisions based on a submitted authentication request.
+ *
  * @author Luke Taylor
  * @version $Id$
  * @since 2.0
- * 
- * @see AccountStatusUserDetailsChecker
+ *
+ * @see org.springframework.security.providers.AccountStatusUserDetailsChecker
  * @see org.springframework.security.AccountStatusException
  */
 public interface UserDetailsChecker {
diff --git a/core/src/test/java/org/springframework/security/SecurityConfigTests.java b/core/src/test/java/org/springframework/security/SecurityConfigTests.java
index 5927a82e76..2cea5a5d26 100644
--- a/core/src/test/java/org/springframework/security/SecurityConfigTests.java
+++ b/core/src/test/java/org/springframework/security/SecurityConfigTests.java
@@ -18,6 +18,8 @@ package org.springframework.security;
 import junit.framework.Assert;
 
 import org.junit.Test;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
 
 
 /**
diff --git a/core/src/test/java/org/springframework/security/event/authorization/AuthenticationCredentialsNotFoundEventTests.java b/core/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java
similarity index 90%
rename from core/src/test/java/org/springframework/security/event/authorization/AuthenticationCredentialsNotFoundEventTests.java
rename to core/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java
index 18a41ec388..3514d82102 100644
--- a/core/src/test/java/org/springframework/security/event/authorization/AuthenticationCredentialsNotFoundEventTests.java
+++ b/core/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java
@@ -13,11 +13,12 @@
  * limitations under the License.
  */
 
-package org.springframework.security.event.authorization;
+package org.springframework.security.access;
 
 import org.junit.Test;
 import org.springframework.security.AuthenticationCredentialsNotFoundException;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.AuthenticationCredentialsNotFoundEvent;
+import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.util.SimpleMethodInvocation;
 
 
diff --git a/core/src/test/java/org/springframework/security/event/authorization/AuthorizationFailureEventTests.java b/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java
similarity index 89%
rename from core/src/test/java/org/springframework/security/event/authorization/AuthorizationFailureEventTests.java
rename to core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java
index 43e3768f08..cf9c61aef0 100644
--- a/core/src/test/java/org/springframework/security/event/authorization/AuthorizationFailureEventTests.java
+++ b/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java
@@ -13,11 +13,12 @@
  * limitations under the License.
  */
 
-package org.springframework.security.event.authorization;
+package org.springframework.security.access;
 
 import org.junit.Test;
-import org.springframework.security.AccessDeniedException;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.AuthorizationFailureEvent;
+import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.util.SimpleMethodInvocation;
 
diff --git a/core/src/test/java/org/springframework/security/event/authorization/AuthorizedEventTests.java b/core/src/test/java/org/springframework/security/access/AuthorizedEventTests.java
similarity index 90%
rename from core/src/test/java/org/springframework/security/event/authorization/AuthorizedEventTests.java
rename to core/src/test/java/org/springframework/security/access/AuthorizedEventTests.java
index 5bff1fdf51..64b266ad9d 100644
--- a/core/src/test/java/org/springframework/security/event/authorization/AuthorizedEventTests.java
+++ b/core/src/test/java/org/springframework/security/access/AuthorizedEventTests.java
@@ -13,10 +13,11 @@
  * limitations under the License.
  */
 
-package org.springframework.security.event.authorization;
+package org.springframework.security.access;
 
 import org.junit.Test;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.AuthorizedEvent;
+import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.util.SimpleMethodInvocation;
 
diff --git a/core/src/test/java/org/springframework/security/annotation/BusinessService.java b/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java
similarity index 89%
rename from core/src/test/java/org/springframework/security/annotation/BusinessService.java
rename to core/src/test/java/org/springframework/security/access/annotation/BusinessService.java
index 68b177185c..f54794cae5 100644
--- a/core/src/test/java/org/springframework/security/annotation/BusinessService.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java
@@ -13,14 +13,15 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
 
 import java.util.List;
 
 import javax.annotation.security.RolesAllowed;
 import javax.annotation.security.PermitAll;
 
-import org.springframework.security.expression.annotation.PreAuthorize;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.security.access.expression.annotation.PreAuthorize;
 
 /**
  * @version $Id$
diff --git a/core/src/test/java/org/springframework/security/annotation/BusinessServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java
similarity index 89%
rename from core/src/test/java/org/springframework/security/annotation/BusinessServiceImpl.java
rename to core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java
index df84a2e57c..6f988b21fd 100644
--- a/core/src/test/java/org/springframework/security/annotation/BusinessServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java
@@ -1,8 +1,10 @@
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.security.access.annotation.Secured;
+
 /**
  *
  * @author Joe Scalise
diff --git a/core/src/test/java/org/springframework/security/annotation/Department.java b/core/src/test/java/org/springframework/security/access/annotation/Department.java
similarity index 90%
rename from core/src/test/java/org/springframework/security/annotation/Department.java
rename to core/src/test/java/org/springframework/security/access/annotation/Department.java
index 8b6af28ff1..6c5aebb5b4 100644
--- a/core/src/test/java/org/springframework/security/annotation/Department.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/Department.java
@@ -1,4 +1,4 @@
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
 
 /**
  *
diff --git a/core/src/test/java/org/springframework/security/annotation/DepartmentService.java b/core/src/test/java/org/springframework/security/access/annotation/DepartmentService.java
similarity index 59%
rename from core/src/test/java/org/springframework/security/annotation/DepartmentService.java
rename to core/src/test/java/org/springframework/security/access/annotation/DepartmentService.java
index a93d39c148..f6ff1c21bc 100644
--- a/core/src/test/java/org/springframework/security/annotation/DepartmentService.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/DepartmentService.java
@@ -1,4 +1,6 @@
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
+
+import org.springframework.security.access.annotation.Secured;
 
 /**
  *
diff --git a/core/src/test/java/org/springframework/security/annotation/DepartmentServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/DepartmentServiceImpl.java
similarity index 70%
rename from core/src/test/java/org/springframework/security/annotation/DepartmentServiceImpl.java
rename to core/src/test/java/org/springframework/security/access/annotation/DepartmentServiceImpl.java
index 61b6b75ef6..10ceb01751 100644
--- a/core/src/test/java/org/springframework/security/annotation/DepartmentServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/DepartmentServiceImpl.java
@@ -1,4 +1,6 @@
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
+
+import org.springframework.security.access.annotation.Secured;
 
 /**
  * @author Joe Scalise
diff --git a/core/src/test/java/org/springframework/security/annotation/Entity.java b/core/src/test/java/org/springframework/security/access/annotation/Entity.java
similarity index 73%
rename from core/src/test/java/org/springframework/security/annotation/Entity.java
rename to core/src/test/java/org/springframework/security/access/annotation/Entity.java
index 02031093cd..bcd6b9cdea 100644
--- a/core/src/test/java/org/springframework/security/annotation/Entity.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/Entity.java
@@ -1,4 +1,4 @@
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
 
 /**
  * Class to act as a superclass for annotations testing.
diff --git a/core/src/test/java/org/springframework/security/annotation/ExpressionProtectedBusinessServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java
similarity index 81%
rename from core/src/test/java/org/springframework/security/annotation/ExpressionProtectedBusinessServiceImpl.java
rename to core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java
index a1473526d5..1563ff31c4 100644
--- a/core/src/test/java/org/springframework/security/annotation/ExpressionProtectedBusinessServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java
@@ -1,10 +1,10 @@
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.security.expression.annotation.PostFilter;
-import org.springframework.security.expression.annotation.PreFilter;
+import org.springframework.security.access.expression.annotation.PostFilter;
+import org.springframework.security.access.expression.annotation.PreFilter;
 
 public class ExpressionProtectedBusinessServiceImpl implements BusinessService {
 
diff --git a/core/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java
similarity index 94%
rename from core/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java
rename to core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java
index 4cf5470ab3..8bd0e41452 100644
--- a/core/src/test/java/org/springframework/security/annotation/Jsr250BusinessServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/test/java/org/springframework/security/annotation/Jsr250MethodDefinitionSourceTests.java b/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodDefinitionSourceTests.java
similarity index 94%
rename from core/src/test/java/org/springframework/security/annotation/Jsr250MethodDefinitionSourceTests.java
rename to core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodDefinitionSourceTests.java
index 5ba785245b..e9ce8a4204 100644
--- a/core/src/test/java/org/springframework/security/annotation/Jsr250MethodDefinitionSourceTests.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodDefinitionSourceTests.java
@@ -1,4 +1,4 @@
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
 
 import static org.junit.Assert.assertEquals;
 
@@ -11,7 +11,8 @@ import javax.annotation.security.RolesAllowed;
 import junit.framework.Assert;
 
 import org.junit.Test;
-import org.springframework.security.ConfigAttribute;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.annotation.Jsr250MethodSecurityMetadataSource;
 
 /**
  * @author Luke Taylor
diff --git a/core/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java b/core/src/test/java/org/springframework/security/access/annotation/MethodDefinitionSourceEditorTigerTests.java
similarity index 67%
rename from core/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java
rename to core/src/test/java/org/springframework/security/access/annotation/MethodDefinitionSourceEditorTigerTests.java
index b50af2b7b2..50b0ad58a0 100644
--- a/core/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/MethodDefinitionSourceEditorTigerTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
 
 import static org.junit.Assert.assertEquals;
 
@@ -21,14 +21,14 @@ import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
-import org.springframework.security.annotation.test.Entity;
-import org.springframework.security.annotation.test.PersonServiceImpl;
-import org.springframework.security.annotation.test.Service;
-import org.springframework.security.intercept.method.MapBasedMethodSecurityMetadataSource;
-import org.springframework.security.intercept.method.MethodSecurityMetadataSourceEditor;
-import org.springframework.security.intercept.method.MockMethodInvocation;
+import org.springframework.security.access.ConfigAttribute;
+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;
 
 
 /**
@@ -52,9 +52,9 @@ public class MethodDefinitionSourceEditorTigerTests {
     public void testConcreteClassInvocations() throws Exception {
         MethodSecurityMetadataSourceEditor editor = new MethodSecurityMetadataSourceEditor();
         editor.setAsText(
-                "org.springframework.security.annotation.test.Service.makeLower*=ROLE_FROM_INTERFACE\r\n" +
-                "org.springframework.security.annotation.test.Service.makeUpper*=ROLE_FROM_INTERFACE\r\n" +
-                "org.springframework.security.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION");
+                "org.springframework.security.access.annotation.test.Service.makeLower*=ROLE_FROM_INTERFACE\r\n" +
+                "org.springframework.security.access.annotation.test.Service.makeUpper*=ROLE_FROM_INTERFACE\r\n" +
+                "org.springframework.security.access.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION");
 
         MapBasedMethodSecurityMetadataSource map = (MapBasedMethodSecurityMetadataSource) editor.getValue();
         assertEquals(3, map.getMethodMapSize());
@@ -72,9 +72,9 @@ public class MethodDefinitionSourceEditorTigerTests {
     public void testBridgeMethodResolution() throws Exception {
         MethodSecurityMetadataSourceEditor editor = new MethodSecurityMetadataSourceEditor();
         editor.setAsText(
-                "org.springframework.security.annotation.test.PersonService.makeUpper*=ROLE_FROM_INTERFACE\r\n" +
-                "org.springframework.security.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_ABSTRACT\r\n" +
-                "org.springframework.security.annotation.test.PersonServiceImpl.makeUpper*=ROLE_FROM_PSI");
+                "org.springframework.security.access.annotation.test.PersonService.makeUpper*=ROLE_FROM_INTERFACE\r\n" +
+                "org.springframework.security.access.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_ABSTRACT\r\n" +
+                "org.springframework.security.access.annotation.test.PersonServiceImpl.makeUpper*=ROLE_FROM_PSI");
 
         MapBasedMethodSecurityMetadataSource map = (MapBasedMethodSecurityMetadataSource) editor.getValue();
         assertEquals(3, map.getMethodMapSize());
diff --git a/core/src/test/java/org/springframework/security/annotation/SecuredMethodDefinitionSourceTests.java b/core/src/test/java/org/springframework/security/access/annotation/SecuredMethodDefinitionSourceTests.java
similarity index 92%
rename from core/src/test/java/org/springframework/security/annotation/SecuredMethodDefinitionSourceTests.java
rename to core/src/test/java/org/springframework/security/access/annotation/SecuredMethodDefinitionSourceTests.java
index 68c64a1ca6..028ad2b914 100644
--- a/core/src/test/java/org/springframework/security/annotation/SecuredMethodDefinitionSourceTests.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/SecuredMethodDefinitionSourceTests.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.annotation;
+package org.springframework.security.access.annotation;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -21,13 +21,14 @@ import junit.framework.TestCase;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.access.annotation.SecuredMethodSecurityMetadataSource;
 import org.springframework.util.StringUtils;
 
 
 /**
- * Tests for {@link org.springframework.security.annotation.SecuredMethodSecurityMetadataSource}
+ * Tests for {@link org.springframework.security.access.annotation.SecuredMethodSecurityMetadataSource}
  *
  * @author Mark St.Godard
  * @author Joe Scalise
diff --git a/core/src/test/java/org/springframework/security/annotation/test/Entity.java b/core/src/test/java/org/springframework/security/access/annotation/test/Entity.java
similarity index 96%
rename from core/src/test/java/org/springframework/security/annotation/test/Entity.java
rename to core/src/test/java/org/springframework/security/access/annotation/test/Entity.java
index 85f9d8388e..c93ea8d3b6 100644
--- a/core/src/test/java/org/springframework/security/annotation/test/Entity.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/Entity.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation.test;
+package org.springframework.security.access.annotation.test;
 
 import org.springframework.util.Assert;
 
diff --git a/core/src/test/java/org/springframework/security/annotation/test/Organisation.java b/core/src/test/java/org/springframework/security/access/annotation/test/Organisation.java
similarity index 95%
rename from core/src/test/java/org/springframework/security/annotation/test/Organisation.java
rename to core/src/test/java/org/springframework/security/access/annotation/test/Organisation.java
index d9ab6d1391..b5cbde1934 100644
--- a/core/src/test/java/org/springframework/security/annotation/test/Organisation.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/Organisation.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation.test;
+package org.springframework.security.access.annotation.test;
 
 /**
  * An extended version of Entity.
diff --git a/core/src/test/java/org/springframework/security/annotation/test/OrganisationService.java b/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationService.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/annotation/test/OrganisationService.java
rename to core/src/test/java/org/springframework/security/access/annotation/test/OrganisationService.java
index c12d0ec65e..a546d40022 100644
--- a/core/src/test/java/org/springframework/security/annotation/test/OrganisationService.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationService.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation.test;
+package org.springframework.security.access.annotation.test;
 
 /**
  * DOCUMENT ME!
diff --git a/core/src/test/java/org/springframework/security/annotation/test/OrganisationServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationServiceImpl.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/annotation/test/OrganisationServiceImpl.java
rename to core/src/test/java/org/springframework/security/access/annotation/test/OrganisationServiceImpl.java
index 85e970970d..13878236fc 100644
--- a/core/src/test/java/org/springframework/security/annotation/test/OrganisationServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationServiceImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation.test;
+package org.springframework.security.access.annotation.test;
 
 /**
  *
diff --git a/core/src/test/java/org/springframework/security/annotation/test/Person.java b/core/src/test/java/org/springframework/security/access/annotation/test/Person.java
similarity index 95%
rename from core/src/test/java/org/springframework/security/annotation/test/Person.java
rename to core/src/test/java/org/springframework/security/access/annotation/test/Person.java
index 177ec7f417..f605ac3807 100644
--- a/core/src/test/java/org/springframework/security/annotation/test/Person.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/Person.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation.test;
+package org.springframework.security.access.annotation.test;
 
 /**
  * An extended version of Entity.
diff --git a/core/src/test/java/org/springframework/security/annotation/test/PersonService.java b/core/src/test/java/org/springframework/security/access/annotation/test/PersonService.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/annotation/test/PersonService.java
rename to core/src/test/java/org/springframework/security/access/annotation/test/PersonService.java
index 1d87a2068c..2d38979aa6 100644
--- a/core/src/test/java/org/springframework/security/annotation/test/PersonService.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/PersonService.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation.test;
+package org.springframework.security.access.annotation.test;
 
 /**
  *
diff --git a/core/src/test/java/org/springframework/security/annotation/test/PersonServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/test/PersonServiceImpl.java
similarity index 94%
rename from core/src/test/java/org/springframework/security/annotation/test/PersonServiceImpl.java
rename to core/src/test/java/org/springframework/security/access/annotation/test/PersonServiceImpl.java
index 2b82fafded..754f27df7d 100644
--- a/core/src/test/java/org/springframework/security/annotation/test/PersonServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/PersonServiceImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation.test;
+package org.springframework.security.access.annotation.test;
 
 /**
  * DOCUMENT ME!
diff --git a/core/src/test/java/org/springframework/security/annotation/test/Service.java b/core/src/test/java/org/springframework/security/access/annotation/test/Service.java
similarity index 94%
rename from core/src/test/java/org/springframework/security/annotation/test/Service.java
rename to core/src/test/java/org/springframework/security/access/annotation/test/Service.java
index a0df023709..c981a28dca 100644
--- a/core/src/test/java/org/springframework/security/annotation/test/Service.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/Service.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation.test;
+package org.springframework.security.access.annotation.test;
 
 import java.util.Collection;
 
diff --git a/core/src/test/java/org/springframework/security/annotation/test/ServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/test/ServiceImpl.java
similarity index 95%
rename from core/src/test/java/org/springframework/security/annotation/test/ServiceImpl.java
rename to core/src/test/java/org/springframework/security/access/annotation/test/ServiceImpl.java
index 83ce3c4ea5..d7f3035746 100644
--- a/core/src/test/java/org/springframework/security/annotation/test/ServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/ServiceImpl.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.annotation.test;
+package org.springframework.security.access.annotation.test;
 
 import java.util.Collection;
 
diff --git a/core/src/test/java/org/springframework/security/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java b/core/src/test/java/org/springframework/security/access/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java
similarity index 94%
rename from core/src/test/java/org/springframework/security/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java
rename to core/src/test/java/org/springframework/security/access/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java
index a224c82383..dda3f9e0b0 100755
--- a/core/src/test/java/org/springframework/security/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java
+++ b/core/src/test/java/org/springframework/security/access/authoritymapping/MapBasedAttributes2GrantedAuthoritiesMapperTest.java
@@ -1,4 +1,4 @@
-package org.springframework.security.authoritymapping;
+package org.springframework.security.access.authoritymapping;
 
 import static org.junit.Assert.*;
 
@@ -13,6 +13,8 @@ import org.apache.log4j.Logger;
 import org.junit.Test;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.access.authoritymapping.Attributes2GrantedAuthoritiesMapper;
+import org.springframework.security.access.authoritymapping.MapBasedAttributes2GrantedAuthoritiesMapper;
 
 /**
  *
diff --git a/core/src/test/java/org/springframework/security/authoritymapping/SimpleMappableRolesRetrieverTests.java b/core/src/test/java/org/springframework/security/access/authoritymapping/SimpleMappableRolesRetrieverTests.java
similarity index 84%
rename from core/src/test/java/org/springframework/security/authoritymapping/SimpleMappableRolesRetrieverTests.java
rename to core/src/test/java/org/springframework/security/access/authoritymapping/SimpleMappableRolesRetrieverTests.java
index 7f9a37b6a4..dd1e59a65d 100755
--- a/core/src/test/java/org/springframework/security/authoritymapping/SimpleMappableRolesRetrieverTests.java
+++ b/core/src/test/java/org/springframework/security/access/authoritymapping/SimpleMappableRolesRetrieverTests.java
@@ -1,11 +1,9 @@
-package org.springframework.security.authoritymapping;
+package org.springframework.security.access.authoritymapping;
 
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Set;
-import java.util.HashSet;
 
 import junit.framework.TestCase;
+
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/core/src/test/java/org/springframework/security/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/access/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java
similarity index 94%
rename from core/src/test/java/org/springframework/security/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java
rename to core/src/test/java/org/springframework/security/access/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java
index f4290f412a..82cc0adbd7 100755
--- a/core/src/test/java/org/springframework/security/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java
+++ b/core/src/test/java/org/springframework/security/access/authoritymapping/SimpleRoles2GrantedAuthoritiesMapperTests.java
@@ -1,6 +1,7 @@
-package org.springframework.security.authoritymapping;
+package org.springframework.security.access.authoritymapping;
 
 import org.springframework.security.GrantedAuthority;
+import org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core/src/test/java/org/springframework/security/authoritymapping/XmlMappableRolesRetrieverTests.java b/core/src/test/java/org/springframework/security/access/authoritymapping/XmlMappableRolesRetrieverTests.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/authoritymapping/XmlMappableRolesRetrieverTests.java
rename to core/src/test/java/org/springframework/security/access/authoritymapping/XmlMappableRolesRetrieverTests.java
index 1f4430da33..b33ac7e728 100755
--- a/core/src/test/java/org/springframework/security/authoritymapping/XmlMappableRolesRetrieverTests.java
+++ b/core/src/test/java/org/springframework/security/access/authoritymapping/XmlMappableRolesRetrieverTests.java
@@ -1,4 +1,4 @@
-package org.springframework.security.authoritymapping;
+package org.springframework.security.access.authoritymapping;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -7,6 +7,8 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Set;
 
+import org.springframework.security.access.authoritymapping.XmlMappableAttributesRetriever;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/core/src/test/java/org/springframework/security/expression/method/ExpressionAnnotationMethodDefinitionSourceTests.java b/core/src/test/java/org/springframework/security/access/expression/method/ExpressionAnnotationMethodDefinitionSourceTests.java
similarity index 90%
rename from core/src/test/java/org/springframework/security/expression/method/ExpressionAnnotationMethodDefinitionSourceTests.java
rename to core/src/test/java/org/springframework/security/access/expression/method/ExpressionAnnotationMethodDefinitionSourceTests.java
index 2f8a310a5b..420c14b87d 100644
--- a/core/src/test/java/org/springframework/security/expression/method/ExpressionAnnotationMethodDefinitionSourceTests.java
+++ b/core/src/test/java/org/springframework/security/access/expression/method/ExpressionAnnotationMethodDefinitionSourceTests.java
@@ -1,4 +1,4 @@
-package org.springframework.security.expression.method;
+package org.springframework.security.access.expression.method;
 
 import static org.junit.Assert.*;
 
@@ -6,15 +6,15 @@ import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.expression.annotation.PostAuthorize;
-import org.springframework.security.expression.annotation.PostFilter;
-import org.springframework.security.expression.annotation.PreAuthorize;
-import org.springframework.security.expression.annotation.PreFilter;
-import org.springframework.security.expression.method.ExpressionAnnotationMethodSecurityMetadataSource;
-import org.springframework.security.expression.method.PostInvocationExpressionAttribute;
-import org.springframework.security.expression.method.PreInvocationExpressionAttribute;
-import org.springframework.security.intercept.method.MockMethodInvocation;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.expression.annotation.PostAuthorize;
+import org.springframework.security.access.expression.annotation.PostFilter;
+import org.springframework.security.access.expression.annotation.PreAuthorize;
+import org.springframework.security.access.expression.annotation.PreFilter;
+import org.springframework.security.access.expression.method.ExpressionAnnotationMethodSecurityMetadataSource;
+import org.springframework.security.access.expression.method.PostInvocationExpressionAttribute;
+import org.springframework.security.access.expression.method.PreInvocationExpressionAttribute;
+import org.springframework.security.access.intercept.method.MockMethodInvocation;
 
 
 public class ExpressionAnnotationMethodDefinitionSourceTests {
diff --git a/core/src/test/java/org/springframework/security/expression/method/MethodExpressionVoterTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java
similarity index 92%
rename from core/src/test/java/org/springframework/security/expression/method/MethodExpressionVoterTests.java
rename to core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java
index ec803e7a57..80bc628679 100644
--- a/core/src/test/java/org/springframework/security/expression/method/MethodExpressionVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java
@@ -1,4 +1,4 @@
-package org.springframework.security.expression.method;
+package org.springframework.security.access.expression.method;
 
 import static org.junit.Assert.assertEquals;
 
@@ -10,12 +10,12 @@ import java.util.List;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.expression.method.MethodExpressionVoter;
-import org.springframework.security.expression.method.PreInvocationExpressionAttribute;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.expression.method.MethodExpressionVoter;
+import org.springframework.security.access.expression.method.PreInvocationExpressionAttribute;
+import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.providers.TestingAuthenticationToken;
 import org.springframework.security.util.SimpleMethodInvocation;
-import org.springframework.security.vote.AccessDecisionVoter;
 
 @SuppressWarnings("unchecked")
 public class MethodExpressionVoterTests {
@@ -85,7 +85,7 @@ public class MethodExpressionVoterTests {
     public void ruleDefinedInAClassMethodIsApplied() throws Exception {
         MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAString(), "joe");
         assertEquals(AccessDecisionVoter.ACCESS_GRANTED, am.vote(joe, mi,
-                createAttributes(new PreInvocationExpressionAttribute(null, null, "new org.springframework.security.expression.method.SecurityRules().isJoe(#argument)"))));
+                createAttributes(new PreInvocationExpressionAttribute(null, null, "new org.springframework.security.access.expression.method.SecurityRules().isJoe(#argument)"))));
     }
 
     private List createAttributes(ConfigAttribute... attributes) {
diff --git a/core/src/test/java/org/springframework/security/expression/method/SecurityRules.java b/core/src/test/java/org/springframework/security/access/expression/method/SecurityRules.java
similarity index 79%
rename from core/src/test/java/org/springframework/security/expression/method/SecurityRules.java
rename to core/src/test/java/org/springframework/security/access/expression/method/SecurityRules.java
index f1b7e81c22..3f711a30db 100644
--- a/core/src/test/java/org/springframework/security/expression/method/SecurityRules.java
+++ b/core/src/test/java/org/springframework/security/access/expression/method/SecurityRules.java
@@ -1,4 +1,4 @@
-package org.springframework.security.expression.method;
+package org.springframework.security.access.expression.method;
 
 public class SecurityRules {
     public static boolean disallow() {
diff --git a/core/src/test/java/org/springframework/security/expression/support/MethodSecurityExpressionRootTests.java b/core/src/test/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRootTests.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/expression/support/MethodSecurityExpressionRootTests.java
rename to core/src/test/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRootTests.java
index 48cf99243a..8959f7dcd9 100644
--- a/core/src/test/java/org/springframework/security/expression/support/MethodSecurityExpressionRootTests.java
+++ b/core/src/test/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRootTests.java
@@ -1,4 +1,4 @@
-package org.springframework.security.expression.support;
+package org.springframework.security.access.expression.support;
 
 import static org.junit.Assert.*;
 
@@ -11,8 +11,9 @@ import org.springframework.expression.spel.antlr.SpelAntlrExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationTrustResolver;
-import org.springframework.security.expression.ExpressionUtils;
-import org.springframework.security.expression.PermissionEvaluator;
+import org.springframework.security.access.expression.ExpressionUtils;
+import org.springframework.security.access.expression.PermissionEvaluator;
+import org.springframework.security.access.expression.support.MethodSecurityExpressionRoot;
 
 /**
  * Tests for {@link MethodSecurityExpressionRoot}
diff --git a/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/HierarchicalRolesTestHelper.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java
similarity index 92%
rename from core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/HierarchicalRolesTestHelper.java
rename to core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java
index 491f369bac..a0ac854732 100755
--- a/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/HierarchicalRolesTestHelper.java
+++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails.hierarchicalroles;
+package org.springframework.security.access.hierarchicalroles;
 
 import java.util.List;
 
diff --git a/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImplTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java
similarity index 94%
rename from core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImplTests.java
rename to core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java
index bb129da472..d1807a78a7 100755
--- a/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/RoleHierarchyImplTests.java
+++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java
@@ -12,13 +12,15 @@
 * limitations under the License.
 */
 
-package org.springframework.security.userdetails.hierarchicalroles;
+package org.springframework.security.access.hierarchicalroles;
 
 import java.util.List;
 
 import junit.framework.TestCase;
 
 import org.springframework.security.GrantedAuthority;
+import org.springframework.security.access.hierarchicalroles.CycleInRoleHierarchyException;
+import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
 import org.springframework.security.util.AuthorityUtils;
 
 /**
diff --git a/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/TestHelperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java
similarity index 95%
rename from core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/TestHelperTests.java
rename to core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java
index 27680d68be..7de0f39795 100755
--- a/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/TestHelperTests.java
+++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.userdetails.hierarchicalroles;
+package org.springframework.security.access.hierarchicalroles;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapperTests.java
similarity index 92%
rename from core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapperTests.java
rename to core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapperTests.java
index 22eb468f93..1a7580cd8c 100755
--- a/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsServiceWrapperTests.java
+++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsServiceWrapperTests.java
@@ -1,4 +1,4 @@
-package org.springframework.security.userdetails.hierarchicalroles;
+package org.springframework.security.access.hierarchicalroles;
 
 import static org.junit.Assert.*;
 
@@ -11,6 +11,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
+import org.springframework.security.access.hierarchicalroles.UserDetailsServiceWrapper;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UserDetailsService;
diff --git a/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapperTests.java
similarity index 91%
rename from core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapperTests.java
rename to core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapperTests.java
index 371ddf4ea1..72e429c6ed 100755
--- a/core/src/test/java/org/springframework/security/userdetails/hierarchicalroles/UserDetailsWrapperTests.java
+++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/UserDetailsWrapperTests.java
@@ -1,10 +1,12 @@
-package org.springframework.security.userdetails.hierarchicalroles;
+package org.springframework.security.access.hierarchicalroles;
 
 import java.util.List;
 
 import junit.framework.TestCase;
 
 import org.springframework.security.GrantedAuthority;
+import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
+import org.springframework.security.access.hierarchicalroles.UserDetailsWrapper;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.util.AuthorityUtils;
diff --git a/core/src/test/java/org/springframework/security/intercept/AbstractSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java
similarity index 92%
rename from core/src/test/java/org/springframework/security/intercept/AbstractSecurityInterceptorTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java
index 62e11390ce..6107e7ace4 100644
--- a/core/src/test/java/org/springframework/security/intercept/AbstractSecurityInterceptorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java
@@ -13,16 +13,17 @@
  * limitations under the License.
  */
 
-package org.springframework.security.intercept;
+package org.springframework.security.access.intercept;
 
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Test;
-import org.springframework.security.AccessDecisionManager;
-import org.springframework.security.AfterInvocationManager;
 import org.springframework.security.AuthenticationManager;
-import org.springframework.security.RunAsManager;
+import org.springframework.security.access.AccessDecisionManager;
+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.util.SimpleMethodInvocation;
 
 
diff --git a/core/src/test/java/org/springframework/security/afterinvocation/AfterInvocationProviderManagerTests.java b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java
similarity index 94%
rename from core/src/test/java/org/springframework/security/afterinvocation/AfterInvocationProviderManagerTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java
index 5d9e160e1a..721945b2ad 100644
--- a/core/src/test/java/org/springframework/security/afterinvocation/AfterInvocationProviderManagerTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.afterinvocation;
+package org.springframework.security.access.intercept;
 
 import java.util.List;
 import java.util.Vector;
@@ -21,10 +21,12 @@ import java.util.Vector;
 import junit.framework.TestCase;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.AccessDeniedException;
+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.util.SimpleMethodInvocation;
 
 
diff --git a/core/src/test/java/org/springframework/security/intercept/InterceptorStatusTokenTests.java b/core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java
similarity index 86%
rename from core/src/test/java/org/springframework/security/intercept/InterceptorStatusTokenTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java
index 28ca73c441..cb53167549 100644
--- a/core/src/test/java/org/springframework/security/intercept/InterceptorStatusTokenTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.intercept;
+package org.springframework.security.access.intercept;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,8 +22,9 @@ import java.util.List;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.access.intercept.InterceptorStatusToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.util.SimpleMethodInvocation;
 
diff --git a/core/src/test/java/org/springframework/security/runas/NullRunAsManagerTests.java b/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java
similarity index 75%
rename from core/src/test/java/org/springframework/security/runas/NullRunAsManagerTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java
index 68d50d7208..fe331324ea 100644
--- a/core/src/test/java/org/springframework/security/runas/NullRunAsManagerTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java
@@ -13,11 +13,12 @@
  * limitations under the License.
  */
 
-package org.springframework.security.runas;
+package org.springframework.security.access.intercept;
 
 import junit.framework.TestCase;
 
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.access.intercept.NullRunAsManager;
 
 
 /**
@@ -27,22 +28,8 @@ import org.springframework.security.SecurityConfig;
  * @version $Id$
  */
 public class NullRunAsManagerTests extends TestCase {
-    //~ Constructors ===================================================================================================
-
-    public NullRunAsManagerTests() {
-        super();
-    }
-
-    public NullRunAsManagerTests(String arg0) {
-        super(arg0);
-    }
-
     //~ Methods ========================================================================================================
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(NullRunAsManagerTests.class);
-    }
-
     public final void setUp() throws Exception {
         super.setUp();
     }
diff --git a/core/src/test/java/org/springframework/security/runas/RunAsImplAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java
similarity index 95%
rename from core/src/test/java/org/springframework/security/runas/RunAsImplAuthenticationProviderTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java
index a739f77fa5..f7ac1426a1 100644
--- a/core/src/test/java/org/springframework/security/runas/RunAsImplAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.runas;
+package org.springframework.security.access.intercept;
 
 import junit.framework.TestCase;
 
@@ -22,6 +22,8 @@ import org.springframework.security.BadCredentialsException;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
 
+import org.springframework.security.access.intercept.RunAsImplAuthenticationProvider;
+import org.springframework.security.access.intercept.RunAsUserToken;
 import org.springframework.security.providers.TestingAuthenticationToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
diff --git a/core/src/test/java/org/springframework/security/runas/RunAsManagerImplTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java
similarity index 94%
rename from core/src/test/java/org/springframework/security/runas/RunAsManagerImplTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java
index 9b38e21f90..1d9f4d5250 100644
--- a/core/src/test/java/org/springframework/security/runas/RunAsManagerImplTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java
@@ -13,13 +13,15 @@
  * limitations under the License.
  */
 
-package org.springframework.security.runas;
+package org.springframework.security.access.intercept;
 
 import junit.framework.TestCase;
 
 import org.springframework.security.Authentication;
-import org.springframework.security.RunAsManager;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.access.intercept.RunAsManager;
+import org.springframework.security.access.intercept.RunAsManagerImpl;
+import org.springframework.security.access.intercept.RunAsUserToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.util.AuthorityUtils;
 
diff --git a/core/src/test/java/org/springframework/security/runas/RunAsUserTokenTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java
similarity index 96%
rename from core/src/test/java/org/springframework/security/runas/RunAsUserTokenTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java
index 17fbcda8f8..d17812e7d6 100644
--- a/core/src/test/java/org/springframework/security/runas/RunAsUserTokenTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java
@@ -13,13 +13,14 @@
  * limitations under the License.
  */
 
-package org.springframework.security.runas;
+package org.springframework.security.access.intercept;
 
 import junit.framework.TestCase;
 
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
 
+import org.springframework.security.access.intercept.RunAsUserToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 
diff --git a/core/src/test/java/org/springframework/security/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java
similarity index 86%
rename from core/src/test/java/org/springframework/security/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java
index 0217a13aa3..fa286610b1 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java
@@ -1,4 +1,4 @@
-package org.springframework.security.intercept.method;
+package org.springframework.security.access.intercept.method;
 
 import static org.junit.Assert.assertEquals;
 
@@ -7,8 +7,9 @@ import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.access.intercept.method.MapBasedMethodSecurityMetadataSource;
 
 /**
  * Tests for {@link MapBasedMethodSecurityMetadataSource}.
diff --git a/core/src/test/java/org/springframework/security/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
similarity index 87%
rename from core/src/test/java/org/springframework/security/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
index 7ef028a865..513e2099d2 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.intercept.method;
+package org.springframework.security.access.intercept.method;
 
 import static org.junit.Assert.*;
 
@@ -25,22 +25,24 @@ import org.jmock.Mockery;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.security.AccessDecisionManager;
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.AuthenticationManager;
-import org.springframework.security.ConfigAttribute;
 import org.springframework.security.ITargetObject;
 import org.springframework.security.OtherTargetObject;
-import org.springframework.security.SecurityConfig;
 import org.springframework.security.TargetObject;
+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.context.SecurityContextHolder;
-import org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor;
 import org.springframework.security.providers.TestingAuthenticationToken;
 import org.springframework.security.util.MethodInvocationUtils;
 
 
 /**
- * Tests {@link org.springframework.security.intercept.method.MethodInvocationPrivilegeEvaluator}.
+ * Tests {@link org.springframework.security.access.intercept.method.MethodInvocationPrivilegeEvaluator}.
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/springframework/security/intercept/method/MethodSecurityMetadataSourceEditorTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSourceEditorTests.java
similarity index 96%
rename from core/src/test/java/org/springframework/security/intercept/method/MethodSecurityMetadataSourceEditorTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSourceEditorTests.java
index 47eb703df2..b3f82b548e 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/MethodSecurityMetadataSourceEditorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/MethodSecurityMetadataSourceEditorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.intercept.method;
+package org.springframework.security.access.intercept.method;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;
@@ -22,12 +22,14 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.security.ConfigAttribute;
 import org.springframework.security.ITargetObject;
 import org.springframework.security.MockJoinPoint;
 import org.springframework.security.OtherTargetObject;
-import org.springframework.security.SecurityConfig;
 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;
 
 
 /**
diff --git a/core/src/test/java/org/springframework/security/intercept/method/MockMethodInvocation.java b/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/intercept/method/MockMethodInvocation.java
rename to core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java
index fd83357807..151cd0558e 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/MockMethodInvocation.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java
@@ -1,4 +1,4 @@
-package org.springframework.security.intercept.method;
+package org.springframework.security.access.intercept.method;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;
diff --git a/core/src/test/java/org/springframework/security/intercept/method/MockMethodSecurityMetadataSource.java b/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodSecurityMetadataSource.java
similarity index 90%
rename from core/src/test/java/org/springframework/security/intercept/method/MockMethodSecurityMetadataSource.java
rename to core/src/test/java/org/springframework/security/access/intercept/method/MockMethodSecurityMetadataSource.java
index 2b66692015..e8582c502d 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/MockMethodSecurityMetadataSource.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodSecurityMetadataSource.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.intercept.method;
+package org.springframework.security.access.intercept.method;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -22,8 +22,9 @@ import java.util.List;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.aspectj.lang.JoinPoint;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.access.intercept.method.MethodSecurityMetadataSource;
 
 
 /**
diff --git a/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
index 79dbbdec2d..34b220f91d 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.intercept.method.aopalliance;
+package org.springframework.security.access.intercept.method.aopalliance;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -28,22 +28,23 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.security.AccessDecisionManager;
-import org.springframework.security.AccessDeniedException;
-import org.springframework.security.AfterInvocationManager;
 import org.springframework.security.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.AuthenticationManager;
 import org.springframework.security.BadCredentialsException;
-import org.springframework.security.ConfigAttribute;
 import org.springframework.security.ITargetObject;
-import org.springframework.security.RunAsManager;
-import org.springframework.security.SecurityConfig;
 import org.springframework.security.TargetObject;
+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.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.context.SecurityContextHolder;
-import org.springframework.security.intercept.method.MethodSecurityMetadataSource;
 import org.springframework.security.providers.TestingAuthenticationToken;
-import org.springframework.security.runas.RunAsUserToken;
 
 /**
  * Tests {@link MethodSecurityInterceptor}.
@@ -290,7 +291,7 @@ public class MethodSecurityInterceptorTests {
         }});
 
         String result = advisedTarget.makeUpperCase("hello");
-        assertEquals("HELLO org.springframework.security.runas.RunAsUserToken true", result);
+        assertEquals("HELLO org.springframework.security.access.intercept.RunAsUserToken true", result);
         // Check we've changed back
         assertEquals(token, SecurityContextHolder.getContext().getAuthentication());
     }
diff --git a/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java
similarity index 89%
rename from core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java
index 6711db1622..b167e26e71 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java
@@ -13,15 +13,17 @@
  * limitations under the License.
  */
 
-package org.springframework.security.intercept.method.aopalliance;
+package org.springframework.security.access.intercept.method.aopalliance;
 
 import java.lang.reflect.Method;
 
 import junit.framework.TestCase;
 
 import org.springframework.security.TargetObject;
-import org.springframework.security.intercept.method.MapBasedMethodSecurityMetadataSource;
-import org.springframework.security.intercept.method.MethodSecurityMetadataSourceEditor;
+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;
 
 /**
  * Tests {@link MethodSecurityMetadataSourceAdvisor}.
diff --git a/core/src/test/java/org/springframework/security/intercept/method/aspectj/AspectJSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
similarity index 88%
rename from core/src/test/java/org/springframework/security/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
rename to core/src/test/java/org/springframework/security/access/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
index 649f8d93d7..421ac5e7f8 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.intercept.method.aspectj;
+package org.springframework.security.access.intercept.method.aspectj;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -25,14 +25,16 @@ import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.security.AccessDecisionManager;
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.AuthenticationManager;
 import org.springframework.security.MockJoinPoint;
-import org.springframework.security.SecurityConfig;
 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.context.SecurityContextHolder;
-import org.springframework.security.intercept.method.MethodSecurityMetadataSource;
 import org.springframework.security.providers.TestingAuthenticationToken;
 
 
diff --git a/core/src/test/java/org/springframework/security/vote/AbstractAccessDecisionManagerTests.java b/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java
similarity index 92%
rename from core/src/test/java/org/springframework/security/vote/AbstractAccessDecisionManagerTests.java
rename to core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java
index 139a707ff0..7d5b24e741 100644
--- a/core/src/test/java/org/springframework/security/vote/AbstractAccessDecisionManagerTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java
@@ -13,14 +13,17 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import junit.framework.TestCase;
 
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
+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 java.util.List;
 import java.util.Vector;
diff --git a/core/src/test/java/org/springframework/security/vote/AbstractAclVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/vote/AbstractAclVoterTests.java
rename to core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java
index 7a7526d451..cd6030bac9 100644
--- a/core/src/test/java/org/springframework/security/vote/AbstractAclVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java
@@ -1,4 +1,4 @@
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import static org.junit.Assert.*;
 
@@ -10,8 +10,9 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.aspectj.lang.JoinPoint;
 import org.junit.Test;
 import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
 import org.springframework.security.MockJoinPoint;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.vote.AbstractAclVoter;
 import org.springframework.security.util.MethodInvocationUtils;
 
 /**
diff --git a/core/src/test/java/org/springframework/security/vote/AffirmativeBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java
similarity index 91%
rename from core/src/test/java/org/springframework/security/vote/AffirmativeBasedTests.java
rename to core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java
index e14732aca3..a23de00ceb 100644
--- a/core/src/test/java/org/springframework/security/vote/AffirmativeBasedTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import static org.junit.Assert.assertTrue;
 
@@ -21,10 +21,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.SecurityConfig;
+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.providers.TestingAuthenticationToken;
 
 
diff --git a/core/src/test/java/org/springframework/security/vote/AuthenticatedVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/vote/AuthenticatedVoterTests.java
rename to core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java
index 587b6aaf07..9592295e57 100644
--- a/core/src/test/java/org/springframework/security/vote/AuthenticatedVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java
@@ -13,15 +13,17 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import java.util.List;
 
 import junit.framework.TestCase;
 
 import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
+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.providers.AnonymousAuthenticationToken;
 import org.springframework.security.providers.RememberMeAuthenticationToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
diff --git a/core/src/test/java/org/springframework/security/vote/ConsensusBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java
similarity index 91%
rename from core/src/test/java/org/springframework/security/vote/ConsensusBasedTests.java
rename to core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java
index bfc70bbf33..78da390d38 100644
--- a/core/src/test/java/org/springframework/security/vote/ConsensusBasedTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import static org.junit.Assert.*;
 
@@ -21,11 +21,14 @@ import java.util.List;
 import java.util.Vector;
 
 import org.junit.Test;
-import org.springframework.security.AccessDeniedException;
-import org.springframework.security.ConfigAttribute;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.SecurityConfig;
+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.providers.TestingAuthenticationToken;
 
 
diff --git a/core/src/test/java/org/springframework/security/vote/DenyAgainVoter.java b/core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java
similarity index 91%
rename from core/src/test/java/org/springframework/security/vote/DenyAgainVoter.java
rename to core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java
index 186f4885fe..e2142a5894 100644
--- a/core/src/test/java/org/springframework/security/vote/DenyAgainVoter.java
+++ b/core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java
@@ -13,10 +13,11 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.vote.AccessDecisionVoter;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/core/src/test/java/org/springframework/security/vote/DenyVoter.java b/core/src/test/java/org/springframework/security/access/vote/DenyVoter.java
similarity index 91%
rename from core/src/test/java/org/springframework/security/vote/DenyVoter.java
rename to core/src/test/java/org/springframework/security/access/vote/DenyVoter.java
index d3152b353c..ce99483bbf 100644
--- a/core/src/test/java/org/springframework/security/vote/DenyVoter.java
+++ b/core/src/test/java/org/springframework/security/access/vote/DenyVoter.java
@@ -13,10 +13,11 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.vote.AccessDecisionVoter;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/core/src/test/java/org/springframework/security/vote/LabelBasedAclVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/LabelBasedAclVoterTests.java
similarity index 98%
rename from core/src/test/java/org/springframework/security/vote/LabelBasedAclVoterTests.java
rename to core/src/test/java/org/springframework/security/access/vote/LabelBasedAclVoterTests.java
index 00a0b70666..cef35b5efc 100644
--- a/core/src/test/java/org/springframework/security/vote/LabelBasedAclVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/LabelBasedAclVoterTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import static org.junit.Assert.*;
 
@@ -22,8 +22,8 @@ import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.AuthenticationManager;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/core/src/test/java/org/springframework/security/vote/RoleHierarchyVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java
similarity index 74%
rename from core/src/test/java/org/springframework/security/vote/RoleHierarchyVoterTests.java
rename to core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java
index a7c60568e9..cc6b104bc7 100644
--- a/core/src/test/java/org/springframework/security/vote/RoleHierarchyVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java
@@ -1,11 +1,12 @@
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
+import org.springframework.security.access.vote.RoleHierarchyVoter;
 import org.springframework.security.providers.TestingAuthenticationToken;
-import org.springframework.security.userdetails.hierarchicalroles.RoleHierarchyImpl;
 
 public class RoleHierarchyVoterTests {
 
diff --git a/core/src/test/java/org/springframework/security/vote/SampleBlockOfData.java b/core/src/test/java/org/springframework/security/access/vote/SampleBlockOfData.java
similarity index 94%
rename from core/src/test/java/org/springframework/security/vote/SampleBlockOfData.java
rename to core/src/test/java/org/springframework/security/access/vote/SampleBlockOfData.java
index d70902abb0..3d71ed77a4 100644
--- a/core/src/test/java/org/springframework/security/vote/SampleBlockOfData.java
+++ b/core/src/test/java/org/springframework/security/access/vote/SampleBlockOfData.java
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
-import org.springframework.security.vote.LabeledData;
+import org.springframework.security.access.vote.LabeledData;
 
 import java.io.Serializable;
 
diff --git a/core/src/test/java/org/springframework/security/vote/SampleService.java b/core/src/test/java/org/springframework/security/access/vote/SampleService.java
similarity index 95%
rename from core/src/test/java/org/springframework/security/vote/SampleService.java
rename to core/src/test/java/org/springframework/security/access/vote/SampleService.java
index 841a7b91e3..10776815c7 100644
--- a/core/src/test/java/org/springframework/security/vote/SampleService.java
+++ b/core/src/test/java/org/springframework/security/access/vote/SampleService.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import java.util.List;
 
diff --git a/core/src/test/java/org/springframework/security/vote/SampleServiceImpl.java b/core/src/test/java/org/springframework/security/access/vote/SampleServiceImpl.java
similarity index 98%
rename from core/src/test/java/org/springframework/security/vote/SampleServiceImpl.java
rename to core/src/test/java/org/springframework/security/access/vote/SampleServiceImpl.java
index 1d62307c29..9fdd7f2136 100644
--- a/core/src/test/java/org/springframework/security/vote/SampleServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/vote/SampleServiceImpl.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import org.springframework.security.context.SecurityContextHolder;
 
diff --git a/core/src/test/java/org/springframework/security/vote/SomeDomainObject.java b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java
similarity index 96%
rename from core/src/test/java/org/springframework/security/vote/SomeDomainObject.java
rename to core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java
index 14d01c3e5d..3e9133cc02 100644
--- a/core/src/test/java/org/springframework/security/vote/SomeDomainObject.java
+++ b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 /**
  * Simple domain object, used by {@link BasicAclEntryVoterTests}.
diff --git a/core/src/test/java/org/springframework/security/vote/SomeDomainObjectManager.java b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java
similarity index 95%
rename from core/src/test/java/org/springframework/security/vote/SomeDomainObjectManager.java
rename to core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java
index 542c975b2c..cca5e0ffdd 100644
--- a/core/src/test/java/org/springframework/security/vote/SomeDomainObjectManager.java
+++ b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 /**
  * Used by {@link BasicAclEntryVoterTests} so it can create a MethodInvocation contining
diff --git a/core/src/test/java/org/springframework/security/vote/UnanimousBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/vote/UnanimousBasedTests.java
rename to core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java
index be6ee55b6c..986bef93b3 100644
--- a/core/src/test/java/org/springframework/security/vote/UnanimousBasedTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java
@@ -13,16 +13,19 @@
  * limitations under the License.
  */
 
-package org.springframework.security.vote;
+package org.springframework.security.access.vote;
 
 import java.util.List;
 import java.util.Vector;
 
 import junit.framework.TestCase;
 
-import org.springframework.security.AccessDeniedException;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
+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.providers.TestingAuthenticationToken;
 
 
diff --git a/core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManagerTests.java b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java
similarity index 98%
rename from core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManagerTests.java
rename to core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java
index 1395c381b1..238fde750e 100644
--- a/core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManagerTests.java
+++ b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java
@@ -1,4 +1,4 @@
-package org.springframework.security.userdetails.jdbc;
+package org.springframework.security.provisioning;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -16,7 +16,6 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.Authentication;
 import org.springframework.security.BadCredentialsException;
 import org.springframework.security.GrantedAuthority;
@@ -24,8 +23,10 @@ import org.springframework.security.GrantedAuthorityImpl;
 import org.springframework.security.MockAuthenticationManager;
 import org.springframework.security.PopulatedDatabase;
 import org.springframework.security.TestDataSource;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.provisioning.JdbcUserDetailsManager;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserCache;
 import org.springframework.security.userdetails.UserDetails;
diff --git a/core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml b/core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml
index 9f91e5e283..d08e414a6b 100644
--- a/core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml
+++ b/core/src/test/resources/org/springframework/security/vote/labelBasedSecurityApplicationContext.xml
@@ -24,12 +24,12 @@
       
     
 
-    
+    
         false
         
             
-                
-                
+                
+                
                     LABELED_OPERATION
                     
                         
@@ -60,14 +60,14 @@
     
 
     
+        class="org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor">
       false
       
       
       
         
-            org.springframework.security.vote.SampleService.get*=ROLE_BASIC
-            org.springframework.security.vote.SampleService.do*=ROLE_BASIC,LABELED_OPERATION
+            org.springframework.security.access.vote.SampleService.get*=ROLE_BASIC
+            org.springframework.security.access.vote.SampleService.do*=ROLE_BASIC,LABELED_OPERATION
         
       
     
@@ -76,7 +76,7 @@
         Security: 
     
 
-    
+    
 
      
       sampleService
diff --git a/itest/context/src/test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java b/itest/context/src/test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java
index 84d3ebee5a..b5ca132f62 100644
--- a/itest/context/src/test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java
+++ b/itest/context/src/test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java
@@ -3,7 +3,7 @@ package org.springframework.security.integration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.AccessDeniedException;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.concurrent.SessionRegistry;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
diff --git a/itest/context/src/test/resources/filter-chain-performance-app-context.xml b/itest/context/src/test/resources/filter-chain-performance-app-context.xml
index 673c809767..85f250be90 100644
--- a/itest/context/src/test/resources/filter-chain-performance-app-context.xml
+++ b/itest/context/src/test/resources/filter-chain-performance-app-context.xml
@@ -79,7 +79,7 @@
         
     
 
-    
+    
         
         
             
@@ -100,6 +100,6 @@
         
     
 
-    
+    
 
 
diff --git a/itest/context/src/test/resources/sec-936-app-context.xml b/itest/context/src/test/resources/sec-936-app-context.xml
index bd73236968..fff9291d14 100755
--- a/itest/context/src/test/resources/sec-936-app-context.xml
+++ b/itest/context/src/test/resources/sec-936-app-context.xml
@@ -15,17 +15,17 @@
 
     
 
-    
+    
         
         
             
-                
-                
+                
+                
             
         
     
 
-    
+    
         
         
         
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java
index a370d593c0..138da661f2 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java
@@ -22,8 +22,8 @@ import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.ldap.LdapUsernameToDnMapper;
 import org.springframework.security.ldap.LdapUtils;
 import org.springframework.security.ldap.DefaultLdapUsernameToDnMapper;
+import org.springframework.security.provisioning.UserDetailsManager;
 import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsManager;
 import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.ldap.core.AttributesMapper;
diff --git a/ntlm/applicationContext.xml b/ntlm/applicationContext.xml
index 0670343288..6f9603718c 100755
--- a/ntlm/applicationContext.xml
+++ b/ntlm/applicationContext.xml
@@ -57,7 +57,7 @@
     
 
     
-    
+    
         
         
         
@@ -70,7 +70,7 @@
     
 
     
-    
+    
         
             false
         
@@ -81,7 +81,7 @@
         
     
 
-    
+    
 
     
         
diff --git a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java
index c1542aafe0..987634f9cd 100755
--- a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java
+++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilter.java
@@ -25,10 +25,10 @@ import org.springframework.security.InsufficientAuthenticationException;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.AnonymousAuthenticationToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.SpringSecurityFilter;
 import org.springframework.security.web.WebAuthenticationDetailsSource;
 import org.springframework.security.web.authentication.AuthenticationProcessingFilter;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilter.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilter.java
index 2a3e2af940..7324807e07 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilter.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilter.java
@@ -28,9 +28,9 @@ import javax.servlet.http.HttpSession;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.AuthenticationServiceException;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.authentication.AbstractProcessingFilter;
 import org.springframework.security.web.authentication.AuthenticationProcessingFilter;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.util.StringUtils;
 
 
diff --git a/portlet/src/main/java/org/springframework/security/ui/portlet/PortletAuthenticationDetails.java b/portlet/src/main/java/org/springframework/security/portlet/PortletAuthenticationDetails.java
similarity index 95%
rename from portlet/src/main/java/org/springframework/security/ui/portlet/PortletAuthenticationDetails.java
rename to portlet/src/main/java/org/springframework/security/portlet/PortletAuthenticationDetails.java
index a02bb1116c..16b3b58fd7 100644
--- a/portlet/src/main/java/org/springframework/security/ui/portlet/PortletAuthenticationDetails.java
+++ b/portlet/src/main/java/org/springframework/security/portlet/PortletAuthenticationDetails.java
@@ -1,4 +1,4 @@
-package org.springframework.security.ui.portlet;
+package org.springframework.security.portlet;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/portlet/src/main/java/org/springframework/security/ui/portlet/PortletPreAuthenticatedAuthenticationDetails.java b/portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetails.java
similarity index 96%
rename from portlet/src/main/java/org/springframework/security/ui/portlet/PortletPreAuthenticatedAuthenticationDetails.java
rename to portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetails.java
index d9d279fe77..a04d51c9ab 100644
--- a/portlet/src/main/java/org/springframework/security/ui/portlet/PortletPreAuthenticatedAuthenticationDetails.java
+++ b/portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetails.java
@@ -1,4 +1,4 @@
-package org.springframework.security.ui.portlet;
+package org.springframework.security.portlet;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/portlet/src/main/java/org/springframework/security/ui/portlet/PortletPreAuthenticatedAuthenticationDetailsSource.java b/portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetailsSource.java
similarity index 94%
rename from portlet/src/main/java/org/springframework/security/ui/portlet/PortletPreAuthenticatedAuthenticationDetailsSource.java
rename to portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetailsSource.java
index 59a1ccac89..8af18efe49 100644
--- a/portlet/src/main/java/org/springframework/security/ui/portlet/PortletPreAuthenticatedAuthenticationDetailsSource.java
+++ b/portlet/src/main/java/org/springframework/security/portlet/PortletPreAuthenticatedAuthenticationDetailsSource.java
@@ -1,4 +1,4 @@
-package org.springframework.security.ui.portlet;
+package org.springframework.security.portlet;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java b/portlet/src/main/java/org/springframework/security/portlet/PortletProcessingInterceptor.java
similarity index 99%
rename from portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java
rename to portlet/src/main/java/org/springframework/security/portlet/PortletProcessingInterceptor.java
index 3b82be693e..b0e1673ceb 100644
--- a/portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java
+++ b/portlet/src/main/java/org/springframework/security/portlet/PortletProcessingInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.portlet;
+package org.springframework.security.portlet;
 
 import java.io.IOException;
 import java.security.Principal;
diff --git a/portlet/src/main/java/org/springframework/security/context/PortletSessionContextIntegrationInterceptor.java b/portlet/src/main/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptor.java
similarity index 98%
rename from portlet/src/main/java/org/springframework/security/context/PortletSessionContextIntegrationInterceptor.java
rename to portlet/src/main/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptor.java
index 247e7bd080..a683b6d692 100644
--- a/portlet/src/main/java/org/springframework/security/context/PortletSessionContextIntegrationInterceptor.java
+++ b/portlet/src/main/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.context;
+package org.springframework.security.portlet;
 
 import java.lang.reflect.Method;
 
@@ -27,6 +27,9 @@ import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.portlet.HandlerInterceptor;
 import org.springframework.web.portlet.ModelAndView;
+import org.springframework.security.context.SecurityContext;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextImpl;
 import org.springframework.security.web.context.SecurityContextPersistenceFilter;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
 
@@ -62,7 +65,7 @@ import org.springframework.security.web.context.HttpSessionSecurityContextReposi
  * true (setting it to false will cause a startup-time error).

 
  * 
This interceptor must be executed before
 any authentication processing mechanisms. These
- * mechanisms (specifically {@link org.springframework.security.ui.portlet.PortletProcessingInterceptor}) expect the
+ * mechanisms (specifically {@link org.springframework.security.portlet.PortletProcessingInterceptor}) expect the
  * SecurityContextHolder to contain a valid SecurityContext by the time they execute.

  *
  * 
An important nuance to this interceptor is that (by default) the SecurityContext is stored
diff --git a/portlet/src/main/java/org/springframework/security/ui/portlet/package.html b/portlet/src/main/java/org/springframework/security/portlet/package.html
similarity index 100%
rename from portlet/src/main/java/org/springframework/security/ui/portlet/package.html
rename to portlet/src/main/java/org/springframework/security/portlet/package.html
diff --git a/portlet/src/test/java/org/springframework/security/ui/portlet/PortletProcessingInterceptorTests.java b/portlet/src/test/java/org/springframework/security/portlet/PortletProcessingInterceptorTests.java
similarity index 99%
rename from portlet/src/test/java/org/springframework/security/ui/portlet/PortletProcessingInterceptorTests.java
rename to portlet/src/test/java/org/springframework/security/portlet/PortletProcessingInterceptorTests.java
index b73223f490..e68b7089b1 100644
--- a/portlet/src/test/java/org/springframework/security/ui/portlet/PortletProcessingInterceptorTests.java
+++ b/portlet/src/test/java/org/springframework/security/portlet/PortletProcessingInterceptorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.portlet;
+package org.springframework.security.portlet;
 
 import static org.junit.Assert.*;
 
@@ -36,9 +36,9 @@ import org.springframework.security.AuthenticationManager;
 import org.springframework.security.BadCredentialsException;
 import org.springframework.security.web.authentication.AbstractProcessingFilter;
 import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.portlet.PortletProcessingInterceptor;
 import org.springframework.security.providers.TestingAuthenticationToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
-import org.springframework.security.providers.portlet.PortletTestUtils;
 import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.util.AuthorityUtils;
diff --git a/portlet/src/test/java/org/springframework/security/context/PortletSessionContextIntegrationInterceptorTests.java b/portlet/src/test/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptorTests.java
similarity index 98%
rename from portlet/src/test/java/org/springframework/security/context/PortletSessionContextIntegrationInterceptorTests.java
rename to portlet/src/test/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptorTests.java
index e3a3f736c4..92e5f56235 100644
--- a/portlet/src/test/java/org/springframework/security/context/PortletSessionContextIntegrationInterceptorTests.java
+++ b/portlet/src/test/java/org/springframework/security/portlet/PortletSessionContextIntegrationInterceptorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.context;
+package org.springframework.security.portlet;
 
 import javax.portlet.PortletSession;
 
@@ -22,7 +22,10 @@ import junit.framework.TestCase;
 
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.providers.portlet.PortletTestUtils;
+import org.springframework.security.context.SecurityContext;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.context.SecurityContextImpl;
+import org.springframework.security.portlet.PortletSessionContextIntegrationInterceptor;
 import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken;
 import org.springframework.security.userdetails.User;
 import org.springframework.mock.web.portlet.MockActionRequest;
diff --git a/portlet/src/test/java/org/springframework/security/providers/portlet/PortletTestUtils.java b/portlet/src/test/java/org/springframework/security/portlet/PortletTestUtils.java
similarity index 97%
rename from portlet/src/test/java/org/springframework/security/providers/portlet/PortletTestUtils.java
rename to portlet/src/test/java/org/springframework/security/portlet/PortletTestUtils.java
index 82518278ab..e7c7955d39 100644
--- a/portlet/src/test/java/org/springframework/security/providers/portlet/PortletTestUtils.java
+++ b/portlet/src/test/java/org/springframework/security/portlet/PortletTestUtils.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.security.providers.portlet;
+package org.springframework.security.portlet;
 
 import javax.portlet.PortletRequest;
 
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.portlet.PortletAuthenticationDetails;
 import org.springframework.security.providers.TestingAuthenticationToken;
 import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken;
-import org.springframework.security.ui.portlet.PortletAuthenticationDetails;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.mock.web.portlet.MockActionRequest;
diff --git a/samples/contacts/src/main/java/sample/contact/ContactManager.java b/samples/contacts/src/main/java/sample/contact/ContactManager.java
index 4658696250..965c4d2302 100644
--- a/samples/contacts/src/main/java/sample/contact/ContactManager.java
+++ b/samples/contacts/src/main/java/sample/contact/ContactManager.java
@@ -14,10 +14,10 @@
  */
 package sample.contact;
 
+import org.springframework.security.access.expression.annotation.PostFilter;
+import org.springframework.security.access.expression.annotation.PreAuthorize;
 import org.springframework.security.acls.Permission;
 import org.springframework.security.acls.sid.Sid;
-import org.springframework.security.expression.annotation.PostFilter;
-import org.springframework.security.expression.annotation.PreAuthorize;
 
 import java.util.List;
 
diff --git a/samples/contacts/src/main/java/sample/contact/SecureIndexController.java b/samples/contacts/src/main/java/sample/contact/SecureIndexController.java
index 5de6c2cc56..aed034f543 100644
--- a/samples/contacts/src/main/java/sample/contact/SecureIndexController.java
+++ b/samples/contacts/src/main/java/sample/contact/SecureIndexController.java
@@ -18,10 +18,10 @@ package sample.contact;
 import org.springframework.beans.factory.InitializingBean;
 
 import org.springframework.security.Authentication;
+import org.springframework.security.access.expression.PermissionEvaluator;
 import org.springframework.security.acls.Permission;
 import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.expression.PermissionEvaluator;
 import org.springframework.util.Assert;
 
 import org.springframework.web.servlet.ModelAndView;
diff --git a/samples/contacts/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/contacts/src/main/webapp/WEB-INF/applicationContext-security.xml
index f3554b3765..a2be509aae 100644
--- a/samples/contacts/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/samples/contacts/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -48,7 +48,7 @@
        
     
 
-    
+    
         
     
 
diff --git a/samples/contacts/src/test/resources/applicationContext-contacts-test.xml b/samples/contacts/src/test/resources/applicationContext-contacts-test.xml
index c79a60439e..20096ab3fa 100644
--- a/samples/contacts/src/test/resources/applicationContext-contacts-test.xml
+++ b/samples/contacts/src/test/resources/applicationContext-contacts-test.xml
@@ -24,7 +24,7 @@
         
     
 
-    
+    
         
     
 
diff --git a/samples/dms/src/main/resources/applicationContext-dms-secure.xml b/samples/dms/src/main/resources/applicationContext-dms-secure.xml
index 32d7ef7d38..522aebbdff 100755
--- a/samples/dms/src/main/resources/applicationContext-dms-secure.xml
+++ b/samples/dms/src/main/resources/applicationContext-dms-secure.xml
@@ -108,7 +108,7 @@
 
 
    
-   
+   
 
    
    
@@ -138,7 +138,7 @@
    
 
    
-   
+   
       
       
          
@@ -195,7 +195,7 @@
 
    
 
-   
+   
       
          
             
@@ -216,9 +216,9 @@
 
    
 
-   
+   
 
-   
+   
       
       
       
diff --git a/samples/portlet/src/main/java/org/springframework/web/portlet/sample/SecurityContextPortlet.java b/samples/portlet/src/main/java/org/springframework/web/portlet/sample/SecurityContextPortlet.java
index 9f58890c46..bb2d18f683 100644
--- a/samples/portlet/src/main/java/org/springframework/web/portlet/sample/SecurityContextPortlet.java
+++ b/samples/portlet/src/main/java/org/springframework/web/portlet/sample/SecurityContextPortlet.java
@@ -15,8 +15,8 @@ import org.springframework.security.web.authentication.AbstractProcessingFilter;
 
 
 /**
- * A simple portlet which prints out the contents of the current {@link org.springframework.security.context.SecurityContext} 
- *  
+ * A simple portlet which prints out the contents of the current {@link org.springframework.security.context.SecurityContext}
+ *
  * @author Luke Taylor
  */
 public class SecurityContextPortlet extends GenericPortlet {
@@ -27,13 +27,13 @@ public class SecurityContextPortlet extends GenericPortlet {
         out.println("
Security Context Display Portlet
");
         out.println("
");
         out.println(new Date());
-        out.println("
Current Session " + request.getPortletSession().getId() + "
");        
+        out.println("
Current Session " + request.getPortletSession().getId() + "
");
         out.println("
");
         out.println("
The security context contains: " +
                 SecurityContextHolder.getContext().getAuthentication() +
                 "
");
         Object lastException = request.getPortletSession().getAttribute(AbstractProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY, PortletSession.APPLICATION_SCOPE);
-        
+
         if (lastException != null) {
             out.println("Last Exception: " + lastException);
         }
diff --git a/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml b/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml
index a8e0a36812..2d1a954fca 100644
--- a/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml
+++ b/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml
@@ -30,13 +30,13 @@
     
     
 
-    
+    
     
-    
+    
         
-            
+            
                 
-                    
+                    
                         
                             
                                 tomcat
diff --git a/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml
index d9a53c0757..bd0e111dbe 100644
--- a/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -52,7 +52,7 @@
         
     
 
-    
+    
         
     
 
@@ -73,7 +73,7 @@
         
     
 
-    
+    
         
         
             
@@ -94,7 +94,7 @@
         
     
 
-    
+    
 
     
         
diff --git a/samples/runall.sh b/samples/runall.sh
index 84162e5cf0..3133d54cc3 100755
--- a/samples/runall.sh
+++ b/samples/runall.sh
@@ -52,7 +52,7 @@ stop_jetty
 
 cd ../cas
 
-if [[ -e ./server/cas-server-webapp-3.2.1.war ]]
+if [[ -e ./server/cas-server-webapp-3.3.1.war ]]
 then
    echo "Found cas server war. Running cas sample"
    cd server
diff --git a/samples/tutorial/src/main/java/bigbank/BankService.java b/samples/tutorial/src/main/java/bigbank/BankService.java
index 587ce9109b..4eeb49e196 100644
--- a/samples/tutorial/src/main/java/bigbank/BankService.java
+++ b/samples/tutorial/src/main/java/bigbank/BankService.java
@@ -1,6 +1,6 @@
 package bigbank;
 
-import org.springframework.security.expression.annotation.PreAuthorize;
+import org.springframework.security.access.expression.annotation.PreAuthorize;
 
 
 public interface BankService {
diff --git a/web/src/main/java/org/springframework/security/web/AccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/AccessDeniedHandler.java
index 9934971ec2..158c59f6b9 100644
--- a/web/src/main/java/org/springframework/security/web/AccessDeniedHandler.java
+++ b/web/src/main/java/org/springframework/security/web/AccessDeniedHandler.java
@@ -15,7 +15,7 @@
 
 package org.springframework.security.web;
 
-import org.springframework.security.AccessDeniedException;
+import org.springframework.security.access.AccessDeniedException;
 
 import java.io.IOException;
 
diff --git a/web/src/main/java/org/springframework/security/web/AccessDeniedHandlerImpl.java b/web/src/main/java/org/springframework/security/web/AccessDeniedHandlerImpl.java
index 1e697b4b9a..7a86470e41 100644
--- a/web/src/main/java/org/springframework/security/web/AccessDeniedHandlerImpl.java
+++ b/web/src/main/java/org/springframework/security/web/AccessDeniedHandlerImpl.java
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.security.AccessDeniedException;
+import org.springframework.security.access.AccessDeniedException;
 
 
 /**
diff --git a/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java b/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java
index 97e03d6938..ec68c1f694 100644
--- a/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java
@@ -15,17 +15,16 @@
 
 package org.springframework.security.web;
 
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.SpringSecurityException;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.AuthenticationTrustResolver;
 import org.springframework.security.AuthenticationTrustResolverImpl;
 import org.springframework.security.InsufficientAuthenticationException;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.util.ThrowableAnalyzer;
 import org.springframework.security.util.ThrowableCauseExtractor;
 import org.springframework.security.web.savedrequest.SavedRequest;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.beans.factory.InitializingBean;
 
 import org.springframework.util.Assert;
@@ -46,7 +45,7 @@ import javax.servlet.http.HttpServletResponse;
  * 

  * If an {@link AuthenticationException} is detected, the filter will launch the authenticationEntryPoint.
  * This allows common handling of authentication failures originating from any subclass of
- * {@link org.springframework.security.intercept.AbstractSecurityInterceptor}.
+ * {@link org.springframework.security.access.intercept.AbstractSecurityInterceptor}.
  * 

  * If an {@link AccessDeniedException} is detected, the filter will determine whether or not the user is an anonymous
  * user. If they are an anonymous user, the authenticationEntryPoint will be launched. If they are not
diff --git a/web/src/main/java/org/springframework/security/web/util/FilterChainOrder.java b/web/src/main/java/org/springframework/security/web/FilterChainOrder.java
similarity index 99%
rename from web/src/main/java/org/springframework/security/web/util/FilterChainOrder.java
rename to web/src/main/java/org/springframework/security/web/FilterChainOrder.java
index b6ec8a3fcf..58f0c01a17 100644
--- a/web/src/main/java/org/springframework/security/web/util/FilterChainOrder.java
+++ b/web/src/main/java/org/springframework/security/web/FilterChainOrder.java
@@ -1,4 +1,4 @@
-package org.springframework.security.web.util;
+package org.springframework.security.web;
 
 import org.springframework.util.Assert;
 
diff --git a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java
index c872ef01c9..eb41e98fb2 100644
--- a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java
+++ b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java
@@ -36,7 +36,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.util.AntUrlPathMatcher;
 import org.springframework.security.util.UrlMatcher;
-import org.springframework.security.web.intercept.FilterInvocation;
 import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource;
 import org.springframework.util.Assert;
 import org.springframework.web.filter.DelegatingFilterProxy;
diff --git a/web/src/main/java/org/springframework/security/web/intercept/FilterInvocation.java b/web/src/main/java/org/springframework/security/web/FilterInvocation.java
similarity index 98%
rename from web/src/main/java/org/springframework/security/web/intercept/FilterInvocation.java
rename to web/src/main/java/org/springframework/security/web/FilterInvocation.java
index c93be6e7be..f639244a11 100644
--- a/web/src/main/java/org/springframework/security/web/intercept/FilterInvocation.java
+++ b/web/src/main/java/org/springframework/security/web/FilterInvocation.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.web.intercept;
+package org.springframework.security.web;
 
 import org.springframework.security.web.util.UrlUtils;
 
diff --git a/web/src/main/java/org/springframework/security/web/SessionFixationProtectionFilter.java b/web/src/main/java/org/springframework/security/web/SessionFixationProtectionFilter.java
index 7ec27a8c5f..e2b5cff9a1 100644
--- a/web/src/main/java/org/springframework/security/web/SessionFixationProtectionFilter.java
+++ b/web/src/main/java/org/springframework/security/web/SessionFixationProtectionFilter.java
@@ -15,7 +15,6 @@ import org.springframework.security.concurrent.SessionRegistry;
 import org.springframework.security.context.SecurityContext;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.security.web.util.SessionUtils;
 
 /**
diff --git a/web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java
index 01435ed2e6..8e42a926b2 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java
@@ -22,9 +22,9 @@ import org.springframework.security.context.SecurityContextHolder;
 
 import org.springframework.security.providers.AnonymousAuthenticationToken;
 import org.springframework.security.userdetails.memory.UserAttribute;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.SpringSecurityFilter;
 import org.springframework.security.web.WebAuthenticationDetailsSource;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
diff --git a/web/src/main/java/org/springframework/security/web/authentication/AuthenticationProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationProcessingFilter.java
index d662c02af3..2d66dd4ed5 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/AuthenticationProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationProcessingFilter.java
@@ -22,7 +22,7 @@ import org.springframework.security.AuthenticationServiceException;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 import org.springframework.security.util.TextUtils;
-import org.springframework.security.web.util.FilterChainOrder;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.util.Assert;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/web/src/main/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilter.java
index 5f7d8630a2..c45dab1b57 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilter.java
@@ -10,9 +10,9 @@ import javax.servlet.http.HttpSession;
 
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.security.AuthenticationException;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.SpringSecurityFilter;
 import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices;
-import org.springframework.security.web.util.FilterChainOrder;
 
 /**
  * For internal use with namespace configuration in the case where a user doesn't configure a login page.
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderPreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderPreAuthenticatedProcessingFilter.java
index 8f973d40fb..c9a804a9e3 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderPreAuthenticatedProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderPreAuthenticatedProcessingFilter.java
@@ -2,7 +2,7 @@ package org.springframework.security.web.authentication.preauth;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.security.web.util.FilterChainOrder;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.util.Assert;
 
 /**
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java
index 28f6d197a0..31c00db18a 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java
@@ -9,9 +9,9 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.security.AuthenticationDetailsSourceImpl;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.MutableGrantedAuthoritiesContainer;
-import org.springframework.security.authoritymapping.Attributes2GrantedAuthoritiesMapper;
-import org.springframework.security.authoritymapping.MappableAttributesRetriever;
-import org.springframework.security.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
+import org.springframework.security.access.authoritymapping.Attributes2GrantedAuthoritiesMapper;
+import org.springframework.security.access.authoritymapping.MappableAttributesRetriever;
+import org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 import org.springframework.util.Assert;
 
 /**
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java
index 6cabc05c3a..f7c12556c1 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java
@@ -1,7 +1,7 @@
 package org.springframework.security.web.authentication.preauth.j2ee;
 
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails;
-import org.springframework.security.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
+import org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java
index 86a16c7fd9..2e13755b67 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java
@@ -2,7 +2,7 @@ package org.springframework.security.web.authentication.preauth.j2ee;
 
 import java.io.InputStream;
 
-import org.springframework.security.authoritymapping.XmlMappableAttributesRetriever;
+import org.springframework.security.access.authoritymapping.XmlMappableAttributesRetriever;
 
 /**
  * 

diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java
index 531d53dd5e..e07b9a3fd7 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java
@@ -9,8 +9,8 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.AuthenticationDetailsSourceImpl;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.MutableGrantedAuthoritiesContainer;
-import org.springframework.security.authoritymapping.Attributes2GrantedAuthoritiesMapper;
-import org.springframework.security.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
+import org.springframework.security.access.authoritymapping.Attributes2GrantedAuthoritiesMapper;
+import org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesAuthenticationDetails;
 import org.springframework.util.Assert;
 
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PreAuthenticatedProcessingFilter.java
index 27ed542d1d..61d11d3b2f 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PreAuthenticatedProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PreAuthenticatedProcessingFilter.java
@@ -1,7 +1,7 @@
 package org.springframework.security.web.authentication.preauth.x509;
 
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
-import org.springframework.security.web.util.FilterChainOrder;
 
 import javax.servlet.http.HttpServletRequest;
 import java.security.cert.X509Certificate;
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java
index 103b87f27c..97b3260246 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java
@@ -9,12 +9,12 @@ import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationDetailsSource;
 import org.springframework.security.SpringSecurityMessageSource;
 import org.springframework.security.AccountStatusException;
+import org.springframework.security.providers.AccountStatusUserDetailsChecker;
 import org.springframework.security.providers.RememberMeAuthenticationToken;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UserDetailsService;
 import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.springframework.security.userdetails.UserDetailsChecker;
-import org.springframework.security.userdetails.checker.AccountStatusUserDetailsChecker;
 import org.springframework.security.web.WebAuthenticationDetailsSource;
 import org.springframework.security.web.logout.LogoutHandler;
 import org.springframework.util.Assert;
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilter.java
index aa7bf679e8..060515e631 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilter.java
@@ -20,8 +20,8 @@ import org.springframework.security.AuthenticationException;
 import org.springframework.security.AuthenticationManager;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.event.authentication.InteractiveAuthenticationSuccessEvent;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.SpringSecurityFilter;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java
index f55db28190..9820baefdc 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java
@@ -42,19 +42,19 @@ import org.springframework.security.GrantedAuthority;
 import org.springframework.security.LockedException;
 import org.springframework.security.SpringSecurityMessageSource;
 import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.providers.AccountStatusUserDetailsChecker;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UserDetailsChecker;
 import org.springframework.security.userdetails.UserDetailsService;
 import org.springframework.security.userdetails.UsernameNotFoundException;
-import org.springframework.security.userdetails.checker.AccountStatusUserDetailsChecker;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.SpringSecurityFilter;
 import org.springframework.security.web.WebAuthenticationDetailsSource;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.security.web.util.UrlUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/BasicProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/BasicProcessingFilter.java
index 85eaf8915f..33d2606d0d 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/www/BasicProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/www/BasicProcessingFilter.java
@@ -32,11 +32,11 @@ import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.AnonymousAuthenticationToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.SpringSecurityFilter;
 import org.springframework.security.web.WebAuthenticationDetailsSource;
 import org.springframework.security.web.authentication.rememberme.NullRememberMeServices;
 import org.springframework.security.web.authentication.rememberme.RememberMeServices;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.util.Assert;
 
 
diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java
index 4da6962ea0..f015bc3e7f 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java
@@ -45,9 +45,9 @@ import org.springframework.security.userdetails.UserDetailsService;
 import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.springframework.security.userdetails.cache.NullUserCache;
 import org.springframework.security.util.StringSplitUtils;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.SpringSecurityFilter;
 import org.springframework.security.web.WebAuthenticationDetailsSource;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
diff --git a/web/src/main/java/org/springframework/security/web/concurrent/ConcurrentSessionFilter.java b/web/src/main/java/org/springframework/security/web/concurrent/ConcurrentSessionFilter.java
index d291fe23fa..586a3dc41c 100644
--- a/web/src/main/java/org/springframework/security/web/concurrent/ConcurrentSessionFilter.java
+++ b/web/src/main/java/org/springframework/security/web/concurrent/ConcurrentSessionFilter.java
@@ -19,10 +19,10 @@ import org.springframework.security.Authentication;
 import org.springframework.security.concurrent.SessionInformation;
 import org.springframework.security.concurrent.SessionRegistry;
 import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.SpringSecurityFilter;
 import org.springframework.security.web.logout.LogoutHandler;
 import org.springframework.security.web.logout.SecurityContextLogoutHandler;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.security.web.util.UrlUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/web/src/main/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilter.java b/web/src/main/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilter.java
index 4bb8f5b537..c36871fdc0 100644
--- a/web/src/main/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilter.java
@@ -21,7 +21,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.context.SecurityContext;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.context.SecurityContextImpl;
-import org.springframework.security.web.util.FilterChainOrder;
+import org.springframework.security.web.FilterChainOrder;
 
 /**
  * Populates the {@link SecurityContextHolder} with information obtained from
diff --git a/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java
index d5c7c78fca..fa742d6db0 100644
--- a/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java
+++ b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java
@@ -10,8 +10,8 @@ import javax.servlet.http.HttpSession;
 
 import org.springframework.security.context.SecurityContext;
 import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.SpringSecurityFilter;
-import org.springframework.security.web.util.FilterChainOrder;
 
 /**
  * Populates the {@link SecurityContextHolder} with information obtained from
diff --git a/web/src/main/java/org/springframework/security/web/expression/DefaultWebSecurityExpressionHandler.java b/web/src/main/java/org/springframework/security/web/expression/DefaultWebSecurityExpressionHandler.java
index 3a8463ea94..aec33b09e5 100644
--- a/web/src/main/java/org/springframework/security/web/expression/DefaultWebSecurityExpressionHandler.java
+++ b/web/src/main/java/org/springframework/security/web/expression/DefaultWebSecurityExpressionHandler.java
@@ -7,8 +7,8 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationTrustResolver;
 import org.springframework.security.AuthenticationTrustResolverImpl;
-import org.springframework.security.expression.support.SecurityExpressionRoot;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.expression.support.SecurityExpressionRoot;
+import org.springframework.security.web.FilterInvocation;
 
 /**
  * Facade which isolates Spring Security's requirements for evaluating web-security expressions
diff --git a/web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java
index 22f370d35a..159f408169 100644
--- a/web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java
+++ b/web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java
@@ -9,7 +9,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.ParseException;
-import org.springframework.security.ConfigAttribute;
+import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.util.UrlMatcher;
 import org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource;
 import org.springframework.security.web.intercept.RequestKey;
diff --git a/web/src/main/java/org/springframework/security/web/expression/WebExpressionConfigAttribute.java b/web/src/main/java/org/springframework/security/web/expression/WebExpressionConfigAttribute.java
index 89b0710252..e5c7218e08 100644
--- a/web/src/main/java/org/springframework/security/web/expression/WebExpressionConfigAttribute.java
+++ b/web/src/main/java/org/springframework/security/web/expression/WebExpressionConfigAttribute.java
@@ -1,7 +1,7 @@
 package org.springframework.security.web.expression;
 
 import org.springframework.expression.Expression;
-import org.springframework.security.ConfigAttribute;
+import org.springframework.security.access.ConfigAttribute;
 
 /**
  * Simple expression configuration attribute for use in web request authorizations.
diff --git a/web/src/main/java/org/springframework/security/web/expression/WebExpressionVoter.java b/web/src/main/java/org/springframework/security/web/expression/WebExpressionVoter.java
index 89b3dcdfd4..f4b82dfc94 100644
--- a/web/src/main/java/org/springframework/security/web/expression/WebExpressionVoter.java
+++ b/web/src/main/java/org/springframework/security/web/expression/WebExpressionVoter.java
@@ -4,10 +4,10 @@ import java.util.List;
 
 import org.springframework.expression.EvaluationContext;
 import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.expression.ExpressionUtils;
-import org.springframework.security.vote.AccessDecisionVoter;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.expression.ExpressionUtils;
+import org.springframework.security.access.vote.AccessDecisionVoter;
+import org.springframework.security.web.FilterInvocation;
 
 /**
  * Voter which handles web authorisation decisions.
diff --git a/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionHandler.java b/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionHandler.java
index 44222a9ecb..d1c676645a 100644
--- a/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionHandler.java
+++ b/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionHandler.java
@@ -3,7 +3,7 @@ package org.springframework.security.web.expression;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.security.Authentication;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.web.FilterInvocation;
 
 public interface WebSecurityExpressionHandler {
     /**
diff --git a/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionRoot.java b/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionRoot.java
index ff5ea2c8bd..9cb8727954 100644
--- a/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionRoot.java
+++ b/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionRoot.java
@@ -5,8 +5,8 @@ import java.net.UnknownHostException;
 import java.util.Arrays;
 
 import org.springframework.security.Authentication;
-import org.springframework.security.expression.support.SecurityExpressionRoot;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.expression.support.SecurityExpressionRoot;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java
index 26ed23e186..591844d914 100644
--- a/web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java
+++ b/web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java
@@ -26,8 +26,9 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.security.ConfigAttribute;
+import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.util.UrlMatcher;
+import org.springframework.security.web.FilterInvocation;
 
 
 /**
diff --git a/web/src/main/java/org/springframework/security/web/intercept/FilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/intercept/FilterInvocationSecurityMetadataSource.java
index 30edaa2f94..504d78dad4 100644
--- a/web/src/main/java/org/springframework/security/web/intercept/FilterInvocationSecurityMetadataSource.java
+++ b/web/src/main/java/org/springframework/security/web/intercept/FilterInvocationSecurityMetadataSource.java
@@ -15,7 +15,8 @@
 
 package org.springframework.security.web.intercept;
 
-import org.springframework.security.intercept.SecurityMetadataSource;
+import org.springframework.security.access.intercept.SecurityMetadataSource;
+import org.springframework.security.web.FilterInvocation;
 
 
 /**
diff --git a/web/src/main/java/org/springframework/security/web/intercept/FilterSecurityInterceptor.java b/web/src/main/java/org/springframework/security/web/intercept/FilterSecurityInterceptor.java
index d3a8e6f388..e7dbaa767f 100644
--- a/web/src/main/java/org/springframework/security/web/intercept/FilterSecurityInterceptor.java
+++ b/web/src/main/java/org/springframework/security/web/intercept/FilterSecurityInterceptor.java
@@ -15,10 +15,11 @@
 
 package org.springframework.security.web.intercept;
 
-import org.springframework.security.intercept.AbstractSecurityInterceptor;
-import org.springframework.security.intercept.InterceptorStatusToken;
-import org.springframework.security.intercept.SecurityMetadataSource;
-import org.springframework.security.web.util.FilterChainOrder;
+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;
 
 import java.io.IOException;
diff --git a/web/src/main/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluator.java b/web/src/main/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluator.java
index 7bb98038d1..af033a93a6 100644
--- a/web/src/main/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluator.java
+++ b/web/src/main/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluator.java
@@ -20,10 +20,11 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.Authentication;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.intercept.AbstractSecurityInterceptor;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.util.Assert;
 
 
diff --git a/web/src/main/java/org/springframework/security/web/logout/LogoutFilter.java b/web/src/main/java/org/springframework/security/web/logout/LogoutFilter.java
index ed8fe8f852..573e8386f5 100644
--- a/web/src/main/java/org/springframework/security/web/logout/LogoutFilter.java
+++ b/web/src/main/java/org/springframework/security/web/logout/LogoutFilter.java
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.security.Authentication;
 import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.SpringSecurityFilter;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.security.web.util.UrlUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java
index 992670162e..8a6b08d4c9 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java
@@ -227,7 +227,8 @@ public class SavedRequest implements java.io.Serializable {
      * @return the full URL of this request
      */
     public String getFullRequestUrl() {
-        return UrlUtils.getFullRequestUrl(this);
+        return UrlUtils.buildFullRequestUrl(this.getScheme(), this.getServerName(), this.getServerPort(), this.getContextPath(),
+        this.getRequestURL(), this.getServletPath(), this.getRequestURI(), this.getPathInfo(), this.getQueryString());
     }
 
     public Iterator getHeaderNames() {
@@ -286,7 +287,8 @@ public class SavedRequest implements java.io.Serializable {
      * @return the URL, excluding any server name, context path or servlet path
      */
     public String getRequestUrl() {
-        return UrlUtils.getRequestUrl(this);
+        return UrlUtils.buildRequestUrl(this.getServletPath(), this.getRequestURI(), this.getContextPath(), this.getPathInfo(),
+        this.getQueryString());
     }
 
     public String getScheme() {
diff --git a/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManager.java b/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManager.java
index f2408736e8..7fb7194aa7 100644
--- a/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManager.java
+++ b/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManager.java
@@ -15,8 +15,8 @@
 
 package org.springframework.security.web.securechannel;
 
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.web.FilterInvocation;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImpl.java b/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImpl.java
index 23826451b8..118e4c9706 100644
--- a/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImpl.java
+++ b/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImpl.java
@@ -15,9 +15,9 @@
 
 package org.springframework.security.web.securechannel;
 
-import org.springframework.security.ConfigAttribute;
 
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.web.FilterInvocation;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
diff --git a/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessingFilter.java b/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessingFilter.java
index ad20fa1d57..0bdae6fe56 100644
--- a/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessingFilter.java
@@ -27,11 +27,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.security.ConfigAttribute;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.web.FilterChainOrder;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.SpringSecurityFilter;
-import org.springframework.security.web.intercept.FilterInvocation;
 import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.util.Assert;
 
 
diff --git a/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessor.java b/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessor.java
index 30e686d9cf..93865710a3 100644
--- a/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessor.java
+++ b/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessor.java
@@ -15,8 +15,8 @@
 
 package org.springframework.security.web.securechannel;
 
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.web.FilterInvocation;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/web/src/main/java/org/springframework/security/web/securechannel/InsecureChannelProcessor.java b/web/src/main/java/org/springframework/security/web/securechannel/InsecureChannelProcessor.java
index 0e97c4ee37..f6b2b8b294 100644
--- a/web/src/main/java/org/springframework/security/web/securechannel/InsecureChannelProcessor.java
+++ b/web/src/main/java/org/springframework/security/web/securechannel/InsecureChannelProcessor.java
@@ -21,8 +21,8 @@ import java.util.List;
 import javax.servlet.ServletException;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.util.Assert;
 
 
diff --git a/web/src/main/java/org/springframework/security/web/securechannel/SecureChannelProcessor.java b/web/src/main/java/org/springframework/security/web/securechannel/SecureChannelProcessor.java
index 38d337a342..f9dd5d7629 100644
--- a/web/src/main/java/org/springframework/security/web/securechannel/SecureChannelProcessor.java
+++ b/web/src/main/java/org/springframework/security/web/securechannel/SecureChannelProcessor.java
@@ -21,8 +21,8 @@ import java.util.List;
 import javax.servlet.ServletException;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.util.Assert;
 
 
diff --git a/web/src/main/java/org/springframework/security/web/util/FilterInvocationUtils.java b/web/src/main/java/org/springframework/security/web/util/FilterInvocationUtils.java
index e79fe52ae0..af2bbe9ae3 100644
--- a/web/src/main/java/org/springframework/security/web/util/FilterInvocationUtils.java
+++ b/web/src/main/java/org/springframework/security/web/util/FilterInvocationUtils.java
@@ -24,7 +24,7 @@ import javax.servlet.ServletResponse;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.util.Assert;
 
 
diff --git a/web/src/main/java/org/springframework/security/web/util/UrlUtils.java b/web/src/main/java/org/springframework/security/web/util/UrlUtils.java
index c5cd2c63cb..25a0f44882 100644
--- a/web/src/main/java/org/springframework/security/web/util/UrlUtils.java
+++ b/web/src/main/java/org/springframework/security/web/util/UrlUtils.java
@@ -17,7 +17,7 @@ package org.springframework.security.web.util;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.savedrequest.SavedRequest;
 
 
@@ -42,7 +42,7 @@ public final class UrlUtils {
      *
      * @return the full URL
      */
-    private static String buildFullRequestUrl(String scheme, String serverName, int serverPort, String contextPath,
+    public static String buildFullRequestUrl(String scheme, String serverName, int serverPort, String contextPath,
         String requestUrl, String servletPath, String requestURI, String pathInfo, String queryString) {
 
         boolean includePort = true;
@@ -64,7 +64,7 @@ public final class UrlUtils {
      *
      * @return the URL, excluding any server name, context path or servlet path
      */
-    private static String buildRequestUrl(String servletPath, String requestURI, String contextPath, String pathInfo,
+    public static String buildRequestUrl(String servletPath, String requestURI, String contextPath, String pathInfo,
         String queryString) {
 
         String uri = servletPath;
@@ -84,11 +84,6 @@ public final class UrlUtils {
             r.getRequestURL().toString(), r.getServletPath(), r.getRequestURI(), r.getPathInfo(), r.getQueryString());
     }
 
-    public static String getFullRequestUrl(SavedRequest sr) {
-        return buildFullRequestUrl(sr.getScheme(), sr.getServerName(), sr.getServerPort(), sr.getContextPath(),
-            sr.getRequestURL(), sr.getServletPath(), sr.getRequestURI(), sr.getPathInfo(), sr.getQueryString());
-    }
-
     public static String getRequestUrl(FilterInvocation fi) {
         HttpServletRequest r = fi.getHttpRequest();
 
@@ -96,11 +91,6 @@ public final class UrlUtils {
             r.getQueryString());
     }
 
-    public static String getRequestUrl(SavedRequest sr) {
-        return buildRequestUrl(sr.getServletPath(), sr.getRequestURI(), sr.getContextPath(), sr.getPathInfo(),
-            sr.getQueryString());
-    }
-
     /**
      * Returns true if the supplied URL starts with a "/" or "http".
      */
diff --git a/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestFilter.java b/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestFilter.java
index 68173eaa6c..020461d4c1 100644
--- a/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestFilter.java
+++ b/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestFilter.java
@@ -23,10 +23,10 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.PortResolver;
 import org.springframework.security.web.PortResolverImpl;
 import org.springframework.security.web.SpringSecurityFilter;
-import org.springframework.security.web.util.FilterChainOrder;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 
diff --git a/web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java b/web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java
index fd633cc1b9..f6094e1e94 100644
--- a/web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java
@@ -28,10 +28,10 @@ import junit.framework.TestCase;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.BadCredentialsException;
 import org.springframework.security.MockAuthenticationEntryPoint;
 import org.springframework.security.MockPortResolver;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.AnonymousAuthenticationToken;
 import org.springframework.security.util.AuthorityUtils;
diff --git a/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java
index 03c8e73511..b1e5c772cc 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java
@@ -11,10 +11,10 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.authentication.AbstractProcessingFilter;
 import org.springframework.security.web.authentication.AuthenticationProcessingFilter;
 import org.springframework.security.web.authentication.DefaultLoginPageGeneratingFilter;
-import org.springframework.security.web.util.FilterChainOrder;
 
 /**
  *
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterTests.java
index 2c024299e1..9f3dfaed1f 100755
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterTests.java
@@ -2,8 +2,8 @@ package org.springframework.security.web.authentication.preauth;
 
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
-import org.springframework.security.web.util.FilterChainOrder;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java
index 873eb1208f..1a20167d46 100755
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java
@@ -10,10 +10,10 @@ import javax.servlet.http.HttpServletRequest;
 
 import junit.framework.TestCase;
 
-import org.springframework.security.authoritymapping.MappableAttributesRetriever;
-import org.springframework.security.authoritymapping.Attributes2GrantedAuthoritiesMapper;
-import org.springframework.security.authoritymapping.SimpleMappableAttributesRetriever;
-import org.springframework.security.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
+import org.springframework.security.access.authoritymapping.Attributes2GrantedAuthoritiesMapper;
+import org.springframework.security.access.authoritymapping.MappableAttributesRetriever;
+import org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper;
+import org.springframework.security.access.authoritymapping.SimpleMappableAttributesRetriever;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails;
 import org.springframework.security.web.authentication.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource;
 import org.springframework.security.GrantedAuthority;
diff --git a/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java b/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java
index 6ec731014a..0ba754e233 100644
--- a/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java
@@ -22,10 +22,10 @@ import org.springframework.security.context.SecurityContext;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.context.SecurityContextImpl;
 import org.springframework.security.providers.TestingAuthenticationToken;
+import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.context.HttpRequestResponseHolder;
 import org.springframework.security.web.context.SecurityContextPersistenceFilter;
 import org.springframework.security.web.context.SecurityContextRepository;
-import org.springframework.security.web.util.FilterChainOrder;
 
 public class SecurityContextPersistenceFilterTests {
     Mockery jmock = new JUnit4Mockery();
diff --git a/web/src/test/java/org/springframework/security/web/expression/WebSecurityExpressionRootTests.java b/web/src/test/java/org/springframework/security/web/expression/WebSecurityExpressionRootTests.java
index 9f382f8504..b04d91f62e 100644
--- a/web/src/test/java/org/springframework/security/web/expression/WebSecurityExpressionRootTests.java
+++ b/web/src/test/java/org/springframework/security/web/expression/WebSecurityExpressionRootTests.java
@@ -7,7 +7,7 @@ import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.Authentication;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.util.FilterInvocationUtils;
 
 /**
diff --git a/web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java b/web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java
index 3c40cac5e5..ac7ef48ba9 100644
--- a/web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java
+++ b/web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java
@@ -26,11 +26,11 @@ import javax.servlet.FilterChain;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.util.AntUrlPathMatcher;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource;
-import org.springframework.security.web.intercept.FilterInvocation;
 import org.springframework.security.web.intercept.RequestKey;
 
 /**
diff --git a/web/src/test/java/org/springframework/security/web/intercept/FilterInvocationTests.java b/web/src/test/java/org/springframework/security/web/intercept/FilterInvocationTests.java
index c4436de9d8..94f7ac5d72 100644
--- a/web/src/test/java/org/springframework/security/web/intercept/FilterInvocationTests.java
+++ b/web/src/test/java/org/springframework/security/web/intercept/FilterInvocationTests.java
@@ -23,7 +23,7 @@ import javax.servlet.FilterChain;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.web.FilterInvocation;
 
 /**
  * Tests {@link FilterInvocation}.
diff --git a/web/src/test/java/org/springframework/security/web/intercept/FilterSecurityInterceptorTests.java b/web/src/test/java/org/springframework/security/web/intercept/FilterSecurityInterceptorTests.java
index 5dfa55fa7c..986b56dd58 100644
--- a/web/src/test/java/org/springframework/security/web/intercept/FilterSecurityInterceptorTests.java
+++ b/web/src/test/java/org/springframework/security/web/intercept/FilterSecurityInterceptorTests.java
@@ -27,16 +27,16 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.AccessDecisionManager;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationManager;
-import org.springframework.security.ConfigAttribute;
 import org.springframework.security.MockApplicationEventPublisher;
-import org.springframework.security.RunAsManager;
-import org.springframework.security.SecurityConfig;
+import org.springframework.security.access.AccessDecisionManager;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.access.intercept.RunAsManager;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.TestingAuthenticationToken;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource;
 import org.springframework.security.web.intercept.FilterSecurityInterceptor;
 
diff --git a/web/src/test/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluatorTests.java b/web/src/test/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluatorTests.java
index d296f71ecc..6bd8051319 100644
--- a/web/src/test/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluatorTests.java
+++ b/web/src/test/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluatorTests.java
@@ -27,15 +27,15 @@ import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.security.AccessDecisionManager;
-import org.springframework.security.AccessDeniedException;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationManager;
 import org.springframework.security.MockApplicationEventPublisher;
-import org.springframework.security.RunAsManager;
+import org.springframework.security.access.AccessDecisionManager;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.intercept.RunAsManager;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.TestingAuthenticationToken;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource;
 import org.springframework.security.web.intercept.FilterSecurityInterceptor;
 import org.springframework.security.web.intercept.WebInvocationPrivilegeEvaluator;
diff --git a/web/src/test/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImplTests.java b/web/src/test/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImplTests.java
index d25674eeba..013e7a198e 100644
--- a/web/src/test/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImplTests.java
+++ b/web/src/test/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImplTests.java
@@ -29,9 +29,9 @@ import junit.framework.TestCase;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.securechannel.ChannelDecisionManagerImpl;
 import org.springframework.security.web.securechannel.ChannelProcessor;
 
diff --git a/web/src/test/java/org/springframework/security/web/securechannel/ChannelProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/securechannel/ChannelProcessingFilterTests.java
index 08bb3b63af..14a4e9447d 100644
--- a/web/src/test/java/org/springframework/security/web/securechannel/ChannelProcessingFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/securechannel/ChannelProcessingFilterTests.java
@@ -28,9 +28,9 @@ import javax.servlet.ServletException;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.ConfigAttribute;
-import org.springframework.security.SecurityConfig;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource;
 import org.springframework.security.web.securechannel.ChannelDecisionManager;
 import org.springframework.security.web.securechannel.ChannelProcessingFilter;
diff --git a/web/src/test/java/org/springframework/security/web/securechannel/InsecureChannelProcessorTests.java b/web/src/test/java/org/springframework/security/web/securechannel/InsecureChannelProcessorTests.java
index 1cc4f18ab6..ea842f1a6f 100644
--- a/web/src/test/java/org/springframework/security/web/securechannel/InsecureChannelProcessorTests.java
+++ b/web/src/test/java/org/springframework/security/web/securechannel/InsecureChannelProcessorTests.java
@@ -23,8 +23,8 @@ import junit.framework.TestCase;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.SecurityConfig;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.securechannel.InsecureChannelProcessor;
 
 
diff --git a/web/src/test/java/org/springframework/security/web/securechannel/SecureChannelProcessorTests.java b/web/src/test/java/org/springframework/security/web/securechannel/SecureChannelProcessorTests.java
index ada5e1c073..8e1b6cbae9 100644
--- a/web/src/test/java/org/springframework/security/web/securechannel/SecureChannelProcessorTests.java
+++ b/web/src/test/java/org/springframework/security/web/securechannel/SecureChannelProcessorTests.java
@@ -23,8 +23,8 @@ import junit.framework.TestCase;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.SecurityConfig;
-import org.springframework.security.web.intercept.FilterInvocation;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.securechannel.SecureChannelProcessor;