From bec84f874a3d0dae963a47df62a4b554da29596e Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Thu, 26 Mar 2009 07:18:36 +0000 Subject: [PATCH] SEC-1125: Further refactoring of web packages following creation of web module. Fixing samples. --- .../security/ui/cas/CasProcessingFilter.java | 4 +- .../ui/cas/CasProcessingFilterEntryPoint.java | 2 +- config/pom.xml | 16 ++- .../config/AnonymousBeanDefinitionParser.java | 4 +- ...sicAuthenticationBeanDefinitionParser.java | 4 +- .../config/CachingUserDetailsService.java | 4 +- ...oncurrentSessionsBeanDefinitionParser.java | 4 +- .../EntryPointInjectionBeanPostProcessor.java | 4 +- .../config/FilterChainProxyPostProcessor.java | 26 ++--- ...ityMetadataSourceBeanDefinitionParser.java | 6 +- .../config/FormLoginBeanDefinitionParser.java | 8 +- ...balMethodSecurityBeanDefinitionParser.java | 8 +- .../HttpSecurityBeanDefinitionParser.java | 52 +++++---- .../config/LogoutBeanDefinitionParser.java | 4 +- .../OrderedFilterBeanDefinitionDecorator.java | 2 +- .../PortMappingsBeanDefinitionParser.java | 4 +- .../RememberMeBeanDefinitionParser.java | 10 +- ...rMeServicesInjectionBeanPostProcessor.java | 6 +- ...ionRegistryInjectionBeanPostProcessor.java | 4 +- ...ailsServiceInjectionBeanPostProcessor.java | 2 +- .../config/X509BeanDefinitionParser.java | 6 +- ...adataSourceBeanDefinitionParserTests.java} | 17 ++- ...thodSecurityBeanDefinitionParserTests.java | 13 +++ ...HttpSecurityBeanDefinitionParserTests.java | 104 +++++++++++------- ...gistryInjectionBeanPostProcessorTests.java | 8 +- .../util/FilterChainProxyConfigTests.java | 8 +- .../security/util/filtertest-valid.xml | 20 ++-- .../{ui => }/AuthenticationDetails.java | 2 +- .../{ui => }/AuthenticationDetailsSource.java | 2 +- .../AuthenticationDetailsSourceImpl.java | 4 +- .../AuthenticationTrustResolverImpl.java | 4 +- .../AbstractSecurityExpressionHandler.java | 5 + .../AnonymousAuthenticationProvider.java | 3 +- .../AnonymousAuthenticationToken.java | 3 +- .../RememberMeAuthenticationProvider.java | 3 +- .../RememberMeAuthenticationToken.java | 3 +- .../security/providers/anonymous/package.html | 7 -- ...ractUserDetailsAuthenticationProvider.java | 3 +- .../providers/rememberme/package.html | 5 - .../dao => userdetails}/UserCache.java | 4 +- .../cache/EhCacheBasedUserCache.java | 4 +- .../cache/NullUserCache.java | 4 +- .../jdbc/JdbcUserDetailsManager.java | 4 +- .../AuthenticationDetailsSourceImplTests.java | 4 +- .../AuthenticationTrustResolverImplTests.java | 4 +- .../AnonymousAuthenticationProviderTests.java | 2 + .../AnonymousAuthenticationTokenTests.java | 1 + .../dao/DaoAuthenticationProviderTests.java | 4 +- .../security/providers/dao/MockUserCache.java | 1 + .../dao/cache/EhCacheBasedUserCacheTests.java | 1 + .../dao/cache/NullUserCacheTests.java | 1 + ...RememberMeAuthenticationProviderTests.java | 2 + .../RememberMeAuthenticationTokenTests.java | 1 + .../jdbc/JdbcUserDetailsManagerTests.java | 2 +- .../vote/AuthenticatedVoterTests.java | 4 +- .../FilterChainPerformanceTests.java | 4 +- .../filter-chain-performance-app-context.xml | 24 ++-- .../main/webapp/WEB-INF/custom-filters.xml | 6 +- .../src/main/webapp/WEB-INF/http-security.xml | 10 +- .../SpringSecurityAuthenticationSource.java | 2 +- ...ringSecurityAuthenticationSourceTests.java | 2 +- .../ui/ntlm/NtlmProcessingFilter.java | 12 +- .../ntlm/NtlmProcessingFilterEntryPoint.java | 2 +- .../AuthenticationCancelledException.java | 2 +- .../OpenID4JavaConsumer.java | 8 +- .../OpenIDAuthenticationProcessingFilter.java | 11 +- .../openid/OpenIDAuthenticationProvider.java | 2 +- .../openid/OpenIDAuthenticationStatus.java | 2 +- .../openid/OpenIDAuthenticationToken.java | 2 +- .../{ui => }/openid/OpenIDConsumer.java | 3 +- .../openid/OpenIDConsumerException.java | 2 +- .../security/{ui => }/openid/package.html | 0 .../security/providers/openid/package.html | 6 - .../security/ui/openid/consumers/package.html | 5 - .../MockOpenIDConsumer.java | 8 +- ...IDAuthenticationProcessingFilterTests.java | 7 +- .../OpenIDAuthenticationProviderTests.java | 6 +- .../OpenIDAuthenticationTokenTests.java | 5 +- .../portlet/PortletProcessingInterceptor.java | 4 +- .../WEB-INF/applicationContext-security.xml | 2 +- .../contacts/src/main/webapp/WEB-INF/web.xml | 9 -- .../applicationContext-dms-secure.xml | 2 +- samples/ldap/pom.xml | 10 ++ samples/ldap/src/main/webapp/WEB-INF/web.xml | 8 -- samples/preauth/pom.xml | 20 ++-- .../WEB-INF/applicationContext-security.xml | 24 ++-- .../preauth/src/main/webapp/WEB-INF/web.xml | 36 +++--- samples/runall.sh | 10 ++ .../tutorial/src/main/webapp/WEB-INF/web.xml | 2 +- .../security/ui/basicauth/package.html | 5 - .../security/ui/digestauth/package.html | 5 - .../security/ui/webapp/package.html | 5 - ...AuthenticationTargetUrlRequestHandler.java | 5 +- .../{ui => web}/AccessDeniedHandler.java | 2 +- .../{ui => web}/AccessDeniedHandlerImpl.java | 2 +- .../{ui => web}/AuthenticationEntryPoint.java | 2 +- .../ExceptionTranslationFilter.java | 12 +- .../{ui => web}/FilterChainOrder.java | 2 +- .../web/{util => }/FilterChainProxy.java | 6 +- .../security/web/{util => }/PortMapper.java | 2 +- .../web/{util => }/PortMapperImpl.java | 2 +- .../security/web/{util => }/PortResolver.java | 2 +- .../web/{util => }/PortResolverImpl.java | 2 +- .../SessionFixationProtectionFilter.java | 4 +- .../{ui => web}/SpringSecurityFilter.java | 2 +- .../{ui => web}/WebAuthenticationDetails.java | 2 +- .../WebAuthenticationDetailsSource.java | 3 +- .../AbstractProcessingFilter.java | 9 +- .../AnonymousProcessingFilter.java | 14 +-- .../AuthenticationFailureHandler.java | 2 +- .../AuthenticationProcessingFilter.java | 5 +- ...henticationProcessingFilterEntryPoint.java | 14 +-- .../AuthenticationSuccessHandler.java | 2 +- .../DefaultLoginPageGeneratingFilter.java | 9 +- ...onMappingAuthenticationFailureHandler.java | 2 +- ...uestAwareAuthenticationSuccessHandler.java | 7 +- ...SimpleUrlAuthenticationFailureHandler.java | 2 +- ...SimpleUrlAuthenticationSuccessHandler.java | 3 +- .../{ui => web/authentication}/package.html | 0 ...tractPreAuthenticatedProcessingFilter.java | 10 +- ...enticatedCredentialsNotFoundException.java | 2 +- ...antedAuthoritiesAuthenticationDetails.java | 4 +- ...edAuthoritiesWebAuthenticationDetails.java | 4 +- ...thenticatedProcessingFilterEntryPoint.java | 6 +- ...eaderPreAuthenticatedProcessingFilter.java | 6 +- ...henticatedAuthenticationDetailsSource.java | 6 +- ...ticatedWebAuthenticationDetailsSource.java | 4 +- .../J2eePreAuthenticatedProcessingFilter.java | 4 +- .../WebXmlMappableAttributesRetriever.java | 2 +- .../preauth/websphere/WASSecurityHelper.java | 2 +- ...2SpringSecurityPropagationInterceptor.java | 4 +- ...henticatedAuthenticationDetailsSource.java | 8 +- ...pherePreAuthenticatedProcessingFilter.java | 4 +- ...ticatedWebAuthenticationDetailsSource.java | 4 +- .../x509/SubjectDnX509PrincipalExtractor.java | 2 +- .../X509PreAuthenticatedProcessingFilter.java | 6 +- .../preauth/x509/X509PrincipalExtractor.java | 2 +- .../AbstractRememberMeServices.java | 10 +- .../rememberme/CookieTheftException.java | 2 +- .../InMemoryTokenRepositoryImpl.java | 2 +- .../rememberme/InvalidCookieException.java | 2 +- .../rememberme/JdbcTokenRepositoryImpl.java | 2 +- .../rememberme/NullRememberMeServices.java | 2 +- .../rememberme/PersistentRememberMeToken.java | 2 +- ...ersistentTokenBasedRememberMeServices.java | 2 +- .../rememberme/PersistentTokenRepository.java | 2 +- .../RememberMeAuthenticationException.java | 2 +- .../RememberMeProcessingFilter.java | 10 +- .../rememberme/RememberMeServices.java | 8 +- .../TokenBasedRememberMeServices.java | 2 +- .../authentication}/rememberme/package.html | 0 .../SwitchUserAuthorityChanger.java | 2 +- .../SwitchUserGrantedAuthority.java | 6 +- .../SwitchUserProcessingFilter.java | 22 ++-- .../authentication}/switchuser/package.html | 0 .../www}/BasicProcessingFilter.java | 20 ++-- .../www}/BasicProcessingFilterEntryPoint.java | 4 +- .../www}/DigestProcessingFilter.java | 16 +-- .../DigestProcessingFilterEntryPoint.java | 4 +- .../www}/NonceExpiredException.java | 2 +- .../concurrent/ConcurrentSessionFilter.java | 18 +-- .../concurrent/SessionRegistryImpl.java | 10 +- .../{ => web}/concurrent/package.html | 0 .../context}/HttpRequestResponseHolder.java | 2 +- .../HttpSessionContextIntegrationFilter.java | 4 +- .../HttpSessionSecurityContextRepository.java | 2 +- ...ContextOnUpdateOrErrorResponseWrapper.java | 2 +- .../SecurityContextPersistenceFilter.java | 6 +- .../context}/SecurityContextRepository.java | 2 +- .../DefaultWebSecurityExpressionHandler.java | 5 +- ...ilterInvocationSecurityMetadataSource.java | 6 +- .../WebExpressionConfigAttribute.java | 2 +- .../expression}/WebExpressionVoter.java | 7 +- .../WebSecurityExpressionHandler.java | 4 +- .../WebSecurityExpressionRoot.java | 4 +- ...ilterInvocationSecurityMetadataSource.java | 2 +- .../intercept}/FilterInvocation.java | 4 +- ...ilterInvocationSecurityMetadataSource.java | 2 +- .../intercept}/FilterSecurityInterceptor.java | 4 +- .../web => web/intercept}/RequestKey.java | 2 +- .../WebInvocationPrivilegeEvaluator.java | 2 +- .../web => web/intercept}/package.html | 0 .../{ui => web}/logout/LogoutFilter.java | 7 +- .../{ui => web}/logout/LogoutHandler.java | 2 +- .../logout}/LogoutSuccessHandler.java | 3 +- .../logout/SecurityContextLogoutHandler.java | 2 +- .../logout/SimpleUrlLogoutSuccessHandler.java | 5 +- .../{ui => web}/savedrequest/Enumerator.java | 2 +- .../savedrequest/FastHttpDateFormat.java | 2 +- .../{ui => web}/savedrequest/SavedCookie.java | 2 +- .../savedrequest/SavedRequest.java | 8 +- .../{ui => web}/savedrequest/package.html | 0 .../AbstractRetryEntryPoint.java | 10 +- .../securechannel/ChannelDecisionManager.java | 4 +- .../ChannelDecisionManagerImpl.java | 4 +- .../securechannel/ChannelEntryPoint.java | 2 +- .../ChannelProcessingFilter.java | 10 +- .../securechannel/ChannelProcessor.java | 4 +- .../InsecureChannelProcessor.java | 4 +- .../RetryWithHttpEntryPoint.java | 2 +- .../RetryWithHttpsEntryPoint.java | 2 +- .../securechannel/SecureChannelProcessor.java | 4 +- .../{ => web}/securechannel/package.html | 0 .../session/HttpSessionCreatedEvent.java | 2 +- .../session/HttpSessionDestroyedEvent.java | 4 +- .../session/HttpSessionEventPublisher.java | 2 +- .../security/{ui => web}/session/package.html | 0 .../web/util/FilterInvocationUtils.java | 2 +- .../security/web/util/RedirectUtils.java | 4 +- .../security/web/util/UrlUtils.java | 4 +- .../wrapper/SavedRequestAwareWrapper.java | 12 +- ...curityContextHolderAwareRequestFilter.java | 10 +- ...urityContextHolderAwareRequestWrapper.java | 4 +- .../security/{ => web}/wrapper/package.html | 0 .../MockAuthenticationEntryPoint.java | 2 +- .../security/MockPortResolver.java | 2 +- .../security/util/MockFilter.java | 68 ------------ .../ExceptionTranslationFilterTests.java | 8 +- .../{util => web}/PortMapperImplTests.java | 4 +- .../{util => web}/PortResolverImplTests.java | 6 +- .../SessionFixationProtectionFilterTests.java | 5 +- .../AbstractProcessingFilterTests.java | 16 +-- .../AnonymousProcessingFilterTests.java | 4 +- ...cationProcessingFilterEntryPointTests.java | 5 +- .../AuthenticationProcessingFilterTests.java | 5 +- ...DefaultLoginPageGeneratingFilterTests.java | 8 +- ...wareAuthenticationSuccessHandlerTests.java | 3 +- ...PreAuthenticatedProcessingFilterTests.java | 3 +- ...horitiesWebAuthenticationDetailsTests.java | 3 +- ...icatedProcessingFilterEntryPointTests.java | 3 +- ...PreAuthenticatedProcessingFilterTests.java | 5 +- ...PreAuthenticatedProcessingFilterTests.java | 5 +- ...edWebAuthenticationDetailsSourceTests.java | 5 +- ...PreAuthenticatedProcessingFilterTests.java | 3 +- .../WebXmlJ2eeDefinedRolesRetrieverTests.java | 4 +- .../SubjectDnX509PrincipalExtractorTests.java | 3 +- .../preauth/x509/X509TestUtils.java | 2 +- .../AbstractRememberMeServicesTests.java | 6 +- .../JdbcTokenRepositoryImplTests.java | 4 +- .../NullRememberMeServicesTests.java | 20 +--- ...tentTokenBasedRememberMeServicesTests.java | 8 +- .../RememberMeProcessingFilterTests.java | 6 +- .../TokenBasedRememberMeServicesTests.java | 7 +- .../SwitchUserProcessingFilterTests.java | 9 +- .../BasicProcessingFilterEntryPointTests.java | 3 +- .../www}/BasicProcessingFilterTests.java | 4 +- ...DigestProcessingFilterEntryPointTests.java | 4 +- .../www}/DigestProcessingFilterTests.java | 6 +- .../ConcurrentSessionControllerImplTests.java | 8 +- .../ConcurrentSessionFilterTests.java | 5 +- .../concurrent/SessionInformationTests.java | 4 +- .../concurrent/SessionRegistryImplTests.java | 6 +- ...pSessionContextIntegrationFilterTests.java | 3 +- ...SessionSecurityContextRepositoryTests.java | 5 +- ...SecurityContextPersistenceFilterTests.java | 7 +- .../WebSecurityExpressionRootTests.java | 4 +- ...InvocationSecurityMetadataSourceTests.java | 5 +- .../intercept}/FilterInvocationTests.java | 3 +- .../FilterSecurityInterceptorTests.java | 5 +- .../intercept}/RequestKeyTests.java | 3 +- .../WebInvocationPrivilegeEvaluatorTests.java | 8 +- .../logout/LogoutHandlerTests.java | 4 +- .../savedrequest/SavedCookieTests.java | 5 +- .../savedrequest/SavedRequestTests.java | 3 +- .../ChannelDecisionManagerImplTests.java | 6 +- .../ChannelProcessingFilterTests.java | 8 +- .../InsecureChannelProcessorTests.java | 5 +- .../RetryWithHttpEntryPointTests.java | 5 +- .../RetryWithHttpsEntryPointTests.java | 5 +- .../SecureChannelProcessorTests.java | 5 +- .../HttpSessionEventPublisherTests.java | 3 +- .../session/MockApplicationListener.java | 4 +- .../SavedRequestAwareWrapperTests.java | 7 +- ...yContextHolderAwareRequestFilterTests.java | 4 +- ...ContextHolderAwareRequestWrapperTests.java | 3 +- 275 files changed, 832 insertions(+), 796 deletions(-) rename config/src/test/java/org/springframework/security/config/{FilterInvocationDefinitionSourceParserTests.java => FilterInvocationSecurityMetadataSourceBeanDefinitionParserTests.java} (80%) rename core/src/main/java/org/springframework/security/{ui => }/AuthenticationDetails.java (97%) rename core/src/main/java/org/springframework/security/{ui => }/AuthenticationDetailsSource.java (94%) rename core/src/main/java/org/springframework/security/{ui => }/AuthenticationDetailsSourceImpl.java (96%) create mode 100644 core/src/main/java/org/springframework/security/expression/support/AbstractSecurityExpressionHandler.java rename core/src/main/java/org/springframework/security/providers/{anonymous => }/AnonymousAuthenticationProvider.java (96%) rename core/src/main/java/org/springframework/security/providers/{anonymous => }/AnonymousAuthenticationToken.java (96%) rename core/src/main/java/org/springframework/security/providers/{rememberme => }/RememberMeAuthenticationProvider.java (95%) rename core/src/main/java/org/springframework/security/providers/{rememberme => }/RememberMeAuthenticationToken.java (96%) delete mode 100644 core/src/main/java/org/springframework/security/providers/anonymous/package.html delete mode 100644 core/src/main/java/org/springframework/security/providers/rememberme/package.html rename core/src/main/java/org/springframework/security/{providers/dao => userdetails}/UserCache.java (93%) rename core/src/main/java/org/springframework/security/{providers/dao => userdetails}/cache/EhCacheBasedUserCache.java (96%) rename core/src/main/java/org/springframework/security/{providers/dao => userdetails}/cache/NullUserCache.java (90%) rename {web/src/test/java/org/springframework/security/ui => core/src/test/java/org/springframework/security}/AuthenticationDetailsSourceImplTests.java (92%) rename openid/src/main/java/org/springframework/security/{providers => }/openid/AuthenticationCancelledException.java (92%) rename openid/src/main/java/org/springframework/security/{ui/openid/consumers => openid}/OpenID4JavaConsumer.java (93%) rename openid/src/main/java/org/springframework/security/{ui => }/openid/OpenIDAuthenticationProcessingFilter.java (95%) rename openid/src/main/java/org/springframework/security/{providers => }/openid/OpenIDAuthenticationProvider.java (96%) rename openid/src/main/java/org/springframework/security/{providers => }/openid/OpenIDAuthenticationStatus.java (95%) rename openid/src/main/java/org/springframework/security/{providers => }/openid/OpenIDAuthenticationToken.java (95%) rename openid/src/main/java/org/springframework/security/{ui => }/openid/OpenIDConsumer.java (91%) rename openid/src/main/java/org/springframework/security/{ui => }/openid/OpenIDConsumerException.java (93%) rename openid/src/main/java/org/springframework/security/{ui => }/openid/package.html (100%) delete mode 100644 openid/src/main/java/org/springframework/security/providers/openid/package.html delete mode 100644 openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html rename openid/src/test/java/org/springframework/security/{ui/openid/consumers => openid}/MockOpenIDConsumer.java (89%) rename openid/src/test/java/org/springframework/security/{ui => }/openid/OpenIDAuthenticationProcessingFilterTests.java (90%) rename openid/src/test/java/org/springframework/security/{providers => }/openid/OpenIDAuthenticationProviderTests.java (94%) rename openid/src/test/java/org/springframework/security/{providers => }/openid/OpenIDAuthenticationTokenTests.java (85%) delete mode 100644 web/src/main/java/org/springframework/security/ui/basicauth/package.html delete mode 100644 web/src/main/java/org/springframework/security/ui/digestauth/package.html delete mode 100644 web/src/main/java/org/springframework/security/ui/webapp/package.html rename web/src/main/java/org/springframework/security/{ui => web}/AbstractAuthenticationTargetUrlRequestHandler.java (97%) rename web/src/main/java/org/springframework/security/{ui => web}/AccessDeniedHandler.java (95%) rename web/src/main/java/org/springframework/security/{ui => web}/AccessDeniedHandlerImpl.java (96%) rename web/src/main/java/org/springframework/security/{ui => web}/AuthenticationEntryPoint.java (97%) rename web/src/main/java/org/springframework/security/{ui => web}/ExceptionTranslationFilter.java (96%) rename web/src/main/java/org/springframework/security/{ui => web}/FilterChainOrder.java (99%) rename web/src/main/java/org/springframework/security/web/{util => }/FilterChainProxy.java (98%) rename web/src/main/java/org/springframework/security/web/{util => }/PortMapper.java (97%) rename web/src/main/java/org/springframework/security/web/{util => }/PortMapperImpl.java (98%) rename web/src/main/java/org/springframework/security/web/{util => }/PortResolver.java (96%) rename web/src/main/java/org/springframework/security/web/{util => }/PortResolverImpl.java (98%) rename web/src/main/java/org/springframework/security/{ui => web}/SessionFixationProtectionFilter.java (97%) rename web/src/main/java/org/springframework/security/{ui => web}/SpringSecurityFilter.java (97%) rename web/src/main/java/org/springframework/security/{ui => web}/WebAuthenticationDetails.java (99%) rename web/src/main/java/org/springframework/security/{ui => web}/WebAuthenticationDetailsSource.java (93%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/AbstractProcessingFilter.java (97%) rename web/src/main/java/org/springframework/security/{ui/anonymous => web/authentication}/AnonymousProcessingFilter.java (92%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/AuthenticationFailureHandler.java (95%) rename web/src/main/java/org/springframework/security/{ui/webapp => web/authentication}/AuthenticationProcessingFilter.java (97%) rename web/src/main/java/org/springframework/security/{ui/webapp => web/authentication}/AuthenticationProcessingFilterEntryPoint.java (95%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/AuthenticationSuccessHandler.java (95%) rename web/src/main/java/org/springframework/security/{ui/webapp => web/authentication}/DefaultLoginPageGeneratingFilter.java (95%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/ExceptionMappingAuthenticationFailureHandler.java (97%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/SavedRequestAwareAuthenticationSuccessHandler.java (93%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/SimpleUrlAuthenticationFailureHandler.java (98%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/SimpleUrlAuthenticationSuccessHandler.java (84%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/package.html (100%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/AbstractPreAuthenticatedProcessingFilter.java (93%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/PreAuthenticatedCredentialsNotFoundException.java (79%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java (93%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java (88%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/PreAuthenticatedProcessingFilterEntryPoint.java (88%) rename web/src/main/java/org/springframework/security/{ui/preauth/header => web/authentication/preauth}/RequestHeaderPreAuthenticatedProcessingFilter.java (91%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java (94%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java (87%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java (84%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/j2ee/WebXmlMappableAttributesRetriever.java (94%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/websphere/WASSecurityHelper.java (99%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java (96%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java (90%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java (86%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java (82%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/x509/SubjectDnX509PrincipalExtractor.java (97%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/x509/X509PreAuthenticatedProcessingFilter.java (86%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/preauth/x509/X509PrincipalExtractor.java (83%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/AbstractRememberMeServices.java (97%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/CookieTheftException.java (75%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/InMemoryTokenRepositoryImpl.java (96%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/InvalidCookieException.java (83%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/JdbcTokenRepositoryImpl.java (98%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/NullRememberMeServices.java (95%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/PersistentRememberMeToken.java (91%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/PersistentTokenBasedRememberMeServices.java (99%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/PersistentTokenRepository.java (89%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/RememberMeAuthenticationException.java (80%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/RememberMeProcessingFilter.java (94%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/RememberMeServices.java (94%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/TokenBasedRememberMeServices.java (99%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/rememberme/package.html (100%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/switchuser/SwitchUserAuthorityChanger.java (94%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/switchuser/SwitchUserGrantedAuthority.java (88%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/switchuser/SwitchUserProcessingFilter.java (95%) rename web/src/main/java/org/springframework/security/{ui => web/authentication}/switchuser/package.html (100%) rename web/src/main/java/org/springframework/security/{ui/basicauth => web/authentication/www}/BasicProcessingFilter.java (93%) rename web/src/main/java/org/springframework/security/{ui/basicauth => web/authentication/www}/BasicProcessingFilterEntryPoint.java (95%) rename web/src/main/java/org/springframework/security/{ui/digestauth => web/authentication/www}/DigestProcessingFilter.java (97%) rename web/src/main/java/org/springframework/security/{ui/digestauth => web/authentication/www}/DigestProcessingFilterEntryPoint.java (97%) rename web/src/main/java/org/springframework/security/{ui/digestauth => web/authentication/www}/NonceExpiredException.java (96%) rename web/src/main/java/org/springframework/security/{ => web}/concurrent/ConcurrentSessionFilter.java (86%) rename web/src/main/java/org/springframework/security/{ => web}/concurrent/SessionRegistryImpl.java (93%) rename web/src/main/java/org/springframework/security/{ => web}/concurrent/package.html (100%) rename web/src/main/java/org/springframework/security/{context/web => web/context}/HttpRequestResponseHolder.java (95%) rename web/src/main/java/org/springframework/security/{context/web => web/context}/HttpSessionContextIntegrationFilter.java (98%) rename web/src/main/java/org/springframework/security/{context/web => web/context}/HttpSessionSecurityContextRepository.java (99%) rename web/src/main/java/org/springframework/security/{context/web => web/context}/SaveContextOnUpdateOrErrorResponseWrapper.java (98%) rename web/src/main/java/org/springframework/security/{context/web => web/context}/SecurityContextPersistenceFilter.java (95%) rename web/src/main/java/org/springframework/security/{context/web => web/context}/SecurityContextRepository.java (97%) rename web/src/main/java/org/springframework/security/{expression/web/support => web/expression}/DefaultWebSecurityExpressionHandler.java (87%) rename web/src/main/java/org/springframework/security/{expression/web => web/expression}/ExpressionBasedFilterInvocationSecurityMetadataSource.java (93%) rename web/src/main/java/org/springframework/security/{expression/web => web/expression}/WebExpressionConfigAttribute.java (93%) rename web/src/main/java/org/springframework/security/{expression/web => web/expression}/WebExpressionVoter.java (83%) rename web/src/main/java/org/springframework/security/{expression/web => web/expression}/WebSecurityExpressionHandler.java (83%) rename web/src/main/java/org/springframework/security/{expression/web/support => web/expression}/WebSecurityExpressionRoot.java (95%) rename web/src/main/java/org/springframework/security/{intercept/web => web/intercept}/DefaultFilterInvocationSecurityMetadataSource.java (99%) rename web/src/main/java/org/springframework/security/{intercept/web => web/intercept}/FilterInvocation.java (96%) rename web/src/main/java/org/springframework/security/{intercept/web => web/intercept}/FilterInvocationSecurityMetadataSource.java (94%) rename web/src/main/java/org/springframework/security/{intercept/web => web/intercept}/FilterSecurityInterceptor.java (98%) rename web/src/main/java/org/springframework/security/{intercept/web => web/intercept}/RequestKey.java (96%) rename web/src/main/java/org/springframework/security/{intercept/web => web/intercept}/WebInvocationPrivilegeEvaluator.java (98%) rename web/src/main/java/org/springframework/security/{intercept/web => web/intercept}/package.html (100%) rename web/src/main/java/org/springframework/security/{ui => web}/logout/LogoutFilter.java (93%) rename web/src/main/java/org/springframework/security/{ui => web}/logout/LogoutHandler.java (93%) rename web/src/main/java/org/springframework/security/{ui => web/logout}/LogoutSuccessHandler.java (89%) rename web/src/main/java/org/springframework/security/{ui => web}/logout/SecurityContextLogoutHandler.java (95%) rename web/src/main/java/org/springframework/security/{ui => web}/logout/SimpleUrlLogoutSuccessHandler.java (80%) rename web/src/main/java/org/springframework/security/{ui => web}/savedrequest/Enumerator.java (95%) rename web/src/main/java/org/springframework/security/{ui => web}/savedrequest/FastHttpDateFormat.java (96%) rename web/src/main/java/org/springframework/security/{ui => web}/savedrequest/SavedCookie.java (93%) rename web/src/main/java/org/springframework/security/{ui => web}/savedrequest/SavedRequest.java (94%) rename web/src/main/java/org/springframework/security/{ui => web}/savedrequest/package.html (100%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/AbstractRetryEntryPoint.java (91%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/ChannelDecisionManager.java (94%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/ChannelDecisionManagerImpl.java (97%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/ChannelEntryPoint.java (97%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/ChannelProcessingFilter.java (94%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/ChannelProcessor.java (94%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/InsecureChannelProcessor.java (96%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/RetryWithHttpEntryPoint.java (95%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/RetryWithHttpsEntryPoint.java (95%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/SecureChannelProcessor.java (96%) rename web/src/main/java/org/springframework/security/{ => web}/securechannel/package.html (100%) rename web/src/main/java/org/springframework/security/{ui => web}/session/HttpSessionCreatedEvent.java (96%) rename web/src/main/java/org/springframework/security/{ui => web}/session/HttpSessionDestroyedEvent.java (93%) rename web/src/main/java/org/springframework/security/{ui => web}/session/HttpSessionEventPublisher.java (98%) rename web/src/main/java/org/springframework/security/{ui => web}/session/package.html (100%) rename web/src/main/java/org/springframework/security/{ => web}/wrapper/SavedRequestAwareWrapper.java (93%) rename web/src/main/java/org/springframework/security/{ => web}/wrapper/SecurityContextHolderAwareRequestFilter.java (92%) rename web/src/main/java/org/springframework/security/{ => web}/wrapper/SecurityContextHolderAwareRequestWrapper.java (98%) rename web/src/main/java/org/springframework/security/{ => web}/wrapper/package.html (100%) delete mode 100644 web/src/test/java/org/springframework/security/util/MockFilter.java rename web/src/test/java/org/springframework/security/{ui => web}/ExceptionTranslationFilterTests.java (97%) rename web/src/test/java/org/springframework/security/{util => web}/PortMapperImplTests.java (97%) rename web/src/test/java/org/springframework/security/{util => web}/PortResolverImplTests.java (94%) rename web/src/test/java/org/springframework/security/{ui => web}/SessionFixationProtectionFilterTests.java (94%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/AbstractProcessingFilterTests.java (97%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/AnonymousProcessingFilterTests.java (98%) rename web/src/test/java/org/springframework/security/{ui/webapp => web/authentication}/AuthenticationProcessingFilterEntryPointTests.java (98%) rename web/src/test/java/org/springframework/security/{ui/webapp => web/authentication}/AuthenticationProcessingFilterTests.java (96%) rename web/src/test/java/org/springframework/security/{ui/webapp => web/authentication}/DefaultLoginPageGeneratingFilterTests.java (84%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/SavedRequestAwareAuthenticationSuccessHandlerTests.java (82%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/preauth/AbstractPreAuthenticatedProcessingFilterTests.java (92%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java (90%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/preauth/PreAuthenticatedProcessingFilterEntryPointTests.java (86%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/preauth/PreAuthenticatedProcessingFilterTests.java (89%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/preauth/header/RequestHeaderPreAuthenticatedProcessingFilterTests.java (92%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java (93%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java (86%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java (89%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/preauth/x509/SubjectDnX509PrincipalExtractorTests.java (90%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/preauth/x509/X509TestUtils.java (98%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/rememberme/AbstractRememberMeServicesTests.java (96%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/rememberme/JdbcTokenRepositoryImplTests.java (95%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/rememberme/NullRememberMeServicesTests.java (68%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/rememberme/PersistentTokenBasedRememberMeServicesTests.java (90%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/rememberme/RememberMeProcessingFilterTests.java (95%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/rememberme/TokenBasedRememberMeServicesTests.java (97%) rename web/src/test/java/org/springframework/security/{ui => web/authentication}/switchuser/SwitchUserProcessingFilterTests.java (96%) rename web/src/test/java/org/springframework/security/{ui/basicauth => web/authentication/www}/BasicProcessingFilterEntryPointTests.java (95%) rename web/src/test/java/org/springframework/security/{ui/basicauth => web/authentication/www}/BasicProcessingFilterTests.java (97%) rename web/src/test/java/org/springframework/security/{ui/digestauth => web/authentication/www}/DigestProcessingFilterEntryPointTests.java (96%) rename web/src/test/java/org/springframework/security/{ui/digestauth => web/authentication/www}/DigestProcessingFilterTests.java (98%) rename web/src/test/java/org/springframework/security/{ => web}/concurrent/ConcurrentSessionControllerImplTests.java (91%) rename web/src/test/java/org/springframework/security/{ => web}/concurrent/ConcurrentSessionFilterTests.java (96%) rename web/src/test/java/org/springframework/security/{ => web}/concurrent/SessionInformationTests.java (92%) rename web/src/test/java/org/springframework/security/{ => web}/concurrent/SessionRegistryImplTests.java (96%) rename web/src/test/java/org/springframework/security/{context/web => web/context}/HttpSessionContextIntegrationFilterTests.java (98%) rename web/src/test/java/org/springframework/security/{context/web => web/context}/HttpSessionSecurityContextRepositoryTests.java (97%) rename web/src/test/java/org/springframework/security/{context/web => web/context}/SecurityContextPersistenceFilterTests.java (94%) rename web/src/test/java/org/springframework/security/{expression/web/support => web/expression}/WebSecurityExpressionRootTests.java (95%) rename web/src/test/java/org/springframework/security/{intercept/web => web/intercept}/DefaultFilterInvocationSecurityMetadataSourceTests.java (96%) rename web/src/test/java/org/springframework/security/{intercept/web => web/intercept}/FilterInvocationTests.java (97%) rename web/src/test/java/org/springframework/security/{intercept/web => web/intercept}/FilterSecurityInterceptorTests.java (94%) rename web/src/test/java/org/springframework/security/{intercept/web => web/intercept}/RequestKeyTests.java (92%) rename web/src/test/java/org/springframework/security/{intercept/web => web/intercept}/WebInvocationPrivilegeEvaluatorTests.java (91%) rename web/src/test/java/org/springframework/security/{ui => web}/logout/LogoutHandlerTests.java (86%) rename web/src/test/java/org/springframework/security/{ui => web}/savedrequest/SavedCookieTests.java (94%) rename web/src/test/java/org/springframework/security/{ui => web}/savedrequest/SavedRequestTests.java (88%) rename web/src/test/java/org/springframework/security/{ => web}/securechannel/ChannelDecisionManagerImplTests.java (96%) rename web/src/test/java/org/springframework/security/{ => web}/securechannel/ChannelProcessingFilterTests.java (96%) rename web/src/test/java/org/springframework/security/{ => web}/securechannel/InsecureChannelProcessorTests.java (96%) rename web/src/test/java/org/springframework/security/{ => web}/securechannel/RetryWithHttpEntryPointTests.java (96%) rename web/src/test/java/org/springframework/security/{ => web}/securechannel/RetryWithHttpsEntryPointTests.java (96%) rename web/src/test/java/org/springframework/security/{ => web}/securechannel/SecureChannelProcessorTests.java (96%) rename web/src/test/java/org/springframework/security/{ui => web}/session/HttpSessionEventPublisherTests.java (95%) rename web/src/test/java/org/springframework/security/{ui => web}/session/MockApplicationListener.java (90%) diff --git a/cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java b/cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java index 5de13c1d8d..56456cad21 100644 --- a/cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java +++ b/cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilter.java @@ -25,8 +25,8 @@ import org.springframework.security.AuthenticationException; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.ui.AbstractProcessingFilter; -import org.springframework.security.ui.FilterChainOrder; +import org.springframework.security.web.FilterChainOrder; +import org.springframework.security.web.authentication.AbstractProcessingFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java b/cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java index 460faaae1f..6bf2507cb4 100644 --- a/cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java +++ b/cas/src/main/java/org/springframework/security/ui/cas/CasProcessingFilterEntryPoint.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse; import org.jasig.cas.client.util.CommonUtils; import org.springframework.security.AuthenticationException; -import org.springframework.security.ui.AuthenticationEntryPoint; +import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/config/pom.xml b/config/pom.xml index 68cff4e4d6..295c83f114 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -22,22 +22,28 @@ org.springframework.security - spring-security-web + spring-security-core ${project.version} tests test - commons-logging - commons-logging + org.springframework.security + spring-security-web + ${project.version} + tests + test org.springframework.security - spring-security-core + spring-security-openid ${project.version} - tests test + + commons-logging + commons-logging + org.springframework.security spring-security-ldap diff --git a/config/src/main/java/org/springframework/security/config/AnonymousBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/AnonymousBeanDefinitionParser.java index fdca6da6bd..d11da92522 100644 --- a/config/src/main/java/org/springframework/security/config/AnonymousBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/AnonymousBeanDefinitionParser.java @@ -8,8 +8,8 @@ import org.springframework.beans.factory.parsing.BeanComponentDefinition; 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.providers.anonymous.AnonymousAuthenticationProvider; -import org.springframework.security.ui.anonymous.AnonymousProcessingFilter; +import org.springframework.security.providers.AnonymousAuthenticationProvider; +import org.springframework.security.web.authentication.AnonymousProcessingFilter; import org.springframework.util.StringUtils; import org.w3c.dom.Element; diff --git a/config/src/main/java/org/springframework/security/config/BasicAuthenticationBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/BasicAuthenticationBeanDefinitionParser.java index 6f12f10dd5..1118b8f566 100644 --- a/config/src/main/java/org/springframework/security/config/BasicAuthenticationBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/BasicAuthenticationBeanDefinitionParser.java @@ -7,8 +7,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; 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.ui.basicauth.BasicProcessingFilter; -import org.springframework.security.ui.basicauth.BasicProcessingFilterEntryPoint; +import org.springframework.security.web.authentication.www.BasicProcessingFilter; +import org.springframework.security.web.authentication.www.BasicProcessingFilterEntryPoint; import org.w3c.dom.Element; /** diff --git a/config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java b/config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java index dac53a5fa0..f87c7980b3 100644 --- a/config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java +++ b/config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java @@ -1,9 +1,9 @@ package org.springframework.security.config; -import org.springframework.security.providers.dao.UserCache; -import org.springframework.security.providers.dao.cache.NullUserCache; +import org.springframework.security.userdetails.UserCache; import org.springframework.security.userdetails.UserDetailsService; import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.userdetails.cache.NullUserCache; import org.springframework.util.Assert; /** diff --git a/config/src/main/java/org/springframework/security/config/ConcurrentSessionsBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/ConcurrentSessionsBeanDefinitionParser.java index f3a2d0852c..f749812293 100644 --- a/config/src/main/java/org/springframework/security/config/ConcurrentSessionsBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/ConcurrentSessionsBeanDefinitionParser.java @@ -10,9 +10,9 @@ 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.concurrent.ConcurrentSessionControllerImpl; -import org.springframework.security.concurrent.ConcurrentSessionFilter; -import org.springframework.security.concurrent.SessionRegistryImpl; import org.springframework.security.providers.ProviderManager; +import org.springframework.security.web.concurrent.ConcurrentSessionFilter; +import org.springframework.security.web.concurrent.SessionRegistryImpl; import org.springframework.util.StringUtils; import org.w3c.dom.Element; diff --git a/config/src/main/java/org/springframework/security/config/EntryPointInjectionBeanPostProcessor.java b/config/src/main/java/org/springframework/security/config/EntryPointInjectionBeanPostProcessor.java index bf13438f80..a407ee172c 100644 --- a/config/src/main/java/org/springframework/security/config/EntryPointInjectionBeanPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/EntryPointInjectionBeanPostProcessor.java @@ -9,8 +9,8 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.security.ui.AuthenticationEntryPoint; -import org.springframework.security.ui.ExceptionTranslationFilter; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.ExceptionTranslationFilter; import org.springframework.util.Assert; /** 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 9768063f9d..753f80c8d5 100644 --- a/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java @@ -18,19 +18,19 @@ import org.springframework.core.OrderComparator; import org.springframework.core.Ordered; import org.springframework.security.ConfigAttribute; import org.springframework.security.config.ConfigUtils.FilterChainList; -import org.springframework.security.context.web.SecurityContextPersistenceFilter; -import org.springframework.security.intercept.web.DefaultFilterInvocationSecurityMetadataSource; -import org.springframework.security.intercept.web.FilterSecurityInterceptor; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; -import org.springframework.security.ui.ExceptionTranslationFilter; -import org.springframework.security.ui.SessionFixationProtectionFilter; -import org.springframework.security.ui.anonymous.AnonymousProcessingFilter; -import org.springframework.security.ui.basicauth.BasicProcessingFilter; -import org.springframework.security.ui.webapp.AuthenticationProcessingFilter; -import org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint; -import org.springframework.security.ui.webapp.DefaultLoginPageGeneratingFilter; -import org.springframework.security.web.util.FilterChainProxy; -import org.springframework.security.wrapper.SecurityContextHolderAwareRequestFilter; +import org.springframework.security.providers.AnonymousAuthenticationToken; +import org.springframework.security.web.ExceptionTranslationFilter; +import org.springframework.security.web.FilterChainProxy; +import org.springframework.security.web.SessionFixationProtectionFilter; +import org.springframework.security.web.authentication.AnonymousProcessingFilter; +import org.springframework.security.web.authentication.AuthenticationProcessingFilter; +import org.springframework.security.web.authentication.AuthenticationProcessingFilterEntryPoint; +import org.springframework.security.web.authentication.DefaultLoginPageGeneratingFilter; +import org.springframework.security.web.authentication.www.BasicProcessingFilter; +import org.springframework.security.web.context.SecurityContextPersistenceFilter; +import org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource; +import org.springframework.security.web.intercept.FilterSecurityInterceptor; +import org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestFilter; /** * 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 dbf4aedcab..b8b5c751b8 100644 --- a/config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java @@ -7,10 +7,10 @@ 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.intercept.web.FilterInvocationSecurityMetadataSource; -import org.springframework.security.intercept.web.RequestKey; import org.springframework.security.util.AntUrlPathMatcher; import org.springframework.security.util.UrlMatcher; +import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource; +import org.springframework.security.web.intercept.RequestKey; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; @@ -24,7 +24,7 @@ import org.w3c.dom.Element; public class FilterInvocationSecurityMetadataSourceBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { protected String getBeanClassName(Element element) { - return "org.springframework.security.intercept.web.DefaultFilterInvocationSecurityMetadataSource"; + return "org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource"; } protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { diff --git a/config/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java index 3bd9d41b4a..18c975d0a4 100644 --- a/config/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java @@ -7,10 +7,10 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; 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.ui.SavedRequestAwareAuthenticationSuccessHandler; -import org.springframework.security.ui.SimpleUrlAuthenticationFailureHandler; -import org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint; -import org.springframework.security.ui.webapp.DefaultLoginPageGeneratingFilter; +import org.springframework.security.web.authentication.AuthenticationProcessingFilterEntryPoint; +import org.springframework.security.web.authentication.DefaultLoginPageGeneratingFilter; +import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; +import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; import org.springframework.util.StringUtils; import org.w3c.dom.Element; 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 5bc7f8f4b4..d502a68269 100644 --- a/config/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java @@ -45,10 +45,10 @@ class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser { private final Log logger = LogFactory.getLog(getClass()); - private static final String SECURED_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.annotation.SecuredMethodSecurityMetadataSource"; - private static final String EXPRESSION_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.expression.method.ExpressionAnnotationMethodSecurityMetadataSource"; - private static final String JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.annotation.Jsr250MethodSecurityMetadataSource"; - private static final String JSR_250_VOTER_CLASS = "org.springframework.security.annotation.Jsr250Voter"; + 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"; /* * 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 3b80bfb343..b6337ae1ac 100644 --- a/config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java @@ -19,30 +19,30 @@ 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.context.web.HttpSessionSecurityContextRepository; -import org.springframework.security.context.web.SecurityContextPersistenceFilter; -import org.springframework.security.expression.web.WebExpressionVoter; -import org.springframework.security.intercept.web.DefaultFilterInvocationSecurityMetadataSource; -import org.springframework.security.intercept.web.FilterSecurityInterceptor; -import org.springframework.security.intercept.web.RequestKey; -import org.springframework.security.securechannel.ChannelDecisionManagerImpl; -import org.springframework.security.securechannel.ChannelProcessingFilter; -import org.springframework.security.securechannel.InsecureChannelProcessor; -import org.springframework.security.securechannel.RetryWithHttpEntryPoint; -import org.springframework.security.securechannel.RetryWithHttpsEntryPoint; -import org.springframework.security.securechannel.SecureChannelProcessor; -import org.springframework.security.ui.AccessDeniedHandlerImpl; -import org.springframework.security.ui.ExceptionTranslationFilter; -import org.springframework.security.ui.SessionFixationProtectionFilter; -import org.springframework.security.ui.webapp.DefaultLoginPageGeneratingFilter; 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.util.FilterChainProxy; -import org.springframework.security.wrapper.SecurityContextHolderAwareRequestFilter; +import org.springframework.security.web.AccessDeniedHandlerImpl; +import org.springframework.security.web.ExceptionTranslationFilter; +import org.springframework.security.web.FilterChainProxy; +import org.springframework.security.web.SessionFixationProtectionFilter; +import org.springframework.security.web.authentication.DefaultLoginPageGeneratingFilter; +import org.springframework.security.web.context.HttpSessionSecurityContextRepository; +import org.springframework.security.web.context.SecurityContextPersistenceFilter; +import org.springframework.security.web.expression.WebExpressionVoter; +import org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource; +import org.springframework.security.web.intercept.FilterSecurityInterceptor; +import org.springframework.security.web.intercept.RequestKey; +import org.springframework.security.web.securechannel.ChannelDecisionManagerImpl; +import org.springframework.security.web.securechannel.ChannelProcessingFilter; +import org.springframework.security.web.securechannel.InsecureChannelProcessor; +import org.springframework.security.web.securechannel.RetryWithHttpEntryPoint; +import org.springframework.security.web.securechannel.RetryWithHttpsEntryPoint; +import org.springframework.security.web.securechannel.SecureChannelProcessor; +import org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestFilter; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; @@ -106,8 +106,12 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser { private static final String ATT_DISABLE_URL_REWRITING = "disable-url-rewriting"; - private static final String EXPRESSION_FIDS_CLASS = "org.springframework.security.expression.web.ExpressionBasedFilterInvocationSecurityMetadataSource"; - private static final String EXPRESSION_HANDLER_CLASS = "org.springframework.security.expression.web.support.DefaultWebSecurityExpressionHandler"; + static final String OPEN_ID_AUTHENTICATION_PROCESSING_FILTER_CLASS = "org.springframework.security.openid.OpenIDAuthenticationProcessingFilter"; + static final String OPEN_ID_AUTHENTICATION_PROVIDER_CLASS = "org.springframework.security.openid.OpenIDAuthenticationProvider"; + static final String AUTHENTICATION_PROCESSING_FILTER_CLASS = "org.springframework.security.web.authentication.AuthenticationProcessingFilter"; + + static final String EXPRESSION_FIMDS_CLASS = "org.springframework.security.web.expression.ExpressionBasedFilterInvocationSecurityMetadataSource"; + static final String EXPRESSION_HANDLER_CLASS = "org.springframework.security.web.expression.DefaultWebSecurityExpressionHandler"; private static final String EXPRESSION_HANDLER_ID = "_webExpressionHandler"; @SuppressWarnings("unchecked") @@ -166,7 +170,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser { expressionHandlerRef = EXPRESSION_HANDLER_ID; } - fidsBuilder = BeanDefinitionBuilder.rootBeanDefinition(EXPRESSION_FIDS_CLASS); + fidsBuilder = BeanDefinitionBuilder.rootBeanDefinition(EXPRESSION_FIMDS_CLASS); fidsBuilder.addConstructorArgValue(matcher); fidsBuilder.addConstructorArgValue(requestToAttributesMap); fidsBuilder.addConstructorArgReference(expressionHandlerRef); @@ -437,7 +441,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser { if (formLoginElt != null || autoConfig) { FormLoginBeanDefinitionParser parser = new FormLoginBeanDefinitionParser("/j_spring_security_check", - "org.springframework.security.ui.webapp.AuthenticationProcessingFilter"); + AUTHENTICATION_PROCESSING_FILTER_CLASS); parser.parse(formLoginElt, pc); formLoginFilter = parser.getFilterBean(); @@ -449,7 +453,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser { if (openIDLoginElt != null) { FormLoginBeanDefinitionParser parser = new FormLoginBeanDefinitionParser("/j_spring_openid_security_check", - "org.springframework.security.ui.openid.OpenIDAuthenticationProcessingFilter"); + OPEN_ID_AUTHENTICATION_PROCESSING_FILTER_CLASS); parser.parse(openIDLoginElt, pc); openIDFilter = parser.getFilterBean(); @@ -457,7 +461,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser { openIDLoginPage = parser.getLoginPage(); BeanDefinitionBuilder openIDProviderBuilder = - BeanDefinitionBuilder.rootBeanDefinition("org.springframework.security.providers.openid.OpenIDAuthenticationProvider"); + BeanDefinitionBuilder.rootBeanDefinition(OPEN_ID_AUTHENTICATION_PROVIDER_CLASS); String userService = openIDLoginElt.getAttribute(ATT_USER_SERVICE_REF); diff --git a/config/src/main/java/org/springframework/security/config/LogoutBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/LogoutBeanDefinitionParser.java index 93a43317ae..d89f6c691a 100644 --- a/config/src/main/java/org/springframework/security/config/LogoutBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/LogoutBeanDefinitionParser.java @@ -6,8 +6,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.security.ui.logout.LogoutFilter; -import org.springframework.security.ui.logout.SecurityContextLogoutHandler; +import org.springframework.security.web.logout.LogoutFilter; +import org.springframework.security.web.logout.SecurityContextLogoutHandler; import org.springframework.util.StringUtils; import org.w3c.dom.Element; 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 0d61492296..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.ui.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/main/java/org/springframework/security/config/PortMappingsBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/PortMappingsBeanDefinitionParser.java index 005231ffdb..ebc4336222 100644 --- a/config/src/main/java/org/springframework/security/config/PortMappingsBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/PortMappingsBeanDefinitionParser.java @@ -1,6 +1,6 @@ package org.springframework.security.config; -import org.springframework.security.web.util.PortMapperImpl; +import org.springframework.security.web.PortMapperImpl; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.beans.factory.config.BeanDefinition; @@ -15,7 +15,7 @@ import java.util.Map; import java.util.HashMap; /** - * Parses a port-mappings element, producing a single {@link org.springframework.security.web.util.PortMapperImpl} + * Parses a port-mappings element, producing a single {@link org.springframework.security.web.PortMapperImpl} * bean. * * @author Luke Taylor diff --git a/config/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java index 0f366056eb..a7bc3e01cf 100644 --- a/config/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java @@ -7,11 +7,11 @@ import org.springframework.beans.factory.config.RuntimeBeanReference; 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.ui.rememberme.JdbcTokenRepositoryImpl; -import org.springframework.security.ui.rememberme.PersistentTokenBasedRememberMeServices; -import org.springframework.security.ui.rememberme.RememberMeProcessingFilter; -import org.springframework.security.ui.rememberme.TokenBasedRememberMeServices; -import org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider; +import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl; +import org.springframework.security.web.authentication.rememberme.PersistentTokenBasedRememberMeServices; +import org.springframework.security.web.authentication.rememberme.RememberMeProcessingFilter; +import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices; +import org.springframework.security.providers.RememberMeAuthenticationProvider; import org.springframework.util.StringUtils; import org.w3c.dom.Element; diff --git a/config/src/main/java/org/springframework/security/config/RememberMeServicesInjectionBeanPostProcessor.java b/config/src/main/java/org/springframework/security/config/RememberMeServicesInjectionBeanPostProcessor.java index 4531e77ef4..f647943ccd 100644 --- a/config/src/main/java/org/springframework/security/config/RememberMeServicesInjectionBeanPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/RememberMeServicesInjectionBeanPostProcessor.java @@ -9,9 +9,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.security.ui.AbstractProcessingFilter; -import org.springframework.security.ui.basicauth.BasicProcessingFilter; -import org.springframework.security.ui.rememberme.RememberMeServices; +import org.springframework.security.web.authentication.AbstractProcessingFilter; +import org.springframework.security.web.authentication.rememberme.RememberMeServices; +import org.springframework.security.web.authentication.www.BasicProcessingFilter; import org.springframework.util.Assert; /** diff --git a/config/src/main/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessor.java b/config/src/main/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessor.java index 2302d4e03c..e1bfed7be0 100644 --- a/config/src/main/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessor.java @@ -11,8 +11,8 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.security.concurrent.ConcurrentSessionController; import org.springframework.security.concurrent.ConcurrentSessionControllerImpl; import org.springframework.security.concurrent.SessionRegistry; -import org.springframework.security.ui.AbstractProcessingFilter; -import org.springframework.security.ui.SessionFixationProtectionFilter; +import org.springframework.security.web.SessionFixationProtectionFilter; +import org.springframework.security.web.authentication.AbstractProcessingFilter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java b/config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java index 424c2b2db0..247c7f8879 100644 --- a/config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java @@ -13,9 +13,9 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider; -import org.springframework.security.ui.rememberme.AbstractRememberMeServices; import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper; import org.springframework.security.userdetails.UserDetailsService; +import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; import org.springframework.util.Assert; /** diff --git a/config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java index 366c1efb83..494d622720 100644 --- a/config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java @@ -1,9 +1,9 @@ package org.springframework.security.config; -import org.springframework.security.ui.preauth.PreAuthenticatedProcessingFilterEntryPoint; -import org.springframework.security.ui.preauth.x509.X509PreAuthenticatedProcessingFilter; -import org.springframework.security.ui.preauth.x509.SubjectDnX509PrincipalExtractor; import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper; +import org.springframework.security.web.authentication.preauth.PreAuthenticatedProcessingFilterEntryPoint; +import org.springframework.security.web.authentication.preauth.x509.SubjectDnX509PrincipalExtractor; +import org.springframework.security.web.authentication.preauth.x509.X509PreAuthenticatedProcessingFilter; import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; diff --git a/config/src/test/java/org/springframework/security/config/FilterInvocationDefinitionSourceParserTests.java b/config/src/test/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParserTests.java similarity index 80% rename from config/src/test/java/org/springframework/security/config/FilterInvocationDefinitionSourceParserTests.java rename to config/src/test/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParserTests.java index f8fcf8c349..656229e6da 100644 --- a/config/src/test/java/org/springframework/security/config/FilterInvocationDefinitionSourceParserTests.java +++ b/config/src/test/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParserTests.java @@ -1,6 +1,7 @@ package org.springframework.security.config; import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import java.util.List; @@ -13,15 +14,16 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.ConfigAttribute; import org.springframework.security.SecurityConfig; import org.springframework.security.config.util.InMemoryXmlApplicationContext; -import org.springframework.security.intercept.web.DefaultFilterInvocationSecurityMetadataSource; -import org.springframework.security.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource; +import org.springframework.security.web.intercept.FilterInvocation; +import org.w3c.dom.Element; /** - * + * Tests for {@link FilterInvocationSecurityMetadataSourceBeanDefinitionParser}. * @author Luke Taylor * @version $Id$ */ -public class FilterInvocationDefinitionSourceParserTests { +public class FilterInvocationSecurityMetadataSourceBeanDefinitionParserTests { private AbstractXmlApplicationContext appContext; @After @@ -36,6 +38,11 @@ public class FilterInvocationDefinitionSourceParserTests { appContext = new InMemoryXmlApplicationContext(context); } + @Test + public void beanClassNameIsCorrect() throws Exception { + assertEquals(DefaultFilterInvocationSecurityMetadataSource.class.getName(), new FilterInvocationSecurityMetadataSourceBeanDefinitionParser().getBeanClassName(mock(Element.class))); + } + @Test public void parsingMinimalConfigurationIsSuccessful() { setContext( @@ -52,7 +59,7 @@ public class FilterInvocationDefinitionSourceParserTests { public void parsingWithinFilterSecurityInterceptorIsSuccessful() { setContext( "" + - "" + + "" + " " + " " + " " + 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 2650d68f1a..b12471df78 100644 --- a/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java @@ -1,6 +1,7 @@ package org.springframework.security.config; import static org.junit.Assert.*; +import static org.springframework.security.config.GlobalMethodSecurityBeanDefinitionParser.*; import static org.springframework.security.config.ConfigTestUtils.AUTH_PROVIDER_XML; import java.util.ArrayList; @@ -14,8 +15,12 @@ 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.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; @@ -56,6 +61,14 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { target = null; } + @Test + public void beanClassNamesAreCorrect() throws Exception { + assertEquals(SecuredMethodSecurityMetadataSource.class.getName(), SECURED_METHOD_DEFINITION_SOURCE_CLASS); + assertEquals(ExpressionAnnotationMethodSecurityMetadataSource.class.getName(), EXPRESSION_METHOD_DEFINITION_SOURCE_CLASS); + assertEquals(Jsr250MethodSecurityMetadataSource.class.getName(), JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS); + assertEquals(Jsr250Voter.class.getName(), JSR_250_VOTER_CLASS); + } + @Test(expected=AuthenticationCredentialsNotFoundException.class) public void targetShouldPreventProtectedMethodInvocationWithNoContext() { loadContext(); 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 e2ec97135c..302daecc5e 100644 --- a/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java @@ -2,6 +2,7 @@ package org.springframework.security.config; import static org.junit.Assert.*; import static org.springframework.security.config.ConfigTestUtils.AUTH_PROVIDER_XML; +import static org.springframework.security.config.HttpSecurityBeanDefinitionParser.*; import java.lang.reflect.Method; import java.util.Iterator; @@ -24,34 +25,43 @@ import org.springframework.security.MockAuthenticationEntryPoint; import org.springframework.security.SecurityConfig; import org.springframework.security.concurrent.ConcurrentLoginException; import org.springframework.security.concurrent.ConcurrentSessionControllerImpl; -import org.springframework.security.concurrent.ConcurrentSessionFilter; import org.springframework.security.config.util.InMemoryXmlApplicationContext; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.context.web.HttpSessionSecurityContextRepository; -import org.springframework.security.context.web.SecurityContextPersistenceFilter; -import org.springframework.security.intercept.web.FilterInvocation; -import org.springframework.security.intercept.web.FilterInvocationSecurityMetadataSource; -import org.springframework.security.intercept.web.FilterSecurityInterceptor; +import org.springframework.security.openid.OpenIDAuthenticationProcessingFilter; +import org.springframework.security.openid.OpenIDAuthenticationProvider; import org.springframework.security.providers.TestingAuthenticationToken; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.securechannel.ChannelProcessingFilter; -import org.springframework.security.ui.AuthenticationFailureHandler; -import org.springframework.security.ui.AuthenticationSuccessHandler; -import org.springframework.security.ui.ExceptionTranslationFilter; -import org.springframework.security.ui.SessionFixationProtectionFilter; -import org.springframework.security.ui.WebAuthenticationDetails; -import org.springframework.security.ui.anonymous.AnonymousProcessingFilter; -import org.springframework.security.ui.basicauth.BasicProcessingFilter; -import org.springframework.security.ui.logout.LogoutFilter; -import org.springframework.security.ui.logout.LogoutHandler; -import org.springframework.security.ui.preauth.x509.X509PreAuthenticatedProcessingFilter; -import org.springframework.security.ui.rememberme.PersistentTokenBasedRememberMeServices; -import org.springframework.security.ui.webapp.AuthenticationProcessingFilter; -import org.springframework.security.ui.webapp.DefaultLoginPageGeneratingFilter; import org.springframework.security.util.FieldUtils; -import org.springframework.security.web.util.FilterChainProxy; -import org.springframework.security.web.util.PortMapperImpl; -import org.springframework.security.wrapper.SecurityContextHolderAwareRequestFilter; +import org.springframework.security.web.ExceptionTranslationFilter; +import org.springframework.security.web.FilterChainProxy; +import org.springframework.security.web.PortMapperImpl; +import org.springframework.security.web.SessionFixationProtectionFilter; +import org.springframework.security.web.WebAuthenticationDetails; +import org.springframework.security.web.authentication.AnonymousProcessingFilter; +import org.springframework.security.web.authentication.AuthenticationFailureHandler; +import org.springframework.security.web.authentication.AuthenticationProcessingFilter; +import org.springframework.security.web.authentication.AuthenticationSuccessHandler; +import org.springframework.security.web.authentication.DefaultLoginPageGeneratingFilter; +import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; +import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; +import org.springframework.security.web.authentication.preauth.x509.X509PreAuthenticatedProcessingFilter; +import org.springframework.security.web.authentication.rememberme.InMemoryTokenRepositoryImpl; +import org.springframework.security.web.authentication.rememberme.PersistentTokenBasedRememberMeServices; +import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices; +import org.springframework.security.web.authentication.www.BasicProcessingFilter; +import org.springframework.security.web.concurrent.ConcurrentSessionFilter; +import org.springframework.security.web.concurrent.SessionRegistryImpl; +import org.springframework.security.web.context.HttpSessionSecurityContextRepository; +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; +import org.springframework.security.web.logout.LogoutHandler; +import org.springframework.security.web.securechannel.ChannelProcessingFilter; +import org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestFilter; import org.springframework.util.ReflectionUtils; /** @@ -76,6 +86,15 @@ public class HttpSecurityBeanDefinitionParserTests { setContext("" + AUTH_PROVIDER_XML); } + @Test + public void beanClassNamesAreCorrect() throws Exception { + assertEquals(DefaultWebSecurityExpressionHandler.class.getName(), EXPRESSION_HANDLER_CLASS); + assertEquals(ExpressionBasedFilterInvocationSecurityMetadataSource.class.getName(), EXPRESSION_FIMDS_CLASS); + assertEquals(AuthenticationProcessingFilter.class.getName(), AUTHENTICATION_PROCESSING_FILTER_CLASS); + assertEquals(OpenIDAuthenticationProcessingFilter.class.getName(), OPEN_ID_AUTHENTICATION_PROCESSING_FILTER_CLASS); + assertEquals(OpenIDAuthenticationProvider.class.getName(), OPEN_ID_AUTHENTICATION_PROVIDER_CLASS); + } + @Test public void httpAutoConfigSetsUpCorrectFilterList() throws Exception { setContext("" + AUTH_PROVIDER_XML); @@ -142,7 +161,7 @@ public class HttpSecurityBeanDefinitionParserTests { // This will be matched by the default pattern ".*" List allFilters = getFilters("/ImCaughtByTheUniversalMatchPattern"); checkAutoConfigFilters(allFilters); - assertEquals(false, FieldUtils.getFieldValue(appContext.getBean("_filterChainProxy"), "stripQueryStringFromUrls")); + assertEquals(false, FieldUtils.getFieldValue(appContext.getBean(BeanIds.FILTER_CHAIN_PROXY), "stripQueryStringFromUrls")); assertEquals(false, FieldUtils.getFieldValue(allFilters.get(AUTO_CONFIG_FILTERS-1), "securityMetadataSource.stripQueryStringFromUrls")); } @@ -335,19 +354,22 @@ public class HttpSecurityBeanDefinitionParserTests { @Test public void externalFiltersAreTreatedCorrectly() throws Exception { // Decorated user-filters should be added to stack. The others should be ignored. + String contextHolderFilterClass = SecurityContextHolderAwareRequestFilter.class.getName(); + String contextPersistenceFilterClass = SecurityContextPersistenceFilter.class.getName(); + setContext( "" + AUTH_PROVIDER_XML + - "" + + "" + " " + "" + - "" + + "" + " " + "" + - "" + + "" + " " + "" + - "" + - "" + "" + + "" ); List filters = getFilters("/someurl"); @@ -361,7 +383,7 @@ public class HttpSecurityBeanDefinitionParserTests { public void twoFiltersWithSameOrderAreRejected() { setContext( "" + AUTH_PROVIDER_XML + - "" + + "" + " " + ""); } @@ -373,7 +395,7 @@ public class HttpSecurityBeanDefinitionParserTests { " " + "" + " " + AUTH_PROVIDER_XML); + "class='" + InMemoryTokenRepositoryImpl.class.getName() + "'/> " + AUTH_PROVIDER_XML); Object rememberMeServices = appContext.getBean(BeanIds.REMEMBER_ME_SERVICES); assertTrue(rememberMeServices instanceof PersistentTokenBasedRememberMeServices); @@ -400,7 +422,7 @@ public class HttpSecurityBeanDefinitionParserTests { "" + " " + "" + - " " + + " " + " " + " " + " " + @@ -486,7 +508,7 @@ public class HttpSecurityBeanDefinitionParserTests { "" + " " + "" + - "" + + "" + AUTH_PROVIDER_XML); Object sessionRegistry = appContext.getBean("seshRegistry"); Object sessionRegistryFromFilter = FieldUtils.getFieldValue( @@ -508,9 +530,9 @@ public class HttpSecurityBeanDefinitionParserTests { "" + " " + "" + - "" + + "" + " " + - " " + + " " + " " + "" + AUTH_PROVIDER_XML); } @@ -523,7 +545,7 @@ public class HttpSecurityBeanDefinitionParserTests { "" + "" + " " + - " " + + " " + " " + "" + "" + AUTH_PROVIDER_XML); @@ -564,7 +586,7 @@ public class HttpSecurityBeanDefinitionParserTests { public void customEntryPointIsSupported() throws Exception { setContext( "" + - "" + + "" + " " + "" + AUTH_PROVIDER_XML); ExceptionTranslationFilter etf = (ExceptionTranslationFilter) getFilters("/someurl").get(AUTO_CONFIG_FILTERS-3); @@ -693,7 +715,7 @@ public class HttpSecurityBeanDefinitionParserTests { @Test public void supportsExternallyDefinedSecurityContextRepository() throws Exception { setContext( - "" + + "" + "" + " " + "" + AUTH_PROVIDER_XML); @@ -706,7 +728,7 @@ public class HttpSecurityBeanDefinitionParserTests { @Test(expected=BeanDefinitionParsingException.class) public void cantUseUnsupportedSessionCreationAttributeWithExternallyDefinedSecurityContextRepository() throws Exception { setContext( - "" + + "" + "" + " " + "" + AUTH_PROVIDER_XML); @@ -746,8 +768,8 @@ public class HttpSecurityBeanDefinitionParserTests { "" + " " + "" + - "" + - "" + + "" + + "" + AUTH_PROVIDER_XML); AuthenticationProcessingFilter apf = (AuthenticationProcessingFilter) appContext.getBean(BeanIds.FORM_LOGIN_FILTER); AuthenticationSuccessHandler sh = (AuthenticationSuccessHandler) appContext.getBean("sh"); diff --git a/config/src/test/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessorTests.java b/config/src/test/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessorTests.java index acf10e53f9..da973d5c5b 100644 --- a/config/src/test/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessorTests.java +++ b/config/src/test/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessorTests.java @@ -8,8 +8,10 @@ import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.security.Authentication; import org.springframework.security.AuthenticationException; import org.springframework.security.concurrent.ConcurrentSessionController; +import org.springframework.security.concurrent.ConcurrentSessionControllerImpl; import org.springframework.security.config.util.InMemoryXmlApplicationContext; import org.springframework.security.util.FieldUtils; +import org.springframework.security.web.concurrent.SessionRegistryImpl; /** * @@ -35,9 +37,9 @@ public class SessionRegistryInjectionBeanPostProcessorTests { public void sessionRegistryIsSetOnFiltersWhenUsingCustomControllerWithInternalRegistryBean() throws Exception { setContext( "" + - "" + + "" + " " + - " " + + " " + " " + "" + "" + @@ -51,7 +53,7 @@ public class SessionRegistryInjectionBeanPostProcessorTests { setContext( "" + "" + - "" + + "" + "" + ConfigTestUtils.AUTH_PROVIDER_XML); assertNotNull(FieldUtils.getFieldValue(appContext.getBean(BeanIds.SESSION_FIXATION_PROTECTION_FILTER), "sessionRegistry")); diff --git a/config/src/test/java/org/springframework/security/util/FilterChainProxyConfigTests.java b/config/src/test/java/org/springframework/security/util/FilterChainProxyConfigTests.java index 86f0330add..869e20d722 100644 --- a/config/src/test/java/org/springframework/security/util/FilterChainProxyConfigTests.java +++ b/config/src/test/java/org/springframework/security/util/FilterChainProxyConfigTests.java @@ -34,10 +34,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.MockFilterConfig; -import org.springframework.security.context.web.SecurityContextPersistenceFilter; -import org.springframework.security.ui.webapp.AuthenticationProcessingFilter; -import org.springframework.security.web.util.FilterChainProxy; -import org.springframework.security.wrapper.SecurityContextHolderAwareRequestFilter; +import org.springframework.security.web.FilterChainProxy; +import org.springframework.security.web.authentication.AuthenticationProcessingFilter; +import org.springframework.security.web.context.SecurityContextPersistenceFilter; +import org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestFilter; /** * Tests {@link FilterChainProxy}. diff --git a/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml b/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml index ec4bb61263..e3094bfbdf 100644 --- a/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml +++ b/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml @@ -24,14 +24,14 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd"> - + - + - + - + @@ -39,7 +39,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc - + @@ -48,7 +48,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc - + @@ -57,14 +57,14 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc - + - + @@ -72,7 +72,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc - + @@ -81,7 +81,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc - + diff --git a/core/src/main/java/org/springframework/security/ui/AuthenticationDetails.java b/core/src/main/java/org/springframework/security/AuthenticationDetails.java similarity index 97% rename from core/src/main/java/org/springframework/security/ui/AuthenticationDetails.java rename to core/src/main/java/org/springframework/security/AuthenticationDetails.java index 0d951fcadd..1176ad4f4b 100755 --- a/core/src/main/java/org/springframework/security/ui/AuthenticationDetails.java +++ b/core/src/main/java/org/springframework/security/AuthenticationDetails.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security; import java.io.Serializable; diff --git a/core/src/main/java/org/springframework/security/ui/AuthenticationDetailsSource.java b/core/src/main/java/org/springframework/security/AuthenticationDetailsSource.java similarity index 94% rename from core/src/main/java/org/springframework/security/ui/AuthenticationDetailsSource.java rename to core/src/main/java/org/springframework/security/AuthenticationDetailsSource.java index ab8035a760..6290cf06fd 100644 --- a/core/src/main/java/org/springframework/security/ui/AuthenticationDetailsSource.java +++ b/core/src/main/java/org/springframework/security/AuthenticationDetailsSource.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security; diff --git a/core/src/main/java/org/springframework/security/ui/AuthenticationDetailsSourceImpl.java b/core/src/main/java/org/springframework/security/AuthenticationDetailsSourceImpl.java similarity index 96% rename from core/src/main/java/org/springframework/security/ui/AuthenticationDetailsSourceImpl.java rename to core/src/main/java/org/springframework/security/AuthenticationDetailsSourceImpl.java index 807719a578..249b085850 100755 --- a/core/src/main/java/org/springframework/security/ui/AuthenticationDetailsSourceImpl.java +++ b/core/src/main/java/org/springframework/security/AuthenticationDetailsSourceImpl.java @@ -1,8 +1,8 @@ -package org.springframework.security.ui; +package org.springframework.security; import java.lang.reflect.Constructor; -import org.springframework.security.ui.AuthenticationDetailsSource; +import org.springframework.security.AuthenticationDetailsSource; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/core/src/main/java/org/springframework/security/AuthenticationTrustResolverImpl.java b/core/src/main/java/org/springframework/security/AuthenticationTrustResolverImpl.java index f8c68e3f53..db65d2f7cd 100644 --- a/core/src/main/java/org/springframework/security/AuthenticationTrustResolverImpl.java +++ b/core/src/main/java/org/springframework/security/AuthenticationTrustResolverImpl.java @@ -15,8 +15,8 @@ package org.springframework.security; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; -import org.springframework.security.providers.rememberme.RememberMeAuthenticationToken; +import org.springframework.security.providers.AnonymousAuthenticationToken; +import org.springframework.security.providers.RememberMeAuthenticationToken; /** 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 new file mode 100644 index 0000000000..cd684edd6a --- /dev/null +++ b/core/src/main/java/org/springframework/security/expression/support/AbstractSecurityExpressionHandler.java @@ -0,0 +1,5 @@ +package org.springframework.security.expression.support; + +public class AbstractSecurityExpressionHandler { + +} diff --git a/core/src/main/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationProvider.java b/core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationProvider.java similarity index 96% rename from core/src/main/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationProvider.java rename to core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationProvider.java index 2ae0cd6dc5..e5bedc65d2 100644 --- a/core/src/main/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationProvider.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.providers.anonymous; +package org.springframework.security.providers; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.MessageSource; @@ -23,7 +23,6 @@ import org.springframework.security.Authentication; import org.springframework.security.AuthenticationException; import org.springframework.security.BadCredentialsException; import org.springframework.security.SpringSecurityMessageSource; -import org.springframework.security.providers.AuthenticationProvider; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationToken.java b/core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationToken.java similarity index 96% rename from core/src/main/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationToken.java rename to core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationToken.java index 7b9f8d9c95..ad2d232a69 100644 --- a/core/src/main/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/providers/AnonymousAuthenticationToken.java @@ -13,11 +13,10 @@ * limitations under the License. */ -package org.springframework.security.providers.anonymous; +package org.springframework.security.providers; import org.springframework.security.GrantedAuthority; -import org.springframework.security.providers.AbstractAuthenticationToken; import java.io.Serializable; import java.util.Arrays; diff --git a/core/src/main/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationProvider.java b/core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationProvider.java similarity index 95% rename from core/src/main/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationProvider.java rename to core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationProvider.java index f9d2492ba4..77bb447fe7 100644 --- a/core/src/main/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationProvider.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.providers.rememberme; +package org.springframework.security.providers; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.MessageSource; @@ -23,7 +23,6 @@ import org.springframework.security.Authentication; import org.springframework.security.AuthenticationException; import org.springframework.security.BadCredentialsException; import org.springframework.security.SpringSecurityMessageSource; -import org.springframework.security.providers.AuthenticationProvider; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationToken.java b/core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationToken.java similarity index 96% rename from core/src/main/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationToken.java rename to core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationToken.java index a07c455f16..e808154880 100644 --- a/core/src/main/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/providers/RememberMeAuthenticationToken.java @@ -13,14 +13,13 @@ * limitations under the License. */ -package org.springframework.security.providers.rememberme; +package org.springframework.security.providers; import java.io.Serializable; import java.util.Arrays; import java.util.List; import org.springframework.security.GrantedAuthority; -import org.springframework.security.providers.AbstractAuthenticationToken; /** diff --git a/core/src/main/java/org/springframework/security/providers/anonymous/package.html b/core/src/main/java/org/springframework/security/providers/anonymous/package.html deleted file mode 100644 index 6a9d20f197..0000000000 --- a/core/src/main/java/org/springframework/security/providers/anonymous/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -Allows you to secure every invocation (especially useful for web request -URI security) by always having either an actual principal or an anonymous -principal authenticated. - - diff --git a/core/src/main/java/org/springframework/security/providers/dao/AbstractUserDetailsAuthenticationProvider.java b/core/src/main/java/org/springframework/security/providers/dao/AbstractUserDetailsAuthenticationProvider.java index 2a4f90bdd8..4e0cea833a 100644 --- a/core/src/main/java/org/springframework/security/providers/dao/AbstractUserDetailsAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/providers/dao/AbstractUserDetailsAuthenticationProvider.java @@ -26,12 +26,13 @@ import org.springframework.security.LockedException; import org.springframework.security.providers.AuthenticationProvider; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.dao.cache.NullUserCache; +import org.springframework.security.userdetails.UserCache; 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.cache.NullUserCache; import org.springframework.beans.factory.InitializingBean; diff --git a/core/src/main/java/org/springframework/security/providers/rememberme/package.html b/core/src/main/java/org/springframework/security/providers/rememberme/package.html deleted file mode 100644 index fa3a953b37..0000000000 --- a/core/src/main/java/org/springframework/security/providers/rememberme/package.html +++ /dev/null @@ -1,5 +0,0 @@ - - -Authentication provider that processes RememberMeAuthenticationTokens. - - diff --git a/core/src/main/java/org/springframework/security/providers/dao/UserCache.java b/core/src/main/java/org/springframework/security/userdetails/UserCache.java similarity index 93% rename from core/src/main/java/org/springframework/security/providers/dao/UserCache.java rename to core/src/main/java/org/springframework/security/userdetails/UserCache.java index 226e55fe39..c39fb18511 100644 --- a/core/src/main/java/org/springframework/security/providers/dao/UserCache.java +++ b/core/src/main/java/org/springframework/security/userdetails/UserCache.java @@ -13,10 +13,8 @@ * limitations under the License. */ -package org.springframework.security.providers.dao; +package org.springframework.security.userdetails; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; /** diff --git a/core/src/main/java/org/springframework/security/providers/dao/cache/EhCacheBasedUserCache.java b/core/src/main/java/org/springframework/security/userdetails/cache/EhCacheBasedUserCache.java similarity index 96% rename from core/src/main/java/org/springframework/security/providers/dao/cache/EhCacheBasedUserCache.java rename to core/src/main/java/org/springframework/security/userdetails/cache/EhCacheBasedUserCache.java index edf16808fa..7c308b7ba7 100644 --- a/core/src/main/java/org/springframework/security/providers/dao/cache/EhCacheBasedUserCache.java +++ b/core/src/main/java/org/springframework/security/userdetails/cache/EhCacheBasedUserCache.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package org.springframework.security.providers.dao.cache; +package org.springframework.security.userdetails.cache; import net.sf.ehcache.CacheException; import net.sf.ehcache.Element; import net.sf.ehcache.Ehcache; -import org.springframework.security.providers.dao.UserCache; +import org.springframework.security.userdetails.UserCache; import org.springframework.security.userdetails.UserDetails; import org.apache.commons.logging.Log; diff --git a/core/src/main/java/org/springframework/security/providers/dao/cache/NullUserCache.java b/core/src/main/java/org/springframework/security/userdetails/cache/NullUserCache.java similarity index 90% rename from core/src/main/java/org/springframework/security/providers/dao/cache/NullUserCache.java rename to core/src/main/java/org/springframework/security/userdetails/cache/NullUserCache.java index bc24de7ee4..353940964d 100644 --- a/core/src/main/java/org/springframework/security/providers/dao/cache/NullUserCache.java +++ b/core/src/main/java/org/springframework/security/userdetails/cache/NullUserCache.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.providers.dao.cache; +package org.springframework.security.userdetails.cache; -import org.springframework.security.providers.dao.UserCache; +import org.springframework.security.userdetails.UserCache; import org.springframework.security.userdetails.UserDetails; diff --git a/core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManager.java b/core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManager.java index a5de681754..50d9570215 100644 --- a/core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManager.java +++ b/core/src/main/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManager.java @@ -9,11 +9,11 @@ import org.springframework.security.GrantedAuthorityImpl; import org.springframework.security.util.AuthorityUtils; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.dao.UserCache; -import org.springframework.security.providers.dao.cache.NullUserCache; +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.context.ApplicationContextException; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.jdbc.core.PreparedStatementSetter; diff --git a/web/src/test/java/org/springframework/security/ui/AuthenticationDetailsSourceImplTests.java b/core/src/test/java/org/springframework/security/AuthenticationDetailsSourceImplTests.java similarity index 92% rename from web/src/test/java/org/springframework/security/ui/AuthenticationDetailsSourceImplTests.java rename to core/src/test/java/org/springframework/security/AuthenticationDetailsSourceImplTests.java index ab006a1309..78b7de6e00 100644 --- a/web/src/test/java/org/springframework/security/ui/AuthenticationDetailsSourceImplTests.java +++ b/core/src/test/java/org/springframework/security/AuthenticationDetailsSourceImplTests.java @@ -1,8 +1,10 @@ -package org.springframework.security.ui; +package org.springframework.security; import static org.junit.Assert.*; import org.junit.Test; +import org.springframework.security.AuthenticationDetails; +import org.springframework.security.AuthenticationDetailsSourceImpl; import org.springframework.security.providers.TestingAuthenticationToken; /** diff --git a/core/src/test/java/org/springframework/security/AuthenticationTrustResolverImplTests.java b/core/src/test/java/org/springframework/security/AuthenticationTrustResolverImplTests.java index 6d40241cb8..6c30312eda 100644 --- a/core/src/test/java/org/springframework/security/AuthenticationTrustResolverImplTests.java +++ b/core/src/test/java/org/springframework/security/AuthenticationTrustResolverImplTests.java @@ -17,9 +17,9 @@ package org.springframework.security; import junit.framework.TestCase; +import org.springframework.security.providers.AnonymousAuthenticationToken; +import org.springframework.security.providers.RememberMeAuthenticationToken; import org.springframework.security.providers.TestingAuthenticationToken; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; -import org.springframework.security.providers.rememberme.RememberMeAuthenticationToken; import org.springframework.security.util.AuthorityUtils; diff --git a/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationProviderTests.java index 8f4ff70cc6..c5fd38a5a6 100644 --- a/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationProviderTests.java @@ -22,6 +22,8 @@ import org.springframework.security.BadCredentialsException; import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.providers.AnonymousAuthenticationProvider; +import org.springframework.security.providers.AnonymousAuthenticationToken; import org.springframework.security.providers.TestingAuthenticationToken; import org.springframework.security.util.AuthorityUtils; diff --git a/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationTokenTests.java index 4e8d664310..34b2367a5d 100644 --- a/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/providers/anonymous/AnonymousAuthenticationTokenTests.java @@ -20,6 +20,7 @@ import java.util.List; import junit.framework.TestCase; import org.springframework.security.GrantedAuthority; +import org.springframework.security.providers.AnonymousAuthenticationToken; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.util.AuthorityUtils; diff --git a/core/src/test/java/org/springframework/security/providers/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/dao/DaoAuthenticationProviderTests.java index ae142cfa6e..4e3922a1e3 100644 --- a/core/src/test/java/org/springframework/security/providers/dao/DaoAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/providers/dao/DaoAuthenticationProviderTests.java @@ -30,8 +30,6 @@ import org.springframework.security.LockedException; import org.springframework.security.providers.TestingAuthenticationToken; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.dao.cache.EhCacheBasedUserCache; -import org.springframework.security.providers.dao.cache.NullUserCache; import org.springframework.security.providers.dao.salt.SystemWideSaltSource; import org.springframework.security.providers.encoding.ShaPasswordEncoder; @@ -39,6 +37,8 @@ import org.springframework.security.userdetails.User; import org.springframework.security.userdetails.UserDetails; import org.springframework.security.userdetails.UserDetailsService; import org.springframework.security.userdetails.UsernameNotFoundException; +import org.springframework.security.userdetails.cache.EhCacheBasedUserCache; +import org.springframework.security.userdetails.cache.NullUserCache; import org.springframework.security.util.AuthorityUtils; import org.springframework.dao.DataAccessException; diff --git a/core/src/test/java/org/springframework/security/providers/dao/MockUserCache.java b/core/src/test/java/org/springframework/security/providers/dao/MockUserCache.java index bdf9a329c3..4893801add 100644 --- a/core/src/test/java/org/springframework/security/providers/dao/MockUserCache.java +++ b/core/src/test/java/org/springframework/security/providers/dao/MockUserCache.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; import org.springframework.security.userdetails.User; +import org.springframework.security.userdetails.UserCache; import org.springframework.security.userdetails.UserDetails; public class MockUserCache implements UserCache { diff --git a/core/src/test/java/org/springframework/security/providers/dao/cache/EhCacheBasedUserCacheTests.java b/core/src/test/java/org/springframework/security/providers/dao/cache/EhCacheBasedUserCacheTests.java index c42823feb4..0feda738d1 100644 --- a/core/src/test/java/org/springframework/security/providers/dao/cache/EhCacheBasedUserCacheTests.java +++ b/core/src/test/java/org/springframework/security/providers/dao/cache/EhCacheBasedUserCacheTests.java @@ -25,6 +25,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.security.userdetails.User; +import org.springframework.security.userdetails.cache.EhCacheBasedUserCache; import org.springframework.security.util.AuthorityUtils; /** diff --git a/core/src/test/java/org/springframework/security/providers/dao/cache/NullUserCacheTests.java b/core/src/test/java/org/springframework/security/providers/dao/cache/NullUserCacheTests.java index 556e93c616..e97a5df938 100644 --- a/core/src/test/java/org/springframework/security/providers/dao/cache/NullUserCacheTests.java +++ b/core/src/test/java/org/springframework/security/providers/dao/cache/NullUserCacheTests.java @@ -18,6 +18,7 @@ package org.springframework.security.providers.dao.cache; import junit.framework.TestCase; import org.springframework.security.userdetails.User; +import org.springframework.security.userdetails.cache.NullUserCache; import org.springframework.security.util.AuthorityUtils; diff --git a/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationProviderTests.java index 39ab8f2317..21cac33393 100644 --- a/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationProviderTests.java @@ -19,6 +19,8 @@ import junit.framework.TestCase; import org.springframework.security.Authentication; import org.springframework.security.BadCredentialsException; +import org.springframework.security.providers.RememberMeAuthenticationProvider; +import org.springframework.security.providers.RememberMeAuthenticationToken; import org.springframework.security.providers.TestingAuthenticationToken; import org.springframework.security.util.AuthorityUtils; diff --git a/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationTokenTests.java index c71e51a541..f04d142e5c 100644 --- a/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/providers/rememberme/RememberMeAuthenticationTokenTests.java @@ -21,6 +21,7 @@ import java.util.List; import junit.framework.TestCase; import org.springframework.security.GrantedAuthority; +import org.springframework.security.providers.RememberMeAuthenticationToken; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.util.AuthorityUtils; diff --git a/core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManagerTests.java b/core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManagerTests.java index 6af44467c6..1395c381b1 100644 --- a/core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManagerTests.java +++ b/core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManagerTests.java @@ -26,8 +26,8 @@ import org.springframework.security.PopulatedDatabase; import org.springframework.security.TestDataSource; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.dao.UserCache; import org.springframework.security.userdetails.User; +import org.springframework.security.userdetails.UserCache; import org.springframework.security.userdetails.UserDetails; import org.springframework.security.util.AuthorityUtils; diff --git a/core/src/test/java/org/springframework/security/vote/AuthenticatedVoterTests.java b/core/src/test/java/org/springframework/security/vote/AuthenticatedVoterTests.java index 3754c43519..587b6aaf07 100644 --- a/core/src/test/java/org/springframework/security/vote/AuthenticatedVoterTests.java +++ b/core/src/test/java/org/springframework/security/vote/AuthenticatedVoterTests.java @@ -22,9 +22,9 @@ import junit.framework.TestCase; import org.springframework.security.Authentication; import org.springframework.security.ConfigAttribute; import org.springframework.security.SecurityConfig; +import org.springframework.security.providers.AnonymousAuthenticationToken; +import org.springframework.security.providers.RememberMeAuthenticationToken; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; -import org.springframework.security.providers.rememberme.RememberMeAuthenticationToken; import org.springframework.security.util.AuthorityUtils; diff --git a/itest/context/src/test/java/org/springframework/security/performance/FilterChainPerformanceTests.java b/itest/context/src/test/java/org/springframework/security/performance/FilterChainPerformanceTests.java index e583fb5f3f..073f1ecdfd 100644 --- a/itest/context/src/test/java/org/springframework/security/performance/FilterChainPerformanceTests.java +++ b/itest/context/src/test/java/org/springframework/security/performance/FilterChainPerformanceTests.java @@ -19,9 +19,9 @@ import org.springframework.mock.web.MockHttpSession; import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthorityImpl; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.context.web.HttpSessionSecurityContextRepository; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.web.util.FilterChainProxy; +import org.springframework.security.web.FilterChainProxy; +import org.springframework.security.web.context.HttpSessionSecurityContextRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.StopWatch; 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 ba627bedd6..673c809767 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 @@ -11,13 +11,13 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - + - + @@ -37,36 +37,36 @@ - + - + - + - + - + + class="org.springframework.security.web.authentication.preauth.PreAuthenticatedProcessingFilterEntryPoint"/> - + - + - + @@ -88,7 +88,7 @@ - + diff --git a/itest/web/src/main/webapp/WEB-INF/custom-filters.xml b/itest/web/src/main/webapp/WEB-INF/custom-filters.xml index b89b1fe5ac..5cd33d1d98 100644 --- a/itest/web/src/main/webapp/WEB-INF/custom-filters.xml +++ b/itest/web/src/main/webapp/WEB-INF/custom-filters.xml @@ -7,13 +7,13 @@ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.2.xsd"> - + - + - \ No newline at end of file + diff --git a/itest/web/src/main/webapp/WEB-INF/http-security.xml b/itest/web/src/main/webapp/WEB-INF/http-security.xml index 3e40cf1951..6b4f094c21 100644 --- a/itest/web/src/main/webapp/WEB-INF/http-security.xml +++ b/itest/web/src/main/webapp/WEB-INF/http-security.xml @@ -6,13 +6,13 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.2.xsd"> - - + @@ -27,8 +27,8 @@ - + - \ No newline at end of file + diff --git a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityAuthenticationSource.java b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityAuthenticationSource.java index 1fc6b9562a..a0174e9834 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityAuthenticationSource.java +++ b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityAuthenticationSource.java @@ -2,7 +2,7 @@ package org.springframework.security.ldap; import org.springframework.security.Authentication; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; +import org.springframework.security.providers.AnonymousAuthenticationToken; import org.springframework.security.userdetails.ldap.LdapUserDetails; import org.springframework.ldap.core.AuthenticationSource; diff --git a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java index 670002b878..e71e482dd4 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java @@ -1,8 +1,8 @@ package org.springframework.security.ldap; import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.providers.AnonymousAuthenticationToken; import org.springframework.security.providers.TestingAuthenticationToken; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; import org.springframework.security.userdetails.ldap.LdapUserDetailsImpl; import org.springframework.security.util.AuthorityUtils; import org.springframework.ldap.core.AuthenticationSource; 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 1cd2408f46..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 @@ -17,18 +17,18 @@ package org.springframework.security.ui.ntlm; import org.springframework.security.Authentication; import org.springframework.security.AuthenticationCredentialsNotFoundException; +import org.springframework.security.AuthenticationDetailsSource; import org.springframework.security.AuthenticationException; import org.springframework.security.AuthenticationManager; import org.springframework.security.BadCredentialsException; 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.providers.anonymous.AnonymousAuthenticationToken; -import org.springframework.security.ui.SpringSecurityFilter; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.AuthenticationDetailsSource; -import org.springframework.security.ui.WebAuthenticationDetailsSource; -import org.springframework.security.ui.webapp.AuthenticationProcessingFilter; +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.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java index 2d04108f74..0b8ded0722 100755 --- a/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java +++ b/ntlm/src/main/java/org/springframework/security/ui/ntlm/NtlmProcessingFilterEntryPoint.java @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.security.AuthenticationException; -import org.springframework.security.ui.AuthenticationEntryPoint; +import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.util.Assert; /** diff --git a/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java b/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java similarity index 92% rename from openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java rename to openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java index df42343b3a..6e45982cb3 100644 --- a/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java +++ b/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.providers.openid; +package org.springframework.security.openid; import org.springframework.security.AuthenticationException; diff --git a/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenID4JavaConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java similarity index 93% rename from openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenID4JavaConsumer.java rename to openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java index f73e822d92..ad8f5c914b 100644 --- a/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenID4JavaConsumer.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java @@ -12,13 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.ui.openid.consumers; - -import org.springframework.security.providers.openid.OpenIDAuthenticationStatus; -import org.springframework.security.providers.openid.OpenIDAuthenticationToken; - -import org.springframework.security.ui.openid.OpenIDConsumer; -import org.springframework.security.ui.openid.OpenIDConsumerException; +package org.springframework.security.openid; import org.openid4java.association.AssociationException; diff --git a/openid/src/main/java/org/springframework/security/ui/openid/OpenIDAuthenticationProcessingFilter.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilter.java similarity index 95% rename from openid/src/main/java/org/springframework/security/ui/openid/OpenIDAuthenticationProcessingFilter.java rename to openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilter.java index 6dd688ae72..7324807e07 100644 --- a/openid/src/main/java/org/springframework/security/ui/openid/OpenIDAuthenticationProcessingFilter.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.openid; +package org.springframework.security.openid; import java.io.IOException; import java.net.MalformedURLException; @@ -28,12 +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.providers.openid.OpenIDAuthenticationProvider; -import org.springframework.security.providers.openid.OpenIDAuthenticationToken; -import org.springframework.security.ui.AbstractProcessingFilter; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.openid.consumers.OpenID4JavaConsumer; -import org.springframework.security.ui.webapp.AuthenticationProcessingFilter; +import org.springframework.security.web.FilterChainOrder; +import org.springframework.security.web.authentication.AbstractProcessingFilter; +import org.springframework.security.web.authentication.AuthenticationProcessingFilter; import org.springframework.util.StringUtils; diff --git a/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java similarity index 96% rename from openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java rename to openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java index 675dc545ca..1dbb0debed 100644 --- a/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.providers.openid; +package org.springframework.security.openid; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.Authentication; diff --git a/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java similarity index 95% rename from openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java rename to openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java index 582927b8ad..6f9d8da57f 100644 --- a/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.providers.openid; +package org.springframework.security.openid; import java.io.ObjectStreamException; import java.io.Serializable; diff --git a/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java similarity index 95% rename from openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java rename to openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java index b9242960a8..6340ea5bf8 100644 --- a/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.providers.openid; +package org.springframework.security.openid; import java.util.ArrayList; import java.util.List; diff --git a/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java similarity index 91% rename from openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java rename to openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java index 796b66aaf0..6bfb8e4823 100644 --- a/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java @@ -12,9 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.ui.openid; +package org.springframework.security.openid; -import org.springframework.security.providers.openid.OpenIDAuthenticationToken; import javax.servlet.http.HttpServletRequest; diff --git a/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java similarity index 93% rename from openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java rename to openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java index 928d5dd8a5..dc1476a03e 100644 --- a/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.ui.openid; +package org.springframework.security.openid; /** * Thrown by an OpenIDConsumer if it cannot process a request diff --git a/openid/src/main/java/org/springframework/security/ui/openid/package.html b/openid/src/main/java/org/springframework/security/openid/package.html similarity index 100% rename from openid/src/main/java/org/springframework/security/ui/openid/package.html rename to openid/src/main/java/org/springframework/security/openid/package.html diff --git a/openid/src/main/java/org/springframework/security/providers/openid/package.html b/openid/src/main/java/org/springframework/security/providers/openid/package.html deleted file mode 100644 index 5fc7ffefe9..0000000000 --- a/openid/src/main/java/org/springframework/security/providers/openid/package.html +++ /dev/null @@ -1,6 +0,0 @@ - - -An authentication provider that can process OpenID -Authentication Tokens as created by implementations of the OpenIDConsumer interface. - - diff --git a/openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html b/openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html deleted file mode 100644 index 913d6930e9..0000000000 --- a/openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html +++ /dev/null @@ -1,5 +0,0 @@ - - -Implementations of the OpenIDConsumer interface using 3rd party libraries. - - diff --git a/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java b/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java similarity index 89% rename from openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java rename to openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java index 1863f69a07..aa724c4ac8 100644 --- a/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java +++ b/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.ui.openid.consumers; +package org.springframework.security.openid; -import org.springframework.security.providers.openid.OpenIDAuthenticationToken; -import org.springframework.security.ui.openid.OpenIDConsumer; -import org.springframework.security.ui.openid.OpenIDConsumerException; +import org.springframework.security.openid.OpenIDAuthenticationToken; +import org.springframework.security.openid.OpenIDConsumer; +import org.springframework.security.openid.OpenIDConsumerException; import javax.servlet.http.HttpServletRequest; diff --git a/openid/src/test/java/org/springframework/security/ui/openid/OpenIDAuthenticationProcessingFilterTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilterTests.java similarity index 90% rename from openid/src/test/java/org/springframework/security/ui/openid/OpenIDAuthenticationProcessingFilterTests.java rename to openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilterTests.java index a0da432b93..0c6c65c968 100644 --- a/openid/src/test/java/org/springframework/security/ui/openid/OpenIDAuthenticationProcessingFilterTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProcessingFilterTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.openid; +package org.springframework.security.openid; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -13,8 +13,9 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.MockAuthenticationManager; -import org.springframework.security.ui.SavedRequestAwareAuthenticationSuccessHandler; -import org.springframework.security.ui.openid.consumers.MockOpenIDConsumer; +import org.springframework.security.openid.OpenIDAuthenticationProcessingFilter; +import org.springframework.security.openid.OpenIDConsumerException; +import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; public class OpenIDAuthenticationProcessingFilterTests { diff --git a/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java similarity index 94% rename from openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java rename to openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java index 9127ebbe05..abc8dbd62a 100644 --- a/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.providers.openid; +package org.springframework.security.openid; import junit.framework.TestCase; import org.springframework.security.Authentication; @@ -23,6 +23,10 @@ import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthorityImpl; import org.springframework.security.userdetails.UserDetails; import org.springframework.security.userdetails.User; +import org.springframework.security.openid.AuthenticationCancelledException; +import org.springframework.security.openid.OpenIDAuthenticationProvider; +import org.springframework.security.openid.OpenIDAuthenticationStatus; +import org.springframework.security.openid.OpenIDAuthenticationToken; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.userdetails.UserDetailsService; diff --git a/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationTokenTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationTokenTests.java similarity index 85% rename from openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationTokenTests.java rename to openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationTokenTests.java index 56e16be8e7..ca2a27dab8 100644 --- a/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationTokenTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationTokenTests.java @@ -12,7 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.providers.openid; +package org.springframework.security.openid; + +import org.springframework.security.openid.OpenIDAuthenticationStatus; +import org.springframework.security.openid.OpenIDAuthenticationToken; import junit.framework.TestCase; diff --git a/portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java b/portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java index 1e61522ab5..5916fc6c2b 100644 --- a/portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java +++ b/portlet/src/main/java/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java @@ -31,14 +31,14 @@ import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationDetailsSource; +import org.springframework.security.AuthenticationDetailsSourceImpl; import org.springframework.security.AuthenticationException; import org.springframework.security.AuthenticationManager; import org.springframework.security.context.SecurityContext; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken; import org.springframework.security.ui.AbstractProcessingFilter; -import org.springframework.security.ui.AuthenticationDetailsSource; -import org.springframework.security.ui.AuthenticationDetailsSourceImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; 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 bff8f15ae1..f3554b3765 100644 --- a/samples/contacts/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/contacts/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -43,7 +43,7 @@ - + diff --git a/samples/contacts/src/main/webapp/WEB-INF/web.xml b/samples/contacts/src/main/webapp/WEB-INF/web.xml index 669a9fbc32..736affbafd 100644 --- a/samples/contacts/src/main/webapp/WEB-INF/web.xml +++ b/samples/contacts/src/main/webapp/WEB-INF/web.xml @@ -60,15 +60,6 @@ org.springframework.web.util.Log4jConfigListener - - - org.springframework.security.ui.session.HttpSessionEventPublisher - - diff --git a/samples/dms/src/main/resources/applicationContext-dms-secure.xml b/samples/dms/src/main/resources/applicationContext-dms-secure.xml index 228e118ba6..32d7ef7d38 100755 --- a/samples/dms/src/main/resources/applicationContext-dms-secure.xml +++ b/samples/dms/src/main/resources/applicationContext-dms-secure.xml @@ -73,7 +73,7 @@ - + diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml index 80a6ac2b9f..ec719eee1e 100644 --- a/samples/ldap/pom.xml +++ b/samples/ldap/pom.xml @@ -15,6 +15,16 @@ spring-security-ldap ${project.version} + + org.springframework.security + spring-security-config + ${project.version} + + + org.springframework.security + spring-security-web + ${project.version} + org.springframework org.springframework.web diff --git a/samples/ldap/src/main/webapp/WEB-INF/web.xml b/samples/ldap/src/main/webapp/WEB-INF/web.xml index 05dae3ab99..d49a01823a 100644 --- a/samples/ldap/src/main/webapp/WEB-INF/web.xml +++ b/samples/ldap/src/main/webapp/WEB-INF/web.xml @@ -46,12 +46,4 @@ org.springframework.web.context.ContextLoaderListener - - - org.springframework.security.ui.session.HttpSessionEventPublisher - - diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml index 27dc35099e..7ca4a5ee1a 100644 --- a/samples/preauth/pom.xml +++ b/samples/preauth/pom.xml @@ -14,29 +14,30 @@ org.springframework.security spring-security-core ${project.version} + runtime - org.springframework - org.springframework.web - - - org.springframework - org.springframework.web.servlet + org.springframework.security + spring-security-web + ${project.version} + runtime - org.springframework - org.springframework.jdbc + org.springframework.security + spring-security-config + ${project.version} runtime org.springframework - org.springframework.aop + org.springframework.jdbc runtime jaxen jaxen 1.1.1 + runtime @@ -58,5 +59,4 @@ - 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 bfae03d9bd..d9a53c0757 100644 --- a/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -12,13 +12,13 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.1.xsd"> - + - + @@ -30,24 +30,24 @@ - + + class="org.springframework.security.web.authentication.preauth.PreAuthenticatedProcessingFilterEntryPoint"/> - + - + - + @@ -56,7 +56,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -96,8 +96,8 @@ - - + + diff --git a/samples/preauth/src/main/webapp/WEB-INF/web.xml b/samples/preauth/src/main/webapp/WEB-INF/web.xml index f363aa92f3..acbfc088af 100644 --- a/samples/preauth/src/main/webapp/WEB-INF/web.xml +++ b/samples/preauth/src/main/webapp/WEB-INF/web.xml @@ -12,15 +12,15 @@ Spring Security Preauthentication Demo Application - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - + - Location of the XML file that defines the root application context + - Applied by ContextLoaderListener. + --> + + contextConfigLocation + + /WEB-INF/applicationContext-security.xml + + filterChainProxy @@ -32,21 +32,13 @@ /* - - - org.springframework.web.context.ContextLoaderListener - - - - org.springframework.security.ui.session.HttpSessionEventPublisher + org.springframework.web.context.ContextLoaderListener diff --git a/samples/runall.sh b/samples/runall.sh index c5c8b6bb07..84162e5cf0 100755 --- a/samples/runall.sh +++ b/samples/runall.sh @@ -26,20 +26,30 @@ stop_jetty() { cleanup cd tutorial +echo "Running tutorial app..." start_jetty curl http://localhost:8080/tutorial/ stop_jetty +echo "Running contacts app..." cd ../contacts start_jetty curl http://localhost:8080/contacts/ stop_jetty +echo "Running ldap app..." cd ../ldap start_jetty curl http://localhost:8080/ldap/ stop_jetty +echo "Running preauth app..." +cd ../preauth +start_jetty +curl http://localhost:8080/preauth/ +stop_jetty + + cd ../cas if [[ -e ./server/cas-server-webapp-3.2.1.war ]] diff --git a/samples/tutorial/src/main/webapp/WEB-INF/web.xml b/samples/tutorial/src/main/webapp/WEB-INF/web.xml index 8b0f75af45..ecd1d922fe 100644 --- a/samples/tutorial/src/main/webapp/WEB-INF/web.xml +++ b/samples/tutorial/src/main/webapp/WEB-INF/web.xml @@ -57,7 +57,7 @@ - context. Optional unless concurrent session control is being used. --> - org.springframework.security.ui.session.HttpSessionEventPublisher + org.springframework.security.web.session.HttpSessionEventPublisher diff --git a/web/src/main/java/org/springframework/security/ui/basicauth/package.html b/web/src/main/java/org/springframework/security/ui/basicauth/package.html deleted file mode 100644 index dcd7c31c91..0000000000 --- a/web/src/main/java/org/springframework/security/ui/basicauth/package.html +++ /dev/null @@ -1,5 +0,0 @@ - - -Authenticates HTTP BASIC authentication requests. - - diff --git a/web/src/main/java/org/springframework/security/ui/digestauth/package.html b/web/src/main/java/org/springframework/security/ui/digestauth/package.html deleted file mode 100644 index a6ba011cc2..0000000000 --- a/web/src/main/java/org/springframework/security/ui/digestauth/package.html +++ /dev/null @@ -1,5 +0,0 @@ - - -Authenticates HTTP Digest authentication requests. - - diff --git a/web/src/main/java/org/springframework/security/ui/webapp/package.html b/web/src/main/java/org/springframework/security/ui/webapp/package.html deleted file mode 100644 index f37f81c844..0000000000 --- a/web/src/main/java/org/springframework/security/ui/webapp/package.html +++ /dev/null @@ -1,5 +0,0 @@ - - -Authenticates users via HTTP properties, headers and session. - - diff --git a/web/src/main/java/org/springframework/security/ui/AbstractAuthenticationTargetUrlRequestHandler.java b/web/src/main/java/org/springframework/security/web/AbstractAuthenticationTargetUrlRequestHandler.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/AbstractAuthenticationTargetUrlRequestHandler.java rename to web/src/main/java/org/springframework/security/web/AbstractAuthenticationTargetUrlRequestHandler.java index e2cfd2ad96..9af210990a 100644 --- a/web/src/main/java/org/springframework/security/ui/AbstractAuthenticationTargetUrlRequestHandler.java +++ b/web/src/main/java/org/springframework/security/web/AbstractAuthenticationTargetUrlRequestHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -11,7 +11,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.security.Authentication; -import org.springframework.security.ui.logout.LogoutHandler; +import org.springframework.security.web.authentication.AuthenticationSuccessHandler; +import org.springframework.security.web.logout.LogoutHandler; import org.springframework.security.web.util.RedirectUtils; import org.springframework.security.web.util.UrlUtils; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/ui/AccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/AccessDeniedHandler.java similarity index 95% rename from web/src/main/java/org/springframework/security/ui/AccessDeniedHandler.java rename to web/src/main/java/org/springframework/security/web/AccessDeniedHandler.java index a5716cce84..9934971ec2 100644 --- a/web/src/main/java/org/springframework/security/ui/AccessDeniedHandler.java +++ b/web/src/main/java/org/springframework/security/web/AccessDeniedHandler.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security.web; import org.springframework.security.AccessDeniedException; diff --git a/web/src/main/java/org/springframework/security/ui/AccessDeniedHandlerImpl.java b/web/src/main/java/org/springframework/security/web/AccessDeniedHandlerImpl.java similarity index 96% rename from web/src/main/java/org/springframework/security/ui/AccessDeniedHandlerImpl.java rename to web/src/main/java/org/springframework/security/web/AccessDeniedHandlerImpl.java index b76927311f..1e697b4b9a 100644 --- a/web/src/main/java/org/springframework/security/ui/AccessDeniedHandlerImpl.java +++ b/web/src/main/java/org/springframework/security/web/AccessDeniedHandlerImpl.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security.web; import java.io.IOException; diff --git a/web/src/main/java/org/springframework/security/ui/AuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/AuthenticationEntryPoint.java rename to web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java index 9ec372e5f2..4d33ebcf6c 100644 --- a/web/src/main/java/org/springframework/security/ui/AuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security.web; import org.springframework.security.AuthenticationException; diff --git a/web/src/main/java/org/springframework/security/ui/ExceptionTranslationFilter.java b/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java similarity index 96% rename from web/src/main/java/org/springframework/security/ui/ExceptionTranslationFilter.java rename to web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java index be47f3fa78..c586b3d932 100644 --- a/web/src/main/java/org/springframework/security/ui/ExceptionTranslationFilter.java +++ b/web/src/main/java/org/springframework/security/web/ExceptionTranslationFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security.web; import org.springframework.security.AccessDeniedException; import org.springframework.security.SpringSecurityException; @@ -22,11 +22,9 @@ import org.springframework.security.AuthenticationTrustResolver; import org.springframework.security.AuthenticationTrustResolverImpl; import org.springframework.security.InsufficientAuthenticationException; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.ui.savedrequest.SavedRequest; import org.springframework.security.util.ThrowableAnalyzer; import org.springframework.security.util.ThrowableCauseExtractor; -import org.springframework.security.web.util.PortResolver; -import org.springframework.security.web.util.PortResolverImpl; +import org.springframework.security.web.savedrequest.SavedRequest; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; @@ -51,8 +49,8 @@ import javax.servlet.http.HttpServletResponse; *

* 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 - * an anonymous user, the filter will delegate to the {@link org.springframework.security.ui.AccessDeniedHandler}. - * By default the filter will use {@link org.springframework.security.ui.AccessDeniedHandlerImpl}. + * an anonymous user, the filter will delegate to the {@link org.springframework.security.web.AccessDeniedHandler}. + * By default the filter will use {@link org.springframework.security.web.AccessDeniedHandlerImpl}. *

* To use this filter, it is necessary to specify the following properties: *

    @@ -176,7 +174,7 @@ public class ExceptionTranslationFilter extends SpringSecurityFilter implements * false. *

    * Remember to also set - * {@link org.springframework.security.context.web.HttpSessionSecurityContextRepository#setAllowSessionCreation(boolean)} + * {@link org.springframework.security.web.context.HttpSessionSecurityContextRepository#setAllowSessionCreation(boolean)} * to false if you set this property to false. * * @return true if the HttpSession will be diff --git a/web/src/main/java/org/springframework/security/ui/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/ui/FilterChainOrder.java rename to web/src/main/java/org/springframework/security/web/FilterChainOrder.java index 62f748d30d..58f0c01a17 100644 --- a/web/src/main/java/org/springframework/security/ui/FilterChainOrder.java +++ b/web/src/main/java/org/springframework/security/web/FilterChainOrder.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/web/util/FilterChainProxy.java b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java similarity index 98% rename from web/src/main/java/org/springframework/security/web/util/FilterChainProxy.java rename to web/src/main/java/org/springframework/security/web/FilterChainProxy.java index b03526359e..c872ef01c9 100644 --- a/web/src/main/java/org/springframework/security/web/util/FilterChainProxy.java +++ b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.web.util; +package org.springframework.security.web; import java.io.IOException; import java.util.Collection; @@ -34,10 +34,10 @@ import javax.servlet.ServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.security.intercept.web.FilterInvocation; -import org.springframework.security.intercept.web.FilterInvocationSecurityMetadataSource; 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/util/PortMapper.java b/web/src/main/java/org/springframework/security/web/PortMapper.java similarity index 97% rename from web/src/main/java/org/springframework/security/web/util/PortMapper.java rename to web/src/main/java/org/springframework/security/web/PortMapper.java index 1012d73530..0f36469670 100644 --- a/web/src/main/java/org/springframework/security/web/util/PortMapper.java +++ b/web/src/main/java/org/springframework/security/web/PortMapper.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.web.util; +package org.springframework.security.web; /** * PortMapper implementations provide callers with information diff --git a/web/src/main/java/org/springframework/security/web/util/PortMapperImpl.java b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java similarity index 98% rename from web/src/main/java/org/springframework/security/web/util/PortMapperImpl.java rename to web/src/main/java/org/springframework/security/web/PortMapperImpl.java index bf5733088d..1cc9b557b6 100644 --- a/web/src/main/java/org/springframework/security/web/util/PortMapperImpl.java +++ b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java @@ -13,7 +13,7 @@ * limitations under the License. */ -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/util/PortResolver.java b/web/src/main/java/org/springframework/security/web/PortResolver.java similarity index 96% rename from web/src/main/java/org/springframework/security/web/util/PortResolver.java rename to web/src/main/java/org/springframework/security/web/PortResolver.java index 9512bcaee2..bc0d469627 100644 --- a/web/src/main/java/org/springframework/security/web/util/PortResolver.java +++ b/web/src/main/java/org/springframework/security/web/PortResolver.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.web.util; +package org.springframework.security.web; import javax.servlet.ServletRequest; diff --git a/web/src/main/java/org/springframework/security/web/util/PortResolverImpl.java b/web/src/main/java/org/springframework/security/web/PortResolverImpl.java similarity index 98% rename from web/src/main/java/org/springframework/security/web/util/PortResolverImpl.java rename to web/src/main/java/org/springframework/security/web/PortResolverImpl.java index 1242b32e63..f3fa263d5c 100644 --- a/web/src/main/java/org/springframework/security/web/util/PortResolverImpl.java +++ b/web/src/main/java/org/springframework/security/web/PortResolverImpl.java @@ -13,7 +13,7 @@ * limitations under the License. */ -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/ui/SessionFixationProtectionFilter.java b/web/src/main/java/org/springframework/security/web/SessionFixationProtectionFilter.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/SessionFixationProtectionFilter.java rename to web/src/main/java/org/springframework/security/web/SessionFixationProtectionFilter.java index 6d924ec310..e2b5cff9a1 100644 --- a/web/src/main/java/org/springframework/security/ui/SessionFixationProtectionFilter.java +++ b/web/src/main/java/org/springframework/security/web/SessionFixationProtectionFilter.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web; import java.io.IOException; @@ -14,7 +14,7 @@ import org.springframework.security.AuthenticationTrustResolverImpl; import org.springframework.security.concurrent.SessionRegistry; import org.springframework.security.context.SecurityContext; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.context.web.HttpSessionSecurityContextRepository; +import org.springframework.security.web.context.HttpSessionSecurityContextRepository; import org.springframework.security.web.util.SessionUtils; /** diff --git a/web/src/main/java/org/springframework/security/ui/SpringSecurityFilter.java b/web/src/main/java/org/springframework/security/web/SpringSecurityFilter.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/SpringSecurityFilter.java rename to web/src/main/java/org/springframework/security/web/SpringSecurityFilter.java index 4fa9beb539..640d6e09c6 100644 --- a/web/src/main/java/org/springframework/security/ui/SpringSecurityFilter.java +++ b/web/src/main/java/org/springframework/security/web/SpringSecurityFilter.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/web/src/main/java/org/springframework/security/ui/WebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/WebAuthenticationDetails.java similarity index 99% rename from web/src/main/java/org/springframework/security/ui/WebAuthenticationDetails.java rename to web/src/main/java/org/springframework/security/web/WebAuthenticationDetails.java index eaa8e2647f..b3571b45db 100644 --- a/web/src/main/java/org/springframework/security/ui/WebAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/WebAuthenticationDetails.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security.web; import org.springframework.security.concurrent.SessionIdentifierAware; diff --git a/web/src/main/java/org/springframework/security/ui/WebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/WebAuthenticationDetailsSource.java similarity index 93% rename from web/src/main/java/org/springframework/security/ui/WebAuthenticationDetailsSource.java rename to web/src/main/java/org/springframework/security/web/WebAuthenticationDetailsSource.java index cb357853ec..3e78ada62c 100644 --- a/web/src/main/java/org/springframework/security/ui/WebAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/WebAuthenticationDetailsSource.java @@ -13,8 +13,9 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security.web; +import org.springframework.security.AuthenticationDetailsSource; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/web/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AbstractProcessingFilter.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/AbstractProcessingFilter.java index 9634a1ba7c..51f8a20edd 100644 --- a/web/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AbstractProcessingFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security.web.authentication; import java.io.IOException; @@ -30,14 +30,17 @@ import org.springframework.context.MessageSource; import org.springframework.context.MessageSourceAware; import org.springframework.context.support.MessageSourceAccessor; import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationDetailsSource; import org.springframework.security.AuthenticationException; import org.springframework.security.AuthenticationManager; import org.springframework.security.SpringSecurityMessageSource; import org.springframework.security.concurrent.SessionRegistry; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.event.authentication.InteractiveAuthenticationSuccessEvent; -import org.springframework.security.ui.rememberme.NullRememberMeServices; -import org.springframework.security.ui.rememberme.RememberMeServices; +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.SessionUtils; import org.springframework.security.web.util.UrlUtils; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/ui/anonymous/AnonymousProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java similarity index 92% rename from web/src/main/java/org/springframework/security/ui/anonymous/AnonymousProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java index 5ba6d64eca..8e42a926b2 100644 --- a/web/src/main/java/org/springframework/security/ui/anonymous/AnonymousProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AnonymousProcessingFilter.java @@ -13,18 +13,18 @@ * limitations under the License. */ -package org.springframework.security.ui.anonymous; +package org.springframework.security.web.authentication; import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationDetailsSource; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; -import org.springframework.security.ui.AuthenticationDetailsSource; -import org.springframework.security.ui.WebAuthenticationDetailsSource; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.SpringSecurityFilter; +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.beans.factory.InitializingBean; import org.springframework.util.Assert; @@ -140,7 +140,7 @@ public class AnonymousProcessingFilter extends SpringSecurityFilter implements /** * Controls whether the filter will remove the Anonymous token after the request is complete. Generally * this is desired to avoid the expense of a session being created by {@link - * org.springframework.security.context.web.HttpSessionContextIntegrationFilter HttpSessionContextIntegrationFilter} simply to + * org.springframework.security.web.context.HttpSessionContextIntegrationFilter HttpSessionContextIntegrationFilter} simply to * store the Anonymous authentication token.

    Defaults to true, being the most optimal and * appropriate option (ie AnonymousProcessingFilter will clear the token at the end of each request, * thus avoiding the session creation overhead in a typical configuration.

    diff --git a/web/src/main/java/org/springframework/security/ui/AuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFailureHandler.java similarity index 95% rename from web/src/main/java/org/springframework/security/ui/AuthenticationFailureHandler.java rename to web/src/main/java/org/springframework/security/web/authentication/AuthenticationFailureHandler.java index 66ec030e8c..9896d57612 100644 --- a/web/src/main/java/org/springframework/security/ui/AuthenticationFailureHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFailureHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web.authentication; import java.io.IOException; diff --git a/web/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationProcessingFilter.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/AuthenticationProcessingFilter.java index 77e2a3a5ca..2d66dd4ed5 100644 --- a/web/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationProcessingFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.webapp; +package org.springframework.security.web.authentication; import org.springframework.security.Authentication; import org.springframework.security.AuthenticationException; @@ -21,9 +21,8 @@ import org.springframework.security.AuthenticationServiceException; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.ui.AbstractProcessingFilter; -import org.springframework.security.ui.FilterChainOrder; import org.springframework.security.util.TextUtils; +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/ui/webapp/AuthenticationProcessingFilterEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationProcessingFilterEntryPoint.java similarity index 95% rename from web/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPoint.java rename to web/src/main/java/org/springframework/security/web/authentication/AuthenticationProcessingFilterEntryPoint.java index 68815bd4ec..4b325dbb43 100644 --- a/web/src/main/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationProcessingFilterEntryPoint.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package org.springframework.security.ui.webapp; +package org.springframework.security.web.authentication; import org.springframework.security.AuthenticationException; -import org.springframework.security.ui.AuthenticationEntryPoint; -import org.springframework.security.ui.ExceptionTranslationFilter; -import org.springframework.security.web.util.PortMapper; -import org.springframework.security.web.util.PortMapperImpl; -import org.springframework.security.web.util.PortResolver; -import org.springframework.security.web.util.PortResolverImpl; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.ExceptionTranslationFilter; +import org.springframework.security.web.PortMapper; +import org.springframework.security.web.PortMapperImpl; +import org.springframework.security.web.PortResolver; +import org.springframework.security.web.PortResolverImpl; import org.springframework.security.web.util.RedirectUrlBuilder; import org.springframework.security.web.util.UrlUtils; diff --git a/web/src/main/java/org/springframework/security/ui/AuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationSuccessHandler.java similarity index 95% rename from web/src/main/java/org/springframework/security/ui/AuthenticationSuccessHandler.java rename to web/src/main/java/org/springframework/security/web/authentication/AuthenticationSuccessHandler.java index 582cbcf4b3..728b5cb49e 100644 --- a/web/src/main/java/org/springframework/security/ui/AuthenticationSuccessHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationSuccessHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web.authentication; import java.io.IOException; diff --git a/web/src/main/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilter.java similarity index 95% rename from web/src/main/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilter.java index fca9fc8f58..c45dab1b57 100644 --- a/web/src/main/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilter.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.webapp; +package org.springframework.security.web.authentication; import java.io.IOException; @@ -10,10 +10,9 @@ import javax.servlet.http.HttpSession; import org.springframework.beans.BeanWrapperImpl; import org.springframework.security.AuthenticationException; -import org.springframework.security.ui.AbstractProcessingFilter; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.SpringSecurityFilter; -import org.springframework.security.ui.rememberme.AbstractRememberMeServices; +import org.springframework.security.web.FilterChainOrder; +import org.springframework.security.web.SpringSecurityFilter; +import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; /** * 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/ui/ExceptionMappingAuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/ExceptionMappingAuthenticationFailureHandler.java rename to web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java index e412902f2c..16bccd70a2 100644 --- a/web/src/main/java/org/springframework/security/ui/ExceptionMappingAuthenticationFailureHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web.authentication; import java.io.IOException; import java.util.HashMap; diff --git a/web/src/main/java/org/springframework/security/ui/SavedRequestAwareAuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java similarity index 93% rename from web/src/main/java/org/springframework/security/ui/SavedRequestAwareAuthenticationSuccessHandler.java rename to web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java index 4b4f742509..ff7b64bc0d 100644 --- a/web/src/main/java/org/springframework/security/ui/SavedRequestAwareAuthenticationSuccessHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web.authentication; import java.io.IOException; @@ -8,9 +8,10 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.springframework.security.Authentication; -import org.springframework.security.ui.savedrequest.SavedRequest; +import org.springframework.security.web.ExceptionTranslationFilter; +import org.springframework.security.web.savedrequest.SavedRequest; import org.springframework.security.web.util.RedirectUtils; -import org.springframework.security.wrapper.SavedRequestAwareWrapper; +import org.springframework.security.web.wrapper.SavedRequestAwareWrapper; import org.springframework.util.StringUtils; /** diff --git a/web/src/main/java/org/springframework/security/ui/SimpleUrlAuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java similarity index 98% rename from web/src/main/java/org/springframework/security/ui/SimpleUrlAuthenticationFailureHandler.java rename to web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java index 2bea42f7fa..446be67e14 100644 --- a/web/src/main/java/org/springframework/security/ui/SimpleUrlAuthenticationFailureHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web.authentication; import java.io.IOException; diff --git a/web/src/main/java/org/springframework/security/ui/SimpleUrlAuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandler.java similarity index 84% rename from web/src/main/java/org/springframework/security/ui/SimpleUrlAuthenticationSuccessHandler.java rename to web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandler.java index ec5b37923f..30aa6ff6b4 100644 --- a/web/src/main/java/org/springframework/security/ui/SimpleUrlAuthenticationSuccessHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web.authentication; import java.io.IOException; @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.security.Authentication; +import org.springframework.security.web.AbstractAuthenticationTargetUrlRequestHandler; public class SimpleUrlAuthenticationSuccessHandler extends AbstractAuthenticationTargetUrlRequestHandler implements AuthenticationSuccessHandler { diff --git a/web/src/main/java/org/springframework/security/ui/package.html b/web/src/main/java/org/springframework/security/web/authentication/package.html similarity index 100% rename from web/src/main/java/org/springframework/security/ui/package.html rename to web/src/main/java/org/springframework/security/web/authentication/package.html diff --git a/web/src/main/java/org/springframework/security/ui/preauth/AbstractPreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java similarity index 93% rename from web/src/main/java/org/springframework/security/ui/preauth/AbstractPreAuthenticatedProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java index 00282b5440..b5309c510d 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/AbstractPreAuthenticatedProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth; +package org.springframework.security.web.authentication.preauth; import java.io.IOException; @@ -8,14 +8,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken; +import org.springframework.security.AuthenticationDetailsSource; import org.springframework.security.AuthenticationManager; import org.springframework.security.Authentication; import org.springframework.security.AuthenticationException; import org.springframework.security.event.authentication.InteractiveAuthenticationSuccessEvent; -import org.springframework.security.ui.AuthenticationDetailsSource; -import org.springframework.security.ui.WebAuthenticationDetailsSource; -import org.springframework.security.ui.AbstractProcessingFilter; -import org.springframework.security.ui.SpringSecurityFilter; +import org.springframework.security.web.SpringSecurityFilter; +import org.springframework.security.web.WebAuthenticationDetailsSource; +import org.springframework.security.web.authentication.AbstractProcessingFilter; import org.springframework.security.context.SecurityContextHolder; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationEventPublisher; diff --git a/web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedCredentialsNotFoundException.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedCredentialsNotFoundException.java similarity index 79% rename from web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedCredentialsNotFoundException.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedCredentialsNotFoundException.java index ab8e8cb547..dcb1b0504c 100644 --- a/web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedCredentialsNotFoundException.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedCredentialsNotFoundException.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth; +package org.springframework.security.web.authentication.preauth; import org.springframework.security.AuthenticationException; diff --git a/web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java similarity index 93% rename from web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java index 2a43c0b2b8..30c097d335 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesAuthenticationDetails.java @@ -1,11 +1,11 @@ -package org.springframework.security.ui.preauth; +package org.springframework.security.web.authentication.preauth; import java.util.Collections; import java.util.List; +import org.springframework.security.AuthenticationDetails; import org.springframework.security.GrantedAuthority; import org.springframework.security.MutableGrantedAuthoritiesContainer; -import org.springframework.security.ui.AuthenticationDetails; import org.springframework.util.Assert; /** diff --git a/web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java similarity index 88% rename from web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java index 24e8de4f31..89f959d9bc 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java @@ -1,10 +1,10 @@ -package org.springframework.security.ui.preauth; +package org.springframework.security.web.authentication.preauth; import java.util.List; import javax.servlet.http.HttpServletRequest; -import org.springframework.security.ui.WebAuthenticationDetails; +import org.springframework.security.web.WebAuthenticationDetails; import org.springframework.security.GrantedAuthoritiesContainerImpl; import org.springframework.security.GrantedAuthority; import org.springframework.security.MutableGrantedAuthoritiesContainer; diff --git a/web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedProcessingFilterEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterEntryPoint.java similarity index 88% rename from web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedProcessingFilterEntryPoint.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterEntryPoint.java index 0ea401b524..fc4a6a5369 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedProcessingFilterEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterEntryPoint.java @@ -1,7 +1,7 @@ -package org.springframework.security.ui.preauth; +package org.springframework.security.web.authentication.preauth; import org.springframework.security.AuthenticationException; -import org.springframework.security.ui.AuthenticationEntryPoint; +import org.springframework.security.web.AuthenticationEntryPoint; import java.io.IOException; @@ -31,7 +31,7 @@ import org.springframework.core.Ordered; * This code is based on * {@link org.springframework.security.ui.x509.X509ProcessingFilterEntryPoint}. * - * @see org.springframework.security.ui.ExceptionTranslationFilter + * @see org.springframework.security.web.ExceptionTranslationFilter * * @author Luke Taylor * @author Ruud Senden diff --git a/web/src/main/java/org/springframework/security/ui/preauth/header/RequestHeaderPreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderPreAuthenticatedProcessingFilter.java similarity index 91% rename from web/src/main/java/org/springframework/security/ui/preauth/header/RequestHeaderPreAuthenticatedProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderPreAuthenticatedProcessingFilter.java index 20dc9073d7..c9a804a9e3 100644 --- a/web/src/main/java/org/springframework/security/ui/preauth/header/RequestHeaderPreAuthenticatedProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderPreAuthenticatedProcessingFilter.java @@ -1,10 +1,8 @@ -package org.springframework.security.ui.preauth.header; +package org.springframework.security.web.authentication.preauth; import javax.servlet.http.HttpServletRequest; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.preauth.AbstractPreAuthenticatedProcessingFilter; -import org.springframework.security.ui.preauth.PreAuthenticatedCredentialsNotFoundException; +import org.springframework.security.web.FilterChainOrder; import org.springframework.util.Assert; /** diff --git a/web/src/main/java/org/springframework/security/ui/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java similarity index 94% rename from web/src/main/java/org/springframework/security/ui/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java index 5b17974481..28f6d197a0 100644 --- a/web/src/main/java/org/springframework/security/ui/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/AbstractPreAuthenticatedAuthenticationDetailsSource.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth.j2ee; +package org.springframework.security.web.authentication.preauth.j2ee; import java.util.Collection; import java.util.List; @@ -6,12 +6,12 @@ import java.util.Set; import org.apache.commons.logging.Log; 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.ui.AuthenticationDetailsSourceImpl; import org.springframework.util.Assert; /** @@ -47,7 +47,7 @@ public abstract class AbstractPreAuthenticatedAuthenticationDetailsSource extend * list of pre-authenticated Granted Authorities will be set based on the * roles for the current user. * - * @see org.springframework.security.ui.AuthenticationDetailsSource#buildDetails(Object) + * @see org.springframework.security.AuthenticationDetailsSource#buildDetails(Object) */ public Object buildDetails(Object context) { Object result = super.buildDetails(context); diff --git a/web/src/main/java/org/springframework/security/ui/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java similarity index 87% rename from web/src/main/java/org/springframework/security/ui/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java index 7207589d55..6cabc05c3a 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java @@ -1,6 +1,6 @@ -package org.springframework.security.ui.preauth.j2ee; +package org.springframework.security.web.authentication.preauth.j2ee; -import org.springframework.security.ui.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails; +import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails; import org.springframework.security.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper; import java.util.ArrayList; diff --git a/web/src/main/java/org/springframework/security/ui/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java similarity index 84% rename from web/src/main/java/org/springframework/security/ui/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java index 7a7d0e5572..7a2d231ef1 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java @@ -1,8 +1,8 @@ -package org.springframework.security.ui.preauth.j2ee; +package org.springframework.security.web.authentication.preauth.j2ee; import javax.servlet.http.HttpServletRequest; -import org.springframework.security.ui.preauth.AbstractPreAuthenticatedProcessingFilter; +import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter; /** * This AbstractPreAuthenticatedProcessingFilter implementation is based on the diff --git a/web/src/main/java/org/springframework/security/ui/preauth/j2ee/WebXmlMappableAttributesRetriever.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java similarity index 94% rename from web/src/main/java/org/springframework/security/ui/preauth/j2ee/WebXmlMappableAttributesRetriever.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java index 1fcb4afb25..86a16c7fd9 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/j2ee/WebXmlMappableAttributesRetriever.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth.j2ee; +package org.springframework.security.web.authentication.preauth.j2ee; import java.io.InputStream; diff --git a/web/src/main/java/org/springframework/security/ui/preauth/websphere/WASSecurityHelper.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WASSecurityHelper.java similarity index 99% rename from web/src/main/java/org/springframework/security/ui/preauth/websphere/WASSecurityHelper.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WASSecurityHelper.java index 343bda67f2..f2b8f1a61c 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/websphere/WASSecurityHelper.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WASSecurityHelper.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth.websphere; +package org.springframework.security.web.authentication.preauth.websphere; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java similarity index 96% rename from web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java index e218ae65c9..fb9c99e869 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java @@ -1,14 +1,14 @@ -package org.springframework.security.ui.preauth.websphere; +package org.springframework.security.web.authentication.preauth.websphere; import org.aopalliance.intercept.MethodInterceptor; 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.AuthenticationDetailsSource; import org.springframework.security.AuthenticationManager; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationToken; -import org.springframework.security.ui.AuthenticationDetailsSource; import org.springframework.util.Assert; /** diff --git a/web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java similarity index 90% rename from web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java index 57229addf1..531d53dd5e 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedAuthenticationDetailsSource.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth.websphere; +package org.springframework.security.web.authentication.preauth.websphere; import java.util.Arrays; import java.util.List; @@ -6,12 +6,12 @@ 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.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.ui.AuthenticationDetailsSourceImpl; -import org.springframework.security.ui.preauth.PreAuthenticatedGrantedAuthoritiesAuthenticationDetails; +import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesAuthenticationDetails; import org.springframework.util.Assert; /** @@ -50,7 +50,7 @@ public class WebSpherePreAuthenticatedAuthenticationDetailsSource extends Authen * list of pre-authenticated Granted Authorities will be set based on the * WebSphere groups for the current user. * - * @see org.springframework.security.ui.AuthenticationDetailsSource#buildDetails(Object) + * @see org.springframework.security.AuthenticationDetailsSource#buildDetails(Object) */ public Object buildDetails(Object context) { Object result = super.buildDetails(context); diff --git a/web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java similarity index 86% rename from web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java index 9b9857b9b7..db6d94ade2 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java @@ -1,8 +1,8 @@ -package org.springframework.security.ui.preauth.websphere; +package org.springframework.security.web.authentication.preauth.websphere; import javax.servlet.http.HttpServletRequest; -import org.springframework.security.ui.preauth.AbstractPreAuthenticatedProcessingFilter; +import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter; /** * This AbstractPreAuthenticatedProcessingFilter implementation is based on diff --git a/web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java similarity index 82% rename from web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java index 8f3cd425c3..bfb9857d2b 100755 --- a/web/src/main/java/org/springframework/security/ui/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java @@ -1,6 +1,6 @@ -package org.springframework.security.ui.preauth.websphere; +package org.springframework.security.web.authentication.preauth.websphere; -import org.springframework.security.ui.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails; +import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails; /** * This AuthenticationDetailsSource implementation, when configured with a MutableGrantedAuthoritiesContainer, diff --git a/web/src/main/java/org/springframework/security/ui/preauth/x509/SubjectDnX509PrincipalExtractor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/preauth/x509/SubjectDnX509PrincipalExtractor.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java index 0b2c82ef00..b52cdc3dfe 100644 --- a/web/src/main/java/org/springframework/security/ui/preauth/x509/SubjectDnX509PrincipalExtractor.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth.x509; +package org.springframework.security.web.authentication.preauth.x509; import org.springframework.security.BadCredentialsException; import org.springframework.security.SpringSecurityMessageSource; diff --git a/web/src/main/java/org/springframework/security/ui/preauth/x509/X509PreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PreAuthenticatedProcessingFilter.java similarity index 86% rename from web/src/main/java/org/springframework/security/ui/preauth/x509/X509PreAuthenticatedProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PreAuthenticatedProcessingFilter.java index 4324aba5cf..61d11d3b2f 100644 --- a/web/src/main/java/org/springframework/security/ui/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.ui.preauth.x509; +package org.springframework.security.web.authentication.preauth.x509; -import org.springframework.security.ui.preauth.AbstractPreAuthenticatedProcessingFilter; -import org.springframework.security.ui.FilterChainOrder; +import org.springframework.security.web.FilterChainOrder; +import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter; import javax.servlet.http.HttpServletRequest; import java.security.cert.X509Certificate; diff --git a/web/src/main/java/org/springframework/security/ui/preauth/x509/X509PrincipalExtractor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PrincipalExtractor.java similarity index 83% rename from web/src/main/java/org/springframework/security/ui/preauth/x509/X509PrincipalExtractor.java rename to web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PrincipalExtractor.java index ace868c01f..7eda4b9fb9 100644 --- a/web/src/main/java/org/springframework/security/ui/preauth/x509/X509PrincipalExtractor.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PrincipalExtractor.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth.x509; +package org.springframework.security.web.authentication.preauth.x509; import java.security.cert.X509Certificate; diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/AbstractRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/rememberme/AbstractRememberMeServices.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java index 6bdfd1e3ce..103b87f27c 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/AbstractRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; @@ -6,17 +6,17 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.support.MessageSourceAccessor; 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.rememberme.RememberMeAuthenticationToken; -import org.springframework.security.ui.AuthenticationDetailsSource; -import org.springframework.security.ui.WebAuthenticationDetailsSource; -import org.springframework.security.ui.logout.LogoutHandler; +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; import org.springframework.util.StringUtils; diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/CookieTheftException.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/CookieTheftException.java similarity index 75% rename from web/src/main/java/org/springframework/security/ui/rememberme/CookieTheftException.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/CookieTheftException.java index 643d896786..ee8cce4488 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/CookieTheftException.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/CookieTheftException.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; /** * @author Luke Taylor diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/InMemoryTokenRepositoryImpl.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java similarity index 96% rename from web/src/main/java/org/springframework/security/ui/rememberme/InMemoryTokenRepositoryImpl.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java index dc03299381..49eff9fcba 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/InMemoryTokenRepositoryImpl.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import org.springframework.dao.DataIntegrityViolationException; diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/InvalidCookieException.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InvalidCookieException.java similarity index 83% rename from web/src/main/java/org/springframework/security/ui/rememberme/InvalidCookieException.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/InvalidCookieException.java index 3440b9d796..122a4a1625 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/InvalidCookieException.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InvalidCookieException.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; /** * Exception thrown by a RememberMeServices implementation to indicate diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/JdbcTokenRepositoryImpl.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java similarity index 98% rename from web/src/main/java/org/springframework/security/ui/rememberme/JdbcTokenRepositoryImpl.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java index ce2bdd9d3d..ff9ad66c9b 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/JdbcTokenRepositoryImpl.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import org.springframework.dao.DataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/NullRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServices.java similarity index 95% rename from web/src/main/java/org/springframework/security/ui/rememberme/NullRememberMeServices.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServices.java index 1ad6232812..9fc1c58ff0 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/NullRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServices.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import org.springframework.security.Authentication; diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/PersistentRememberMeToken.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java similarity index 91% rename from web/src/main/java/org/springframework/security/ui/rememberme/PersistentRememberMeToken.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java index dd538adced..4ef77afd8c 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/PersistentRememberMeToken.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import java.util.Date; diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/PersistentTokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java similarity index 99% rename from web/src/main/java/org/springframework/security/ui/rememberme/PersistentTokenBasedRememberMeServices.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java index cac39da28b..771e00b55b 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/PersistentTokenBasedRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import java.security.SecureRandom; import java.util.Arrays; diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/PersistentTokenRepository.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenRepository.java similarity index 89% rename from web/src/main/java/org/springframework/security/ui/rememberme/PersistentTokenRepository.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenRepository.java index 4dbcca20f2..c5b76be042 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/PersistentTokenRepository.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenRepository.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import java.util.Date; diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/RememberMeAuthenticationException.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java similarity index 80% rename from web/src/main/java/org/springframework/security/ui/rememberme/RememberMeAuthenticationException.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java index 3a0b09286a..a2c94cb0ad 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/RememberMeAuthenticationException.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import org.springframework.security.AuthenticationException; diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilter.java similarity index 94% rename from web/src/main/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilter.java index 3f980aa6aa..060515e631 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilter.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import org.springframework.security.Authentication; 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.ui.FilterChainOrder; -import org.springframework.security.ui.SpringSecurityFilter; +import org.springframework.security.web.FilterChainOrder; +import org.springframework.security.web.SpringSecurityFilter; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; @@ -36,9 +36,9 @@ import java.io.IOException; /** * Detects if there is no Authentication object in the SecurityContext, and populates it - * with a remember-me authentication token if a {@link org.springframework.security.ui.rememberme.RememberMeServices} + * with a remember-me authentication token if a {@link org.springframework.security.web.authentication.rememberme.RememberMeServices} * implementation so requests.

    Concrete RememberMeServices implementations will have their {@link - * org.springframework.security.ui.rememberme.RememberMeServices#autoLogin(HttpServletRequest, HttpServletResponse)} method + * org.springframework.security.web.authentication.rememberme.RememberMeServices#autoLogin(HttpServletRequest, HttpServletResponse)} method * called by this filter. The Authentication or null returned by that method will be placed * into the SecurityContext. The AuthenticationManager will be used, so that any concurrent * session management or other authentication-specific behaviour can be achieved. This is the same pattern as with diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/RememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeServices.java similarity index 94% rename from web/src/main/java/org/springframework/security/ui/rememberme/RememberMeServices.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeServices.java index 75cfbe8792..0f666ef782 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/RememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeServices.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import org.springframework.security.Authentication; @@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletResponse; * Implement by a class that is capable of providing a remember-me service. * *

    - * Spring Security filters (namely {@link org.springframework.security.ui.AbstractProcessingFilter} and - * {@link org.springframework.security.ui.rememberme.RememberMeProcessingFilter} will call + * Spring Security filters (namely {@link org.springframework.security.web.authentication.AbstractProcessingFilter} and + * {@link org.springframework.security.web.authentication.rememberme.RememberMeProcessingFilter} will call * the methods provided by an implementation of this interface. *

    * Implementations may implement any type of remember-me capability they wish. @@ -57,7 +57,7 @@ public interface RememberMeServices { * The returned Authentication must be acceptable to * {@link org.springframework.security.AuthenticationManager} or * {@link org.springframework.security.providers.AuthenticationProvider} defined by the web application. - * It is recommended {@link org.springframework.security.providers.rememberme.RememberMeAuthenticationToken} be + * It is recommended {@link org.springframework.security.providers.RememberMeAuthenticationToken} be * used in most cases, as it has a corresponding authentication provider. * * @param request to look for a remember-me token within diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java similarity index 99% rename from web/src/main/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServices.java rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java index 42d295bf05..b04e0fb754 100644 --- a/web/src/main/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import org.springframework.security.Authentication; import org.springframework.security.userdetails.UserDetails; diff --git a/web/src/main/java/org/springframework/security/ui/rememberme/package.html b/web/src/main/java/org/springframework/security/web/authentication/rememberme/package.html similarity index 100% rename from web/src/main/java/org/springframework/security/ui/rememberme/package.html rename to web/src/main/java/org/springframework/security/web/authentication/rememberme/package.html diff --git a/web/src/main/java/org/springframework/security/ui/switchuser/SwitchUserAuthorityChanger.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java similarity index 94% rename from web/src/main/java/org/springframework/security/ui/switchuser/SwitchUserAuthorityChanger.java rename to web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java index 7038f82734..6a69dccc09 100644 --- a/web/src/main/java/org/springframework/security/ui/switchuser/SwitchUserAuthorityChanger.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.switchuser; +package org.springframework.security.web.authentication.switchuser; import java.util.List; diff --git a/web/src/main/java/org/springframework/security/ui/switchuser/SwitchUserGrantedAuthority.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java similarity index 88% rename from web/src/main/java/org/springframework/security/ui/switchuser/SwitchUserGrantedAuthority.java rename to web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java index d859b0243e..12fd7dcfad 100644 --- a/web/src/main/java/org/springframework/security/ui/switchuser/SwitchUserGrantedAuthority.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java @@ -13,20 +13,20 @@ * limitations under the License. */ -package org.springframework.security.ui.switchuser; +package org.springframework.security.web.authentication.switchuser; import org.springframework.security.Authentication; import org.springframework.security.GrantedAuthorityImpl; /** - * Custom GrantedAuthority used by {@link org.springframework.security.ui.switchuser.SwitchUserProcessingFilter}

    Stores + * Custom GrantedAuthority used by {@link org.springframework.security.web.authentication.switchuser.SwitchUserProcessingFilter}

    Stores * the Authentication object of the original user to be used later when 'exiting' from a user switch.

    * * @author Mark St.Godard * @version $Id$ * - * @see org.springframework.security.ui.switchuser.SwitchUserProcessingFilter + * @see org.springframework.security.web.authentication.switchuser.SwitchUserProcessingFilter */ public class SwitchUserGrantedAuthority extends GrantedAuthorityImpl { //~ Instance fields ================================================================================================ diff --git a/web/src/main/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java similarity index 95% rename from web/src/main/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java index b51b1577a2..d795cbf888 100644 --- a/web/src/main/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.switchuser; +package org.springframework.security.web.authentication.switchuser; import java.io.IOException; import java.util.ArrayList; @@ -34,6 +34,7 @@ import org.springframework.context.support.MessageSourceAccessor; import org.springframework.security.AccountExpiredException; import org.springframework.security.Authentication; import org.springframework.security.AuthenticationCredentialsNotFoundException; +import org.springframework.security.AuthenticationDetailsSource; import org.springframework.security.AuthenticationException; import org.springframework.security.CredentialsExpiredException; import org.springframework.security.DisabledException; @@ -43,19 +44,18 @@ import org.springframework.security.SpringSecurityMessageSource; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.event.authentication.AuthenticationSwitchUserEvent; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.ui.AuthenticationDetailsSource; -import org.springframework.security.ui.AuthenticationFailureHandler; -import org.springframework.security.ui.AuthenticationSuccessHandler; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.SimpleUrlAuthenticationFailureHandler; -import org.springframework.security.ui.SimpleUrlAuthenticationSuccessHandler; -import org.springframework.security.ui.SpringSecurityFilter; -import org.springframework.security.ui.WebAuthenticationDetailsSource; 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.UrlUtils; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -77,7 +77,7 @@ import org.springframework.util.StringUtils; *

    * On a successful switch, the user's SecurityContextHolder will be updated to reflect the * specified user and will also contain an additional - * {@link org.springframework.security.ui.switchuser.SwitchUserGrantedAuthority} which contains the original user. + * {@link org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority} which contains the original user. *

    * To 'exit' from a user context, the user will then need to access a URL (see exitUserUrl) that * will switch back to the original user as identified by the ROLE_PREVIOUS_ADMINISTRATOR. @@ -97,7 +97,7 @@ import org.springframework.util.StringUtils; * @author Mark St.Godard * @version $Id$ * - * @see org.springframework.security.ui.switchuser.SwitchUserGrantedAuthority + * @see org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority */ public class SwitchUserProcessingFilter extends SpringSecurityFilter implements InitializingBean, ApplicationEventPublisherAware, MessageSourceAware { diff --git a/web/src/main/java/org/springframework/security/ui/switchuser/package.html b/web/src/main/java/org/springframework/security/web/authentication/switchuser/package.html similarity index 100% rename from web/src/main/java/org/springframework/security/ui/switchuser/package.html rename to web/src/main/java/org/springframework/security/web/authentication/switchuser/package.html diff --git a/web/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/BasicProcessingFilter.java similarity index 93% rename from web/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/www/BasicProcessingFilter.java index 64c1a52b71..33d2606d0d 100644 --- a/web/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/BasicProcessingFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.basicauth; +package org.springframework.security.web.authentication.www; import java.io.IOException; @@ -25,18 +25,18 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Base64; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.Authentication; +import org.springframework.security.AuthenticationDetailsSource; import org.springframework.security.AuthenticationException; import org.springframework.security.AuthenticationManager; import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.providers.AnonymousAuthenticationToken; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; -import org.springframework.security.ui.AuthenticationDetailsSource; -import org.springframework.security.ui.WebAuthenticationDetailsSource; -import org.springframework.security.ui.AuthenticationEntryPoint; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.SpringSecurityFilter; -import org.springframework.security.ui.rememberme.NullRememberMeServices; -import org.springframework.security.ui.rememberme.RememberMeServices; +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.util.Assert; @@ -76,7 +76,7 @@ import org.springframework.util.Assert; * Basic authentication is an attractive protocol because it is simple and widely deployed. However, it still * transmits a password in clear text and as such is undesirable in many situations. Digest authentication is also * provided by Spring Security and should be used instead of Basic authentication wherever possible. See {@link - * org.springframework.security.ui.digestauth.DigestProcessingFilter}. + * org.springframework.security.web.authentication.www.DigestProcessingFilter}. *

    * Note that if a {@link RememberMeServices} is set, this filter will automatically send back remember-me * details to the client. Therefore, subsequent requests will not need to present a BASIC authentication header as diff --git a/web/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/www/BasicProcessingFilterEntryPoint.java similarity index 95% rename from web/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPoint.java rename to web/src/main/java/org/springframework/security/web/authentication/www/BasicProcessingFilterEntryPoint.java index 3eac4cc6c3..46516540b3 100644 --- a/web/src/main/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/BasicProcessingFilterEntryPoint.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.basicauth; +package org.springframework.security.web.authentication.www; import java.io.IOException; @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.security.AuthenticationException; -import org.springframework.security.ui.AuthenticationEntryPoint; +import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java index 8fad3ed660..f015bc3e7f 100644 --- a/web/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.digestauth; +package org.springframework.security.web.authentication.www; import java.io.IOException; import java.util.Map; @@ -32,22 +32,22 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.context.MessageSource; import org.springframework.context.MessageSourceAware; import org.springframework.context.support.MessageSourceAccessor; +import org.springframework.security.AuthenticationDetailsSource; import org.springframework.security.AuthenticationException; import org.springframework.security.AuthenticationServiceException; import org.springframework.security.BadCredentialsException; import org.springframework.security.SpringSecurityMessageSource; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.dao.UserCache; -import org.springframework.security.providers.dao.cache.NullUserCache; -import org.springframework.security.ui.AuthenticationDetailsSource; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.SpringSecurityFilter; -import org.springframework.security.ui.WebAuthenticationDetailsSource; +import org.springframework.security.userdetails.UserCache; import org.springframework.security.userdetails.UserDetails; 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.util.Assert; import org.springframework.util.StringUtils; @@ -70,7 +70,7 @@ import org.springframework.util.StringUtils; * If authentication is successful, the resulting {@link org.springframework.security.Authentication Authentication} * object will be placed into the SecurityContextHolder. *

    - * If authentication fails, an {@link org.springframework.security.ui.AuthenticationEntryPoint AuthenticationEntryPoint} + * If authentication fails, an {@link org.springframework.security.web.AuthenticationEntryPoint AuthenticationEntryPoint} * implementation is called. This must always be {@link DigestProcessingFilterEntryPoint}, which will prompt the user * to authenticate again via Digest authentication. *

    diff --git a/web/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilterEntryPoint.java similarity index 97% rename from web/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPoint.java rename to web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilterEntryPoint.java index 87af141805..c39a642e97 100644 --- a/web/src/main/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestProcessingFilterEntryPoint.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.digestauth; +package org.springframework.security.web.authentication.www; import java.io.IOException; @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.security.AuthenticationException; -import org.springframework.security.ui.AuthenticationEntryPoint; +import org.springframework.security.web.AuthenticationEntryPoint; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.logging.Log; diff --git a/web/src/main/java/org/springframework/security/ui/digestauth/NonceExpiredException.java b/web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java similarity index 96% rename from web/src/main/java/org/springframework/security/ui/digestauth/NonceExpiredException.java rename to web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java index 63e7ea1846..4622962e71 100644 --- a/web/src/main/java/org/springframework/security/ui/digestauth/NonceExpiredException.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.digestauth; +package org.springframework.security.web.authentication.www; import org.springframework.security.AuthenticationException; diff --git a/web/src/main/java/org/springframework/security/concurrent/ConcurrentSessionFilter.java b/web/src/main/java/org/springframework/security/web/concurrent/ConcurrentSessionFilter.java similarity index 86% rename from web/src/main/java/org/springframework/security/concurrent/ConcurrentSessionFilter.java rename to web/src/main/java/org/springframework/security/web/concurrent/ConcurrentSessionFilter.java index 2c59536857..586a3dc41c 100644 --- a/web/src/main/java/org/springframework/security/concurrent/ConcurrentSessionFilter.java +++ b/web/src/main/java/org/springframework/security/web/concurrent/ConcurrentSessionFilter.java @@ -13,14 +13,16 @@ * limitations under the License. */ -package org.springframework.security.concurrent; +package org.springframework.security.web.concurrent; 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.ui.FilterChainOrder; -import org.springframework.security.ui.SpringSecurityFilter; -import org.springframework.security.ui.logout.LogoutHandler; -import org.springframework.security.ui.logout.SecurityContextLogoutHandler; +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.UrlUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; @@ -42,10 +44,10 @@ import java.io.IOException; * {@link org.springframework.security.concurrent.SessionInformation} from the SessionRegistry * for each request and checks if the session has been marked as expired. * If it has been marked as expired, the configured logout handlers will be called (as happens with - * {@link org.springframework.security.ui.logout.LogoutFilter}), typically to invalidate the session. + * {@link org.springframework.security.web.logout.LogoutFilter}), typically to invalidate the session. * A redirect to the expiredURL specified will be performed, and the session invalidation will cause an - * {@link org.springframework.security.ui.session.HttpSessionDestroyedEvent} to be published via the - * {@link org.springframework.security.ui.session.HttpSessionEventPublisher} registered in web.xml.

    + * {@link org.springframework.security.web.session.HttpSessionDestroyedEvent} to be published via the + * {@link org.springframework.security.web.session.HttpSessionEventPublisher} registered in web.xml.

    * * @author Ben Alex * @version $Id$ diff --git a/web/src/main/java/org/springframework/security/concurrent/SessionRegistryImpl.java b/web/src/main/java/org/springframework/security/web/concurrent/SessionRegistryImpl.java similarity index 93% rename from web/src/main/java/org/springframework/security/concurrent/SessionRegistryImpl.java rename to web/src/main/java/org/springframework/security/web/concurrent/SessionRegistryImpl.java index fb29f5a867..738082f84d 100644 --- a/web/src/main/java/org/springframework/security/concurrent/SessionRegistryImpl.java +++ b/web/src/main/java/org/springframework/security/web/concurrent/SessionRegistryImpl.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.concurrent; +package org.springframework.security.web.concurrent; import java.util.ArrayList; import java.util.Collections; @@ -30,16 +30,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; -import org.springframework.security.ui.session.HttpSessionDestroyedEvent; +import org.springframework.security.concurrent.SessionInformation; +import org.springframework.security.concurrent.SessionRegistry; +import org.springframework.security.web.session.HttpSessionDestroyedEvent; import org.springframework.util.Assert; /** * Base implementation of {@link org.springframework.security.concurrent.SessionRegistry} - * which also listens for {@link org.springframework.security.ui.session.HttpSessionDestroyedEvent}s + * which also listens for {@link org.springframework.security.web.session.HttpSessionDestroyedEvent}s * published in the Spring application context. * *

    - * NB: It is important that you register the {@link org.springframework.security.ui.session.HttpSessionEventPublisher} in + * NB: It is important that you register the {@link org.springframework.security.web.session.HttpSessionEventPublisher} in * web.xml so that this class is notified of sessions that expire. *

    * diff --git a/web/src/main/java/org/springframework/security/concurrent/package.html b/web/src/main/java/org/springframework/security/web/concurrent/package.html similarity index 100% rename from web/src/main/java/org/springframework/security/concurrent/package.html rename to web/src/main/java/org/springframework/security/web/concurrent/package.html diff --git a/web/src/main/java/org/springframework/security/context/web/HttpRequestResponseHolder.java b/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java similarity index 95% rename from web/src/main/java/org/springframework/security/context/web/HttpRequestResponseHolder.java rename to web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java index 4498d239d2..55e84eb4a9 100644 --- a/web/src/main/java/org/springframework/security/context/web/HttpRequestResponseHolder.java +++ b/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java @@ -1,4 +1,4 @@ -package org.springframework.security.context.web; +package org.springframework.security.web.context; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/web/src/main/java/org/springframework/security/context/web/HttpSessionContextIntegrationFilter.java b/web/src/main/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilter.java similarity index 98% rename from web/src/main/java/org/springframework/security/context/web/HttpSessionContextIntegrationFilter.java rename to web/src/main/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilter.java index 338bc74652..c36871fdc0 100644 --- a/web/src/main/java/org/springframework/security/context/web/HttpSessionContextIntegrationFilter.java +++ b/web/src/main/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.context.web; +package org.springframework.security.web.context; import javax.servlet.ServletException; @@ -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.ui.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/context/web/HttpSessionSecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java similarity index 99% rename from web/src/main/java/org/springframework/security/context/web/HttpSessionSecurityContextRepository.java rename to web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java index b2bea53417..d65e0d97af 100644 --- a/web/src/main/java/org/springframework/security/context/web/HttpSessionSecurityContextRepository.java +++ b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java @@ -1,4 +1,4 @@ -package org.springframework.security.context.web; +package org.springframework.security.web.context; import java.lang.reflect.Method; diff --git a/web/src/main/java/org/springframework/security/context/web/SaveContextOnUpdateOrErrorResponseWrapper.java b/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java similarity index 98% rename from web/src/main/java/org/springframework/security/context/web/SaveContextOnUpdateOrErrorResponseWrapper.java rename to web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java index 8031df1deb..76db8f2932 100644 --- a/web/src/main/java/org/springframework/security/context/web/SaveContextOnUpdateOrErrorResponseWrapper.java +++ b/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java @@ -1,4 +1,4 @@ -package org.springframework.security.context.web; +package org.springframework.security.web.context; import java.io.IOException; diff --git a/web/src/main/java/org/springframework/security/context/web/SecurityContextPersistenceFilter.java b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java similarity index 95% rename from web/src/main/java/org/springframework/security/context/web/SecurityContextPersistenceFilter.java rename to web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java index 8c74593710..fa742d6db0 100644 --- a/web/src/main/java/org/springframework/security/context/web/SecurityContextPersistenceFilter.java +++ b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java @@ -1,4 +1,4 @@ -package org.springframework.security.context.web; +package org.springframework.security.web.context; import java.io.IOException; @@ -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.ui.FilterChainOrder; -import org.springframework.security.ui.SpringSecurityFilter; +import org.springframework.security.web.FilterChainOrder; +import org.springframework.security.web.SpringSecurityFilter; /** * Populates the {@link SecurityContextHolder} with information obtained from diff --git a/web/src/main/java/org/springframework/security/context/web/SecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java similarity index 97% rename from web/src/main/java/org/springframework/security/context/web/SecurityContextRepository.java rename to web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java index fe8f19bdc4..877ea0bfbc 100644 --- a/web/src/main/java/org/springframework/security/context/web/SecurityContextRepository.java +++ b/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java @@ -1,4 +1,4 @@ -package org.springframework.security.context.web; +package org.springframework.security.web.context; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/web/src/main/java/org/springframework/security/expression/web/support/DefaultWebSecurityExpressionHandler.java b/web/src/main/java/org/springframework/security/web/expression/DefaultWebSecurityExpressionHandler.java similarity index 87% rename from web/src/main/java/org/springframework/security/expression/web/support/DefaultWebSecurityExpressionHandler.java rename to web/src/main/java/org/springframework/security/web/expression/DefaultWebSecurityExpressionHandler.java index 9fc11ccb3b..3a8463ea94 100644 --- a/web/src/main/java/org/springframework/security/expression/web/support/DefaultWebSecurityExpressionHandler.java +++ b/web/src/main/java/org/springframework/security/web/expression/DefaultWebSecurityExpressionHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.web.support; +package org.springframework.security.web.expression; import org.springframework.expression.EvaluationContext; import org.springframework.expression.ExpressionParser; @@ -8,8 +8,7 @@ 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.expression.web.WebSecurityExpressionHandler; -import org.springframework.security.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; /** * Facade which isolates Spring Security's requirements for evaluating web-security expressions diff --git a/web/src/main/java/org/springframework/security/expression/web/ExpressionBasedFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java similarity index 93% rename from web/src/main/java/org/springframework/security/expression/web/ExpressionBasedFilterInvocationSecurityMetadataSource.java rename to web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java index 830bc6f952..22f370d35a 100644 --- a/web/src/main/java/org/springframework/security/expression/web/ExpressionBasedFilterInvocationSecurityMetadataSource.java +++ b/web/src/main/java/org/springframework/security/web/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.web; +package org.springframework.security.web.expression; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -10,9 +10,9 @@ 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.intercept.web.DefaultFilterInvocationSecurityMetadataSource; -import org.springframework.security.intercept.web.RequestKey; import org.springframework.security.util.UrlMatcher; +import org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource; +import org.springframework.security.web.intercept.RequestKey; import org.springframework.util.Assert; /** diff --git a/web/src/main/java/org/springframework/security/expression/web/WebExpressionConfigAttribute.java b/web/src/main/java/org/springframework/security/web/expression/WebExpressionConfigAttribute.java similarity index 93% rename from web/src/main/java/org/springframework/security/expression/web/WebExpressionConfigAttribute.java rename to web/src/main/java/org/springframework/security/web/expression/WebExpressionConfigAttribute.java index 803dc94e67..89b0710252 100644 --- a/web/src/main/java/org/springframework/security/expression/web/WebExpressionConfigAttribute.java +++ b/web/src/main/java/org/springframework/security/web/expression/WebExpressionConfigAttribute.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.web; +package org.springframework.security.web.expression; import org.springframework.expression.Expression; import org.springframework.security.ConfigAttribute; diff --git a/web/src/main/java/org/springframework/security/expression/web/WebExpressionVoter.java b/web/src/main/java/org/springframework/security/web/expression/WebExpressionVoter.java similarity index 83% rename from web/src/main/java/org/springframework/security/expression/web/WebExpressionVoter.java rename to web/src/main/java/org/springframework/security/web/expression/WebExpressionVoter.java index b362d2a83b..89b3dcdfd4 100644 --- a/web/src/main/java/org/springframework/security/expression/web/WebExpressionVoter.java +++ b/web/src/main/java/org/springframework/security/web/expression/WebExpressionVoter.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.web; +package org.springframework.security.web.expression; import java.util.List; @@ -6,11 +6,8 @@ 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.expression.MethodSecurityExpressionHandler; -import org.springframework.security.expression.support.DefaultMethodSecurityExpressionHandler; -import org.springframework.security.expression.web.support.DefaultWebSecurityExpressionHandler; -import org.springframework.security.intercept.web.FilterInvocation; import org.springframework.security.vote.AccessDecisionVoter; +import org.springframework.security.web.intercept.FilterInvocation; /** * Voter which handles web authorisation decisions. diff --git a/web/src/main/java/org/springframework/security/expression/web/WebSecurityExpressionHandler.java b/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionHandler.java similarity index 83% rename from web/src/main/java/org/springframework/security/expression/web/WebSecurityExpressionHandler.java rename to web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionHandler.java index 32ad39ef5d..44222a9ecb 100644 --- a/web/src/main/java/org/springframework/security/expression/web/WebSecurityExpressionHandler.java +++ b/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionHandler.java @@ -1,9 +1,9 @@ -package org.springframework.security.expression.web; +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.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; public interface WebSecurityExpressionHandler { /** diff --git a/web/src/main/java/org/springframework/security/expression/web/support/WebSecurityExpressionRoot.java b/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionRoot.java similarity index 95% rename from web/src/main/java/org/springframework/security/expression/web/support/WebSecurityExpressionRoot.java rename to web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionRoot.java index bba8d573e5..ff5ea2c8bd 100644 --- a/web/src/main/java/org/springframework/security/expression/web/support/WebSecurityExpressionRoot.java +++ b/web/src/main/java/org/springframework/security/web/expression/WebSecurityExpressionRoot.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.web.support; +package org.springframework.security.web.expression; import java.net.InetAddress; import java.net.UnknownHostException; @@ -6,7 +6,7 @@ import java.util.Arrays; import org.springframework.security.Authentication; import org.springframework.security.expression.support.SecurityExpressionRoot; -import org.springframework.security.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; import org.springframework.util.StringUtils; /** diff --git a/web/src/main/java/org/springframework/security/intercept/web/DefaultFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java similarity index 99% rename from web/src/main/java/org/springframework/security/intercept/web/DefaultFilterInvocationSecurityMetadataSource.java rename to web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java index 3b42771fad..26ed23e186 100644 --- a/web/src/main/java/org/springframework/security/intercept/web/DefaultFilterInvocationSecurityMetadataSource.java +++ b/web/src/main/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSource.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.web; +package org.springframework.security.web.intercept; import java.util.Arrays; import java.util.Collection; diff --git a/web/src/main/java/org/springframework/security/intercept/web/FilterInvocation.java b/web/src/main/java/org/springframework/security/web/intercept/FilterInvocation.java similarity index 96% rename from web/src/main/java/org/springframework/security/intercept/web/FilterInvocation.java rename to web/src/main/java/org/springframework/security/web/intercept/FilterInvocation.java index 3e8151a286..c93be6e7be 100644 --- a/web/src/main/java/org/springframework/security/intercept/web/FilterInvocation.java +++ b/web/src/main/java/org/springframework/security/web/intercept/FilterInvocation.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.web; +package org.springframework.security.web.intercept; import org.springframework.security.web.util.UrlUtils; @@ -65,7 +65,7 @@ public class FilterInvocation { * Indicates the URL that the user agent used for this request. *

    * The returned URL does not reflect the port number determined from a - * {@link org.springframework.security.web.util.PortResolver}. + * {@link org.springframework.security.web.PortResolver}. * * @return the full URL of this request */ diff --git a/web/src/main/java/org/springframework/security/intercept/web/FilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/intercept/FilterInvocationSecurityMetadataSource.java similarity index 94% rename from web/src/main/java/org/springframework/security/intercept/web/FilterInvocationSecurityMetadataSource.java rename to web/src/main/java/org/springframework/security/web/intercept/FilterInvocationSecurityMetadataSource.java index d264861b15..30edaa2f94 100644 --- a/web/src/main/java/org/springframework/security/intercept/web/FilterInvocationSecurityMetadataSource.java +++ b/web/src/main/java/org/springframework/security/web/intercept/FilterInvocationSecurityMetadataSource.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.web; +package org.springframework.security.web.intercept; import org.springframework.security.intercept.SecurityMetadataSource; diff --git a/web/src/main/java/org/springframework/security/intercept/web/FilterSecurityInterceptor.java b/web/src/main/java/org/springframework/security/web/intercept/FilterSecurityInterceptor.java similarity index 98% rename from web/src/main/java/org/springframework/security/intercept/web/FilterSecurityInterceptor.java rename to web/src/main/java/org/springframework/security/web/intercept/FilterSecurityInterceptor.java index 536fdf3d2e..769f0de972 100644 --- a/web/src/main/java/org/springframework/security/intercept/web/FilterSecurityInterceptor.java +++ b/web/src/main/java/org/springframework/security/web/intercept/FilterSecurityInterceptor.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package org.springframework.security.intercept.web; +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.ui.FilterChainOrder; +import org.springframework.security.web.FilterChainOrder; import org.springframework.core.Ordered; import java.io.IOException; diff --git a/web/src/main/java/org/springframework/security/intercept/web/RequestKey.java b/web/src/main/java/org/springframework/security/web/intercept/RequestKey.java similarity index 96% rename from web/src/main/java/org/springframework/security/intercept/web/RequestKey.java rename to web/src/main/java/org/springframework/security/web/intercept/RequestKey.java index 56ed979644..d1b9d1fcd5 100644 --- a/web/src/main/java/org/springframework/security/intercept/web/RequestKey.java +++ b/web/src/main/java/org/springframework/security/web/intercept/RequestKey.java @@ -1,4 +1,4 @@ -package org.springframework.security.intercept.web; +package org.springframework.security.web.intercept; /** * @author Luke Taylor diff --git a/web/src/main/java/org/springframework/security/intercept/web/WebInvocationPrivilegeEvaluator.java b/web/src/main/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluator.java similarity index 98% rename from web/src/main/java/org/springframework/security/intercept/web/WebInvocationPrivilegeEvaluator.java rename to web/src/main/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluator.java index 84fcffab26..7bb98038d1 100644 --- a/web/src/main/java/org/springframework/security/intercept/web/WebInvocationPrivilegeEvaluator.java +++ b/web/src/main/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluator.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.web; +package org.springframework.security.web.intercept; import java.util.List; diff --git a/web/src/main/java/org/springframework/security/intercept/web/package.html b/web/src/main/java/org/springframework/security/web/intercept/package.html similarity index 100% rename from web/src/main/java/org/springframework/security/intercept/web/package.html rename to web/src/main/java/org/springframework/security/web/intercept/package.html diff --git a/web/src/main/java/org/springframework/security/ui/logout/LogoutFilter.java b/web/src/main/java/org/springframework/security/web/logout/LogoutFilter.java similarity index 93% rename from web/src/main/java/org/springframework/security/ui/logout/LogoutFilter.java rename to web/src/main/java/org/springframework/security/web/logout/LogoutFilter.java index c380743aa3..573e8386f5 100644 --- a/web/src/main/java/org/springframework/security/ui/logout/LogoutFilter.java +++ b/web/src/main/java/org/springframework/security/web/logout/LogoutFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.logout; +package org.springframework.security.web.logout; import java.io.IOException; import java.util.Arrays; @@ -26,9 +26,8 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.security.Authentication; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.LogoutSuccessHandler; -import org.springframework.security.ui.SpringSecurityFilter; +import org.springframework.security.web.FilterChainOrder; +import org.springframework.security.web.SpringSecurityFilter; 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/ui/logout/LogoutHandler.java b/web/src/main/java/org/springframework/security/web/logout/LogoutHandler.java similarity index 93% rename from web/src/main/java/org/springframework/security/ui/logout/LogoutHandler.java rename to web/src/main/java/org/springframework/security/web/logout/LogoutHandler.java index c799039078..90c8f785d3 100644 --- a/web/src/main/java/org/springframework/security/ui/logout/LogoutHandler.java +++ b/web/src/main/java/org/springframework/security/web/logout/LogoutHandler.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.logout; +package org.springframework.security.web.logout; import org.springframework.security.Authentication; diff --git a/web/src/main/java/org/springframework/security/ui/LogoutSuccessHandler.java b/web/src/main/java/org/springframework/security/web/logout/LogoutSuccessHandler.java similarity index 89% rename from web/src/main/java/org/springframework/security/ui/LogoutSuccessHandler.java rename to web/src/main/java/org/springframework/security/web/logout/LogoutSuccessHandler.java index 6a6420bb6f..3dac249ad3 100644 --- a/web/src/main/java/org/springframework/security/ui/LogoutSuccessHandler.java +++ b/web/src/main/java/org/springframework/security/web/logout/LogoutSuccessHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web.logout; import java.io.IOException; @@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.security.Authentication; -import org.springframework.security.ui.logout.LogoutFilter; /** * Strategy that is called after a successful logout by the {@link LogoutFilter}, to handle redirection or diff --git a/web/src/main/java/org/springframework/security/ui/logout/SecurityContextLogoutHandler.java b/web/src/main/java/org/springframework/security/web/logout/SecurityContextLogoutHandler.java similarity index 95% rename from web/src/main/java/org/springframework/security/ui/logout/SecurityContextLogoutHandler.java rename to web/src/main/java/org/springframework/security/web/logout/SecurityContextLogoutHandler.java index 4a3fade47d..5d060843e5 100644 --- a/web/src/main/java/org/springframework/security/ui/logout/SecurityContextLogoutHandler.java +++ b/web/src/main/java/org/springframework/security/web/logout/SecurityContextLogoutHandler.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.logout; +package org.springframework.security.web.logout; import org.springframework.security.Authentication; diff --git a/web/src/main/java/org/springframework/security/ui/logout/SimpleUrlLogoutSuccessHandler.java b/web/src/main/java/org/springframework/security/web/logout/SimpleUrlLogoutSuccessHandler.java similarity index 80% rename from web/src/main/java/org/springframework/security/ui/logout/SimpleUrlLogoutSuccessHandler.java rename to web/src/main/java/org/springframework/security/web/logout/SimpleUrlLogoutSuccessHandler.java index 22da713e35..a605981d0b 100644 --- a/web/src/main/java/org/springframework/security/ui/logout/SimpleUrlLogoutSuccessHandler.java +++ b/web/src/main/java/org/springframework/security/web/logout/SimpleUrlLogoutSuccessHandler.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.logout; +package org.springframework.security.web.logout; import java.io.IOException; @@ -7,8 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.security.Authentication; -import org.springframework.security.ui.AbstractAuthenticationTargetUrlRequestHandler; -import org.springframework.security.ui.LogoutSuccessHandler; +import org.springframework.security.web.AbstractAuthenticationTargetUrlRequestHandler; /** * Handles the navigation on logout by delegating to the {@link AbstractAuthenticationTargetUrlRequestHandler} diff --git a/web/src/main/java/org/springframework/security/ui/savedrequest/Enumerator.java b/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java similarity index 95% rename from web/src/main/java/org/springframework/security/ui/savedrequest/Enumerator.java rename to web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java index 71ee6030be..98bd7dd527 100644 --- a/web/src/main/java/org/springframework/security/ui/savedrequest/Enumerator.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.savedrequest; +package org.springframework.security.web.savedrequest; import java.util.ArrayList; import java.util.Collection; diff --git a/web/src/main/java/org/springframework/security/ui/savedrequest/FastHttpDateFormat.java b/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java similarity index 96% rename from web/src/main/java/org/springframework/security/ui/savedrequest/FastHttpDateFormat.java rename to web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java index c98b7a596f..4938ac31d9 100644 --- a/web/src/main/java/org/springframework/security/ui/savedrequest/FastHttpDateFormat.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.savedrequest; +package org.springframework.security.web.savedrequest; import java.text.DateFormat; import java.text.ParseException; diff --git a/web/src/main/java/org/springframework/security/ui/savedrequest/SavedCookie.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java similarity index 93% rename from web/src/main/java/org/springframework/security/ui/savedrequest/SavedCookie.java rename to web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java index 1362b5d338..514af563ec 100644 --- a/web/src/main/java/org/springframework/security/ui/savedrequest/SavedCookie.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.savedrequest; +package org.springframework.security.web.savedrequest; import javax.servlet.http.Cookie; import java.io.Serializable; diff --git a/web/src/main/java/org/springframework/security/ui/savedrequest/SavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java similarity index 94% rename from web/src/main/java/org/springframework/security/ui/savedrequest/SavedRequest.java rename to web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java index 0ab3acb467..992670162e 100644 --- a/web/src/main/java/org/springframework/security/ui/savedrequest/SavedRequest.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package org.springframework.security.ui.savedrequest; +package org.springframework.security.web.savedrequest; -import org.springframework.security.web.util.PortResolver; +import org.springframework.security.web.PortResolver; import org.springframework.security.web.util.UrlUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,9 +35,9 @@ import java.util.TreeMap; /** * Represents central information from a HttpServletRequest.

    This class is used by {@link - * org.springframework.security.ui.AbstractProcessingFilter} and {@link org.springframework.security.wrapper.SavedRequestAwareWrapper} to + * org.springframework.security.web.authentication.AbstractProcessingFilter} and {@link org.springframework.security.web.wrapper.SavedRequestAwareWrapper} to * reproduce the request after successful authentication. An instance of this class is stored at the time of an - * authentication exception by {@link org.springframework.security.ui.ExceptionTranslationFilter}.

    + * authentication exception by {@link org.springframework.security.web.ExceptionTranslationFilter}.

    *

    IMPLEMENTATION NOTE: It is assumed that this object is accessed only from the context of a single * thread, so no synchronization around internal collection classes is performed.

    *

    This class is based on code in Apache Tomcat.

    diff --git a/web/src/main/java/org/springframework/security/ui/savedrequest/package.html b/web/src/main/java/org/springframework/security/web/savedrequest/package.html similarity index 100% rename from web/src/main/java/org/springframework/security/ui/savedrequest/package.html rename to web/src/main/java/org/springframework/security/web/savedrequest/package.html diff --git a/web/src/main/java/org/springframework/security/securechannel/AbstractRetryEntryPoint.java b/web/src/main/java/org/springframework/security/web/securechannel/AbstractRetryEntryPoint.java similarity index 91% rename from web/src/main/java/org/springframework/security/securechannel/AbstractRetryEntryPoint.java rename to web/src/main/java/org/springframework/security/web/securechannel/AbstractRetryEntryPoint.java index 33f054b272..13f49d7125 100644 --- a/web/src/main/java/org/springframework/security/securechannel/AbstractRetryEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/securechannel/AbstractRetryEntryPoint.java @@ -1,9 +1,9 @@ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; -import org.springframework.security.web.util.PortMapper; -import org.springframework.security.web.util.PortMapperImpl; -import org.springframework.security.web.util.PortResolver; -import org.springframework.security.web.util.PortResolverImpl; +import org.springframework.security.web.PortMapper; +import org.springframework.security.web.PortMapperImpl; +import org.springframework.security.web.PortResolver; +import org.springframework.security.web.PortResolverImpl; import org.springframework.util.Assert; import org.apache.commons.logging.Log; diff --git a/web/src/main/java/org/springframework/security/securechannel/ChannelDecisionManager.java b/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManager.java similarity index 94% rename from web/src/main/java/org/springframework/security/securechannel/ChannelDecisionManager.java rename to web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManager.java index 1ccd17081a..f2408736e8 100644 --- a/web/src/main/java/org/springframework/security/securechannel/ChannelDecisionManager.java +++ b/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManager.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import org.springframework.security.ConfigAttribute; -import org.springframework.security.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; import java.io.IOException; import java.util.List; diff --git a/web/src/main/java/org/springframework/security/securechannel/ChannelDecisionManagerImpl.java b/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImpl.java similarity index 97% rename from web/src/main/java/org/springframework/security/securechannel/ChannelDecisionManagerImpl.java rename to web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImpl.java index c4f2153cd5..23826451b8 100644 --- a/web/src/main/java/org/springframework/security/securechannel/ChannelDecisionManagerImpl.java +++ b/web/src/main/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImpl.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import org.springframework.security.ConfigAttribute; -import org.springframework.security.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/securechannel/ChannelEntryPoint.java b/web/src/main/java/org/springframework/security/web/securechannel/ChannelEntryPoint.java similarity index 97% rename from web/src/main/java/org/springframework/security/securechannel/ChannelEntryPoint.java rename to web/src/main/java/org/springframework/security/web/securechannel/ChannelEntryPoint.java index 9ee0de7b0e..e349116db7 100644 --- a/web/src/main/java/org/springframework/security/securechannel/ChannelEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/securechannel/ChannelEntryPoint.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import java.io.IOException; diff --git a/web/src/main/java/org/springframework/security/securechannel/ChannelProcessingFilter.java b/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessingFilter.java similarity index 94% rename from web/src/main/java/org/springframework/security/securechannel/ChannelProcessingFilter.java rename to web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessingFilter.java index cf85c1ddde..e610e4046b 100644 --- a/web/src/main/java/org/springframework/security/securechannel/ChannelProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessingFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import java.io.IOException; import java.util.Collection; @@ -28,10 +28,10 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.ConfigAttribute; -import org.springframework.security.intercept.web.FilterInvocation; -import org.springframework.security.intercept.web.FilterInvocationSecurityMetadataSource; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.SpringSecurityFilter; +import org.springframework.security.web.FilterChainOrder; +import org.springframework.security.web.SpringSecurityFilter; +import org.springframework.security.web.intercept.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocationSecurityMetadataSource; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/securechannel/ChannelProcessor.java b/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessor.java similarity index 94% rename from web/src/main/java/org/springframework/security/securechannel/ChannelProcessor.java rename to web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessor.java index 808786682e..30e686d9cf 100644 --- a/web/src/main/java/org/springframework/security/securechannel/ChannelProcessor.java +++ b/web/src/main/java/org/springframework/security/web/securechannel/ChannelProcessor.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import org.springframework.security.ConfigAttribute; -import org.springframework.security.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; import java.io.IOException; import java.util.List; diff --git a/web/src/main/java/org/springframework/security/securechannel/InsecureChannelProcessor.java b/web/src/main/java/org/springframework/security/web/securechannel/InsecureChannelProcessor.java similarity index 96% rename from web/src/main/java/org/springframework/security/securechannel/InsecureChannelProcessor.java rename to web/src/main/java/org/springframework/security/web/securechannel/InsecureChannelProcessor.java index bf93170c36..0e97c4ee37 100644 --- a/web/src/main/java/org/springframework/security/securechannel/InsecureChannelProcessor.java +++ b/web/src/main/java/org/springframework/security/web/securechannel/InsecureChannelProcessor.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import java.io.IOException; import java.util.List; @@ -22,7 +22,7 @@ import javax.servlet.ServletException; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.ConfigAttribute; -import org.springframework.security.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/securechannel/RetryWithHttpEntryPoint.java b/web/src/main/java/org/springframework/security/web/securechannel/RetryWithHttpEntryPoint.java similarity index 95% rename from web/src/main/java/org/springframework/security/securechannel/RetryWithHttpEntryPoint.java rename to web/src/main/java/org/springframework/security/web/securechannel/RetryWithHttpEntryPoint.java index 5c49ba194c..032788dee8 100644 --- a/web/src/main/java/org/springframework/security/securechannel/RetryWithHttpEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/securechannel/RetryWithHttpEntryPoint.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; /** diff --git a/web/src/main/java/org/springframework/security/securechannel/RetryWithHttpsEntryPoint.java b/web/src/main/java/org/springframework/security/web/securechannel/RetryWithHttpsEntryPoint.java similarity index 95% rename from web/src/main/java/org/springframework/security/securechannel/RetryWithHttpsEntryPoint.java rename to web/src/main/java/org/springframework/security/web/securechannel/RetryWithHttpsEntryPoint.java index e96cdbba51..40fe3fdbcf 100644 --- a/web/src/main/java/org/springframework/security/securechannel/RetryWithHttpsEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/securechannel/RetryWithHttpsEntryPoint.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; /** * Commences a secure channel by retrying the original request using HTTPS. diff --git a/web/src/main/java/org/springframework/security/securechannel/SecureChannelProcessor.java b/web/src/main/java/org/springframework/security/web/securechannel/SecureChannelProcessor.java similarity index 96% rename from web/src/main/java/org/springframework/security/securechannel/SecureChannelProcessor.java rename to web/src/main/java/org/springframework/security/web/securechannel/SecureChannelProcessor.java index 19b58dc600..38d337a342 100644 --- a/web/src/main/java/org/springframework/security/securechannel/SecureChannelProcessor.java +++ b/web/src/main/java/org/springframework/security/web/securechannel/SecureChannelProcessor.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import java.io.IOException; import java.util.List; @@ -22,7 +22,7 @@ import javax.servlet.ServletException; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.ConfigAttribute; -import org.springframework.security.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/securechannel/package.html b/web/src/main/java/org/springframework/security/web/securechannel/package.html similarity index 100% rename from web/src/main/java/org/springframework/security/securechannel/package.html rename to web/src/main/java/org/springframework/security/web/securechannel/package.html diff --git a/web/src/main/java/org/springframework/security/ui/session/HttpSessionCreatedEvent.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java similarity index 96% rename from web/src/main/java/org/springframework/security/ui/session/HttpSessionCreatedEvent.java rename to web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java index c62e0d07bf..de5c8e7557 100644 --- a/web/src/main/java/org/springframework/security/ui/session/HttpSessionCreatedEvent.java +++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.session; +package org.springframework.security.web.session; import javax.servlet.http.HttpSession; diff --git a/web/src/main/java/org/springframework/security/ui/session/HttpSessionDestroyedEvent.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java similarity index 93% rename from web/src/main/java/org/springframework/security/ui/session/HttpSessionDestroyedEvent.java rename to web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java index dbb0c9578a..3533555f86 100644 --- a/web/src/main/java/org/springframework/security/ui/session/HttpSessionDestroyedEvent.java +++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.springframework.security.ui.session; +package org.springframework.security.web.session; import javax.servlet.http.HttpSession; import org.springframework.security.context.SecurityContext; -import org.springframework.security.context.web.HttpSessionSecurityContextRepository; import org.springframework.security.event.SessionDestroyedEvent; +import org.springframework.security.web.context.HttpSessionSecurityContextRepository; /** diff --git a/web/src/main/java/org/springframework/security/ui/session/HttpSessionEventPublisher.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java similarity index 98% rename from web/src/main/java/org/springframework/security/ui/session/HttpSessionEventPublisher.java rename to web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java index 86db367364..5f7dc2877a 100644 --- a/web/src/main/java/org/springframework/security/ui/session/HttpSessionEventPublisher.java +++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.session; +package org.springframework.security.web.session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/web/src/main/java/org/springframework/security/ui/session/package.html b/web/src/main/java/org/springframework/security/web/session/package.html similarity index 100% rename from web/src/main/java/org/springframework/security/ui/session/package.html rename to web/src/main/java/org/springframework/security/web/session/package.html 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 901829815e..e79fe52ae0 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.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; import org.springframework.util.Assert; diff --git a/web/src/main/java/org/springframework/security/web/util/RedirectUtils.java b/web/src/main/java/org/springframework/security/web/util/RedirectUtils.java index 1eade5fae0..cda2d6d848 100644 --- a/web/src/main/java/org/springframework/security/web/util/RedirectUtils.java +++ b/web/src/main/java/org/springframework/security/web/util/RedirectUtils.java @@ -1,7 +1,7 @@ package org.springframework.security.web.util; -import org.springframework.security.ui.AbstractProcessingFilter; -import org.springframework.security.ui.logout.LogoutFilter; +import org.springframework.security.web.authentication.AbstractProcessingFilter; +import org.springframework.security.web.logout.LogoutFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; 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 fd54365867..c5cd2c63cb 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,8 +17,8 @@ package org.springframework.security.web.util; import javax.servlet.http.HttpServletRequest; -import org.springframework.security.intercept.web.FilterInvocation; -import org.springframework.security.ui.savedrequest.SavedRequest; +import org.springframework.security.web.intercept.FilterInvocation; +import org.springframework.security.web.savedrequest.SavedRequest; /** diff --git a/web/src/main/java/org/springframework/security/wrapper/SavedRequestAwareWrapper.java b/web/src/main/java/org/springframework/security/web/wrapper/SavedRequestAwareWrapper.java similarity index 93% rename from web/src/main/java/org/springframework/security/wrapper/SavedRequestAwareWrapper.java rename to web/src/main/java/org/springframework/security/web/wrapper/SavedRequestAwareWrapper.java index 60b4c1ec05..89b67805a3 100644 --- a/web/src/main/java/org/springframework/security/wrapper/SavedRequestAwareWrapper.java +++ b/web/src/main/java/org/springframework/security/web/wrapper/SavedRequestAwareWrapper.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.wrapper; +package org.springframework.security.web.wrapper; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -34,10 +34,10 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.security.ui.savedrequest.Enumerator; -import org.springframework.security.ui.savedrequest.FastHttpDateFormat; -import org.springframework.security.ui.savedrequest.SavedRequest; -import org.springframework.security.web.util.PortResolver; +import org.springframework.security.web.PortResolver; +import org.springframework.security.web.savedrequest.Enumerator; +import org.springframework.security.web.savedrequest.FastHttpDateFormat; +import org.springframework.security.web.savedrequest.SavedRequest; /** @@ -47,7 +47,7 @@ import org.springframework.security.web.util.PortResolver; * Nevertheless, the important data from the original request is emulated and this should prove * adequate for most purposes (in particular standard HTTP GET and POST operations).

    * - *

    Added into a request by {@link org.springframework.security.wrapper.SecurityContextHolderAwareRequestFilter}.

    + *

    Added into a request by {@link org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestFilter}.

    * * * @see SecurityContextHolderAwareRequestFilter diff --git a/web/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilter.java b/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestFilter.java similarity index 92% rename from web/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilter.java rename to web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestFilter.java index 1643f30c8d..020461d4c1 100644 --- a/web/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilter.java +++ b/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.wrapper; +package org.springframework.security.web.wrapper; import java.io.IOException; import java.lang.reflect.Constructor; @@ -23,10 +23,10 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.security.ui.FilterChainOrder; -import org.springframework.security.ui.SpringSecurityFilter; -import org.springframework.security.web.util.PortResolver; -import org.springframework.security.web.util.PortResolverImpl; +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.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/web/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapper.java b/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapper.java similarity index 98% rename from web/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapper.java rename to web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapper.java index ccb9036f9d..2d1aeb4170 100644 --- a/web/src/main/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapper.java +++ b/web/src/main/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestWrapper.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.wrapper; +package org.springframework.security.web.wrapper; import org.springframework.security.Authentication; import org.springframework.security.AuthenticationTrustResolver; @@ -23,7 +23,7 @@ import org.springframework.security.GrantedAuthority; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.web.util.PortResolver; +import org.springframework.security.web.PortResolver; import java.security.Principal; import java.util.List; diff --git a/web/src/main/java/org/springframework/security/wrapper/package.html b/web/src/main/java/org/springframework/security/web/wrapper/package.html similarity index 100% rename from web/src/main/java/org/springframework/security/wrapper/package.html rename to web/src/main/java/org/springframework/security/web/wrapper/package.html diff --git a/web/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java b/web/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java index 1eb92d8c7b..e762380f2c 100644 --- a/web/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java +++ b/web/src/test/java/org/springframework/security/MockAuthenticationEntryPoint.java @@ -21,7 +21,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.security.ui.AuthenticationEntryPoint; +import org.springframework.security.web.AuthenticationEntryPoint; /** diff --git a/web/src/test/java/org/springframework/security/MockPortResolver.java b/web/src/test/java/org/springframework/security/MockPortResolver.java index c2f03174d1..b64017e93a 100644 --- a/web/src/test/java/org/springframework/security/MockPortResolver.java +++ b/web/src/test/java/org/springframework/security/MockPortResolver.java @@ -15,7 +15,7 @@ package org.springframework.security; -import org.springframework.security.web.util.PortResolver; +import org.springframework.security.web.PortResolver; import javax.servlet.ServletRequest; diff --git a/web/src/test/java/org/springframework/security/util/MockFilter.java b/web/src/test/java/org/springframework/security/util/MockFilter.java deleted file mode 100644 index c33a94f24a..0000000000 --- a/web/src/test/java/org/springframework/security/util/MockFilter.java +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.security.util; - -import java.io.IOException; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - - -/** - * A simple filter that the test case can delegate to. - * - * @author Ben Alex - * @version $Id$ - */ -public class MockFilter implements Filter { - //~ Instance fields ================================================================================================ - - private boolean wasDestroyed = false; - private boolean wasDoFiltered = false; - private boolean wasInitialized = false; - - //~ Methods ======================================================================================================== - - public void destroy() { - wasDestroyed = true; - } - - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException { - wasDoFiltered = true; - chain.doFilter(request, response); - } - - public void init(FilterConfig config) throws ServletException { - wasInitialized = true; - } - - public boolean isWasDestroyed() { - return wasDestroyed; - } - - public boolean isWasDoFiltered() { - return wasDoFiltered; - } - - public boolean isWasInitialized() { - return wasInitialized; - } -} diff --git a/web/src/test/java/org/springframework/security/ui/ExceptionTranslationFilterTests.java b/web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java similarity index 97% rename from web/src/test/java/org/springframework/security/ui/ExceptionTranslationFilterTests.java rename to web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java index 53e5e1d926..fd633cc1b9 100644 --- a/web/src/test/java/org/springframework/security/ui/ExceptionTranslationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/ExceptionTranslationFilterTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security.web; import java.io.IOException; @@ -33,9 +33,11 @@ import org.springframework.security.BadCredentialsException; import org.springframework.security.MockAuthenticationEntryPoint; import org.springframework.security.MockPortResolver; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; -import org.springframework.security.ui.savedrequest.SavedRequest; +import org.springframework.security.providers.AnonymousAuthenticationToken; import org.springframework.security.util.AuthorityUtils; +import org.springframework.security.web.AccessDeniedHandlerImpl; +import org.springframework.security.web.ExceptionTranslationFilter; +import org.springframework.security.web.savedrequest.SavedRequest; /** * Tests {@link ExceptionTranslationFilter}. diff --git a/web/src/test/java/org/springframework/security/util/PortMapperImplTests.java b/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java similarity index 97% rename from web/src/test/java/org/springframework/security/util/PortMapperImplTests.java rename to web/src/test/java/org/springframework/security/web/PortMapperImplTests.java index 2e98419707..6f66744266 100644 --- a/web/src/test/java/org/springframework/security/util/PortMapperImplTests.java +++ b/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package org.springframework.security.util; +package org.springframework.security.web; import junit.framework.TestCase; import java.util.HashMap; import java.util.Map; -import org.springframework.security.web.util.PortMapperImpl; +import org.springframework.security.web.PortMapperImpl; /** diff --git a/web/src/test/java/org/springframework/security/util/PortResolverImplTests.java b/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java similarity index 94% rename from web/src/test/java/org/springframework/security/util/PortResolverImplTests.java rename to web/src/test/java/org/springframework/security/web/PortResolverImplTests.java index b225152e04..b91fe33cf5 100644 --- a/web/src/test/java/org/springframework/security/util/PortResolverImplTests.java +++ b/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package org.springframework.security.util; +package org.springframework.security.web; import junit.framework.TestCase; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.security.web.util.PortMapperImpl; -import org.springframework.security.web.util.PortResolverImpl; +import org.springframework.security.web.PortMapperImpl; +import org.springframework.security.web.PortResolverImpl; /** diff --git a/web/src/test/java/org/springframework/security/ui/SessionFixationProtectionFilterTests.java b/web/src/test/java/org/springframework/security/web/SessionFixationProtectionFilterTests.java similarity index 94% rename from web/src/test/java/org/springframework/security/ui/SessionFixationProtectionFilterTests.java rename to web/src/test/java/org/springframework/security/web/SessionFixationProtectionFilterTests.java index e519b0d95c..75717d7635 100644 --- a/web/src/test/java/org/springframework/security/ui/SessionFixationProtectionFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/SessionFixationProtectionFilterTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui; +package org.springframework.security.web; import static org.junit.Assert.*; @@ -10,8 +10,9 @@ import org.springframework.mock.web.MockFilterChain; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.context.web.HttpSessionSecurityContextRepository; import org.springframework.security.providers.TestingAuthenticationToken; +import org.springframework.security.web.SessionFixationProtectionFilter; +import org.springframework.security.web.context.HttpSessionSecurityContextRepository; /** * diff --git a/web/src/test/java/org/springframework/security/ui/AbstractProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AbstractProcessingFilterTests.java similarity index 97% rename from web/src/test/java/org/springframework/security/ui/AbstractProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/AbstractProcessingFilterTests.java index ed2963d0e9..2b2ed673cc 100644 --- a/web/src/test/java/org/springframework/security/ui/AbstractProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AbstractProcessingFilterTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security.web.authentication; import java.io.IOException; import java.util.Properties; @@ -40,11 +40,15 @@ import org.springframework.security.BadCredentialsException; import org.springframework.security.MockAuthenticationManager; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.ui.rememberme.NullRememberMeServices; -import org.springframework.security.ui.rememberme.TokenBasedRememberMeServices; -import org.springframework.security.ui.savedrequest.SavedRequest; import org.springframework.security.util.AuthorityUtils; -import org.springframework.security.web.util.PortResolverImpl; +import org.springframework.security.web.PortResolverImpl; +import org.springframework.security.web.authentication.AbstractProcessingFilter; +import org.springframework.security.web.authentication.ExceptionMappingAuthenticationFailureHandler; +import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; +import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; +import org.springframework.security.web.authentication.rememberme.NullRememberMeServices; +import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices; +import org.springframework.security.web.savedrequest.SavedRequest; /** @@ -333,9 +337,7 @@ public class AbstractProcessingFilterTests extends TestCase { MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(true); filter.setFilterProcessesUrl("/j_mock_post"); successHandler.setDefaultTargetUrl("/foobar"); - assertFalse(successHandler.isAlwaysUseDefaultTargetUrl()); // check default successHandler.setAlwaysUseDefaultTargetUrl(true); - assertTrue(successHandler.isAlwaysUseDefaultTargetUrl()); // check changed filter.setAuthenticationSuccessHandler(successHandler); // Test diff --git a/web/src/test/java/org/springframework/security/ui/AnonymousProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AnonymousProcessingFilterTests.java similarity index 98% rename from web/src/test/java/org/springframework/security/ui/AnonymousProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/AnonymousProcessingFilterTests.java index 0d2c233dba..e502ec6c94 100644 --- a/web/src/test/java/org/springframework/security/ui/AnonymousProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AnonymousProcessingFilterTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui; +package org.springframework.security.web.authentication; import junit.framework.TestCase; @@ -26,8 +26,8 @@ import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.TestingAuthenticationToken; -import org.springframework.security.ui.anonymous.AnonymousProcessingFilter; import org.springframework.security.userdetails.memory.UserAttribute; +import org.springframework.security.web.authentication.AnonymousProcessingFilter; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/web/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/AuthenticationProcessingFilterEntryPointTests.java similarity index 98% rename from web/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java rename to web/src/test/java/org/springframework/security/web/authentication/AuthenticationProcessingFilterEntryPointTests.java index bd78514e8f..149f87cb91 100644 --- a/web/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AuthenticationProcessingFilterEntryPointTests.java @@ -13,13 +13,14 @@ * limitations under the License. */ -package org.springframework.security.ui.webapp; +package org.springframework.security.web.authentication; import junit.framework.TestCase; import org.springframework.security.MockPortResolver; -import org.springframework.security.web.util.PortMapperImpl; +import org.springframework.security.web.PortMapperImpl; +import org.springframework.security.web.authentication.AuthenticationProcessingFilterEntryPoint; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/web/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AuthenticationProcessingFilterTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/AuthenticationProcessingFilterTests.java index 9d3393bd63..45e0d3ad52 100644 --- a/web/src/test/java/org/springframework/security/ui/webapp/AuthenticationProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AuthenticationProcessingFilterTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.webapp; +package org.springframework.security.web.authentication; import javax.servlet.ServletException; @@ -25,7 +25,8 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.Authentication; import org.springframework.security.AuthenticationException; import org.springframework.security.MockAuthenticationManager; -import org.springframework.security.ui.WebAuthenticationDetails; +import org.springframework.security.web.WebAuthenticationDetails; +import org.springframework.security.web.authentication.AuthenticationProcessingFilter; /** diff --git a/web/src/test/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java similarity index 84% rename from web/src/test/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java index f7e7d7d7fc..b1e5c772cc 100644 --- a/web/src/test/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.webapp; +package org.springframework.security.web.authentication; import static org.mockito.Mockito.mock; @@ -11,8 +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.ui.AbstractProcessingFilter; -import org.springframework.security.ui.FilterChainOrder; +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; /** * diff --git a/web/src/test/java/org/springframework/security/ui/SavedRequestAwareAuthenticationSuccessHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java similarity index 82% rename from web/src/test/java/org/springframework/security/ui/SavedRequestAwareAuthenticationSuccessHandlerTests.java rename to web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java index b8cecb1e5d..684285df3e 100644 --- a/web/src/test/java/org/springframework/security/ui/SavedRequestAwareAuthenticationSuccessHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java @@ -1,8 +1,9 @@ -package org.springframework.security.ui; +package org.springframework.security.web.authentication; import static org.junit.Assert.*; import org.junit.Test; +import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; public class SavedRequestAwareAuthenticationSuccessHandlerTests { diff --git a/web/src/test/java/org/springframework/security/ui/preauth/AbstractPreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java similarity index 92% rename from web/src/test/java/org/springframework/security/ui/preauth/AbstractPreAuthenticatedProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java index fa3411ff14..6a3a99d198 100644 --- a/web/src/test/java/org/springframework/security/ui/preauth/AbstractPreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth; +package org.springframework.security.web.authentication.preauth; import static org.junit.Assert.assertNull; import static org.mockito.Mockito.mock; @@ -13,6 +13,7 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.BadCredentialsException; import org.springframework.security.MockAuthenticationManager; import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter; public class AbstractPreAuthenticatedProcessingFilterTests { private AbstractPreAuthenticatedProcessingFilter filter; diff --git a/web/src/test/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java similarity index 90% rename from web/src/test/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java rename to web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java index e204ed20f2..b1e7969189 100755 --- a/web/src/test/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth; +package org.springframework.security.web.authentication.preauth; import static org.junit.Assert.assertTrue; @@ -13,6 +13,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.security.GrantedAuthority; import org.springframework.security.util.AuthorityUtils; +import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails; /** * @author TSARDD diff --git a/web/src/test/java/org/springframework/security/ui/preauth/PreAuthenticatedProcessingFilterEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterEntryPointTests.java similarity index 86% rename from web/src/test/java/org/springframework/security/ui/preauth/PreAuthenticatedProcessingFilterEntryPointTests.java rename to web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterEntryPointTests.java index a1bd0ac061..4f5addf657 100755 --- a/web/src/test/java/org/springframework/security/ui/preauth/PreAuthenticatedProcessingFilterEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterEntryPointTests.java @@ -1,6 +1,7 @@ -package org.springframework.security.ui.preauth; +package org.springframework.security.web.authentication.preauth; import org.springframework.security.AuthenticationCredentialsNotFoundException; +import org.springframework.security.web.authentication.preauth.PreAuthenticatedProcessingFilterEntryPoint; import java.io.IOException; diff --git a/web/src/test/java/org/springframework/security/ui/preauth/PreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterTests.java similarity index 89% rename from web/src/test/java/org/springframework/security/ui/preauth/PreAuthenticatedProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterTests.java index 7fda5f62ad..9f3dfaed1f 100755 --- a/web/src/test/java/org/springframework/security/ui/preauth/PreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedProcessingFilterTests.java @@ -1,8 +1,9 @@ -package org.springframework.security.ui.preauth; +package org.springframework.security.web.authentication.preauth; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.MockAuthenticationManager; -import org.springframework.security.ui.FilterChainOrder; +import org.springframework.security.web.FilterChainOrder; +import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter; import javax.servlet.http.HttpServletRequest; diff --git a/web/src/test/java/org/springframework/security/ui/preauth/header/RequestHeaderPreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderPreAuthenticatedProcessingFilterTests.java similarity index 92% rename from web/src/test/java/org/springframework/security/ui/preauth/header/RequestHeaderPreAuthenticatedProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderPreAuthenticatedProcessingFilterTests.java index 99f4bd6c63..be597b7f5e 100644 --- a/web/src/test/java/org/springframework/security/ui/preauth/header/RequestHeaderPreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderPreAuthenticatedProcessingFilterTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth.header; +package org.springframework.security.web.authentication.preauth.header; import static org.junit.Assert.*; @@ -10,7 +10,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.MockAuthenticationManager; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.ui.preauth.PreAuthenticatedCredentialsNotFoundException; +import org.springframework.security.web.authentication.preauth.PreAuthenticatedCredentialsNotFoundException; +import org.springframework.security.web.authentication.preauth.RequestHeaderPreAuthenticatedProcessingFilter; /** * diff --git a/web/src/test/java/org/springframework/security/ui/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java similarity index 93% rename from web/src/test/java/org/springframework/security/ui/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java rename to web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java index 52696a521f..2dbbe1ef0b 100755 --- a/web/src/test/java/org/springframework/security/ui/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth.j2ee; +package org.springframework.security.web.authentication.preauth.j2ee; import java.util.Arrays; import java.util.Collection; @@ -14,7 +14,8 @@ 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.ui.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails; +import org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails; +import org.springframework.security.web.authentication.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource; import org.springframework.security.GrantedAuthority; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/web/src/test/java/org/springframework/security/ui/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java similarity index 86% rename from web/src/test/java/org/springframework/security/ui/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java index d9e869a398..9cba584c9d 100755 --- a/web/src/test/java/org/springframework/security/ui/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.preauth.j2ee; +package org.springframework.security.web.authentication.preauth.j2ee; import java.security.Principal; import java.util.Arrays; @@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest; import junit.framework.TestCase; import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.security.web.authentication.preauth.j2ee.J2eePreAuthenticatedProcessingFilter; /** * diff --git a/web/src/test/java/org/springframework/security/ui/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java similarity index 89% rename from web/src/test/java/org/springframework/security/ui/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java rename to web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java index 37de7fd817..0f52464461 100755 --- a/web/src/test/java/org/springframework/security/ui/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java @@ -1,10 +1,12 @@ -package org.springframework.security.ui.preauth.j2ee; +package org.springframework.security.web.authentication.preauth.j2ee; import java.io.InputStream; import java.util.Arrays; import java.util.List; import java.util.Set; +import org.springframework.security.web.authentication.preauth.j2ee.WebXmlMappableAttributesRetriever; + import junit.framework.TestCase; public class WebXmlJ2eeDefinedRolesRetrieverTests extends TestCase { diff --git a/web/src/test/java/org/springframework/security/ui/preauth/x509/SubjectDnX509PrincipalExtractorTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java similarity index 90% rename from web/src/test/java/org/springframework/security/ui/preauth/x509/SubjectDnX509PrincipalExtractorTests.java rename to web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java index e09adc62bf..eeea5b1359 100644 --- a/web/src/test/java/org/springframework/security/ui/preauth/x509/SubjectDnX509PrincipalExtractorTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java @@ -1,7 +1,8 @@ -package org.springframework.security.ui.preauth.x509; +package org.springframework.security.web.authentication.preauth.x509; import org.springframework.security.SpringSecurityMessageSource; import org.springframework.security.BadCredentialsException; +import org.springframework.security.web.authentication.preauth.x509.SubjectDnX509PrincipalExtractor; import org.junit.Test; import org.junit.Before; diff --git a/web/src/test/java/org/springframework/security/ui/preauth/x509/X509TestUtils.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java similarity index 98% rename from web/src/test/java/org/springframework/security/ui/preauth/x509/X509TestUtils.java rename to web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java index 3c82383a97..883c2d20ea 100644 --- a/web/src/test/java/org/springframework/security/ui/preauth/x509/X509TestUtils.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.preauth.x509; +package org.springframework.security.web.authentication.preauth.x509; import java.io.ByteArrayInputStream; diff --git a/web/src/test/java/org/springframework/security/ui/rememberme/AbstractRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/ui/rememberme/AbstractRememberMeServicesTests.java rename to web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java index 8442799db9..bf635cbf4c 100644 --- a/web/src/test/java/org/springframework/security/ui/rememberme/AbstractRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import static org.junit.Assert.*; @@ -16,6 +16,10 @@ import org.springframework.security.userdetails.UserDetails; import org.springframework.security.userdetails.UserDetailsService; import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.security.util.AuthorityUtils; +import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; +import org.springframework.security.web.authentication.rememberme.CookieTheftException; +import org.springframework.security.web.authentication.rememberme.InvalidCookieException; +import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationException; import org.springframework.util.StringUtils; /** diff --git a/web/src/test/java/org/springframework/security/ui/rememberme/JdbcTokenRepositoryImplTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java similarity index 95% rename from web/src/test/java/org/springframework/security/ui/rememberme/JdbcTokenRepositoryImplTests.java rename to web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java index c0e5ac2ce9..66e9c42475 100644 --- a/web/src/test/java/org/springframework/security/ui/rememberme/JdbcTokenRepositoryImplTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java @@ -1,6 +1,8 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import org.springframework.security.TestDataSource; +import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl; +import org.springframework.security.web.authentication.rememberme.PersistentRememberMeToken; import org.springframework.jdbc.core.JdbcTemplate; import org.junit.After; diff --git a/web/src/test/java/org/springframework/security/ui/rememberme/NullRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java similarity index 68% rename from web/src/test/java/org/springframework/security/ui/rememberme/NullRememberMeServicesTests.java rename to web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java index 88c9a6d5cb..0d3eb41f1e 100644 --- a/web/src/test/java/org/springframework/security/ui/rememberme/NullRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java @@ -13,34 +13,22 @@ * limitations under the License. */ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; + +import org.springframework.security.web.authentication.rememberme.NullRememberMeServices; import junit.framework.TestCase; /** - * Tests {@link org.springframework.security.ui.rememberme.NullRememberMeServices}. + * Tests {@link org.springframework.security.web.authentication.rememberme.NullRememberMeServices}. * * @author Ben Alex * @version $Id$ */ public class NullRememberMeServicesTests extends TestCase { - //~ Constructors =================================================================================================== - - public NullRememberMeServicesTests() { - super(); - } - - public NullRememberMeServicesTests(String arg0) { - super(arg0); - } - //~ Methods ======================================================================================================== - public static void main(String[] args) { - junit.textui.TestRunner.run(NullRememberMeServicesTests.class); - } - public void testAlwaysReturnsNull() { NullRememberMeServices services = new NullRememberMeServices(); assertNull(services.autoLogin(null, null)); diff --git a/web/src/test/java/org/springframework/security/ui/rememberme/PersistentTokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java similarity index 90% rename from web/src/test/java/org/springframework/security/ui/rememberme/PersistentTokenBasedRememberMeServicesTests.java rename to web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java index af30fb2e95..3c37cedcd7 100644 --- a/web/src/test/java/org/springframework/security/ui/rememberme/PersistentTokenBasedRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import static org.junit.Assert.*; @@ -12,6 +12,12 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.providers.TestingAuthenticationToken; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.web.authentication.rememberme.CookieTheftException; +import org.springframework.security.web.authentication.rememberme.InvalidCookieException; +import org.springframework.security.web.authentication.rememberme.PersistentRememberMeToken; +import org.springframework.security.web.authentication.rememberme.PersistentTokenBasedRememberMeServices; +import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository; +import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationException; /** * @author Luke Taylor diff --git a/web/src/test/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilterTests.java similarity index 95% rename from web/src/test/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilterTests.java index 7bd5dcd7f8..69e80fab84 100644 --- a/web/src/test/java/org/springframework/security/ui/rememberme/RememberMeProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilterTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import java.io.IOException; @@ -37,6 +37,10 @@ import org.springframework.security.MockAuthenticationManager; import org.springframework.security.MockFilterConfig; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.TestingAuthenticationToken; +import org.springframework.security.web.authentication.rememberme.NullRememberMeServices; +import org.springframework.security.web.authentication.rememberme.RememberMeProcessingFilter; +import org.springframework.security.web.authentication.rememberme.RememberMeServices; +import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices; /** diff --git a/web/src/test/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java similarity index 97% rename from web/src/test/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServicesTests.java rename to web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java index ea9c4aff70..c530d47b09 100644 --- a/web/src/test/java/org/springframework/security/ui/rememberme/TokenBasedRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package org.springframework.security.ui.rememberme; +package org.springframework.security.web.authentication.rememberme; import static org.junit.Assert.*; -import static org.springframework.security.ui.rememberme.TokenBasedRememberMeServices.*; +import static org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices.*; import java.util.Date; @@ -38,10 +38,11 @@ import org.springframework.security.userdetails.UserDetails; import org.springframework.security.userdetails.UserDetailsService; import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.security.util.AuthorityUtils; +import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices; import org.springframework.util.StringUtils; /** - * Tests {@link org.springframework.security.ui.rememberme.TokenBasedRememberMeServices}. + * Tests {@link org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices}. * * @author Ben Alex * @version $Id$ diff --git a/web/src/test/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilterTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilterTests.java index a52c5c5bb4..f4febae7b3 100644 --- a/web/src/test/java/org/springframework/security/ui/switchuser/SwitchUserProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilterTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.switchuser; +package org.springframework.security.web.authentication.switchuser; import static org.junit.Assert.*; import static org.mockito.Mockito.*; @@ -37,17 +37,20 @@ import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthorityImpl; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.ui.SimpleUrlAuthenticationSuccessHandler; import org.springframework.security.userdetails.User; import org.springframework.security.userdetails.UserDetails; import org.springframework.security.userdetails.UserDetailsService; import org.springframework.security.userdetails.UsernameNotFoundException; import org.springframework.security.util.AuthorityUtils; import org.springframework.security.util.FieldUtils; +import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler; +import org.springframework.security.web.authentication.switchuser.SwitchUserAuthorityChanger; +import org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority; +import org.springframework.security.web.authentication.switchuser.SwitchUserProcessingFilter; /** - * Tests {@link org.springframework.security.ui.switchuser.SwitchUserProcessingFilter}. + * Tests {@link org.springframework.security.web.authentication.switchuser.SwitchUserProcessingFilter}. * * @author Mark St.Godard * @author Luke Taylor diff --git a/web/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterEntryPointTests.java similarity index 95% rename from web/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPointTests.java rename to web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterEntryPointTests.java index c7cbeb3a68..3cee9922c1 100644 --- a/web/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterEntryPointTests.java @@ -13,11 +13,12 @@ * limitations under the License. */ -package org.springframework.security.ui.basicauth; +package org.springframework.security.web.authentication.www; import junit.framework.TestCase; import org.springframework.security.DisabledException; +import org.springframework.security.web.authentication.www.BasicProcessingFilterEntryPoint; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/web/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterTests.java similarity index 97% rename from web/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterTests.java index 74423dac95..b8a1a13ba6 100644 --- a/web/src/test/java/org/springframework/security/ui/basicauth/BasicProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.basicauth; +package org.springframework.security.web.authentication.www; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -49,6 +49,8 @@ import org.springframework.security.MockFilterConfig; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.util.AuthorityUtils; +import org.springframework.security.web.authentication.www.BasicProcessingFilter; +import org.springframework.security.web.authentication.www.BasicProcessingFilterEntryPoint; /** diff --git a/web/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterEntryPointTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPointTests.java rename to web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterEntryPointTests.java index dff54f8782..b281c59ae2 100644 --- a/web/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterEntryPointTests.java @@ -13,13 +13,15 @@ * limitations under the License. */ -package org.springframework.security.ui.digestauth; +package org.springframework.security.web.authentication.www; import junit.framework.TestCase; import org.springframework.security.DisabledException; import org.springframework.security.util.StringSplitUtils; +import org.springframework.security.web.authentication.www.DigestProcessingFilterEntryPoint; +import org.springframework.security.web.authentication.www.NonceExpiredException; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; diff --git a/web/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterTests.java similarity index 98% rename from web/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterTests.java index d39e34007a..4a8f46d197 100644 --- a/web/src/test/java/org/springframework/security/ui/digestauth/DigestProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.digestauth; +package org.springframework.security.web.authentication.www; import static org.junit.Assert.*; @@ -27,14 +27,16 @@ import org.springframework.security.MockFilterConfig; import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.dao.cache.NullUserCache; import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.userdetails.cache.NullUserCache; import org.springframework.security.userdetails.memory.InMemoryDaoImpl; import org.springframework.security.userdetails.memory.UserMap; import org.springframework.security.userdetails.memory.UserMapEditor; import org.springframework.security.util.StringSplitUtils; +import org.springframework.security.web.authentication.www.DigestProcessingFilter; +import org.springframework.security.web.authentication.www.DigestProcessingFilterEntryPoint; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; diff --git a/web/src/test/java/org/springframework/security/concurrent/ConcurrentSessionControllerImplTests.java b/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionControllerImplTests.java similarity index 91% rename from web/src/test/java/org/springframework/security/concurrent/ConcurrentSessionControllerImplTests.java rename to web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionControllerImplTests.java index 6ddc7d451e..fb42f9a573 100644 --- a/web/src/test/java/org/springframework/security/concurrent/ConcurrentSessionControllerImplTests.java +++ b/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionControllerImplTests.java @@ -13,15 +13,19 @@ * limitations under the License. */ -package org.springframework.security.concurrent; +package org.springframework.security.web.concurrent; import junit.framework.TestCase; import org.springframework.security.Authentication; +import org.springframework.security.concurrent.ConcurrentLoginException; +import org.springframework.security.concurrent.ConcurrentSessionControllerImpl; +import org.springframework.security.concurrent.SessionRegistry; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.ui.WebAuthenticationDetails; +import org.springframework.security.web.WebAuthenticationDetails; +import org.springframework.security.web.concurrent.SessionRegistryImpl; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpSession; diff --git a/web/src/test/java/org/springframework/security/concurrent/ConcurrentSessionFilterTests.java b/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/concurrent/ConcurrentSessionFilterTests.java rename to web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java index 22bf4d9516..b014a15a1c 100644 --- a/web/src/test/java/org/springframework/security/concurrent/ConcurrentSessionFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java @@ -13,13 +13,16 @@ * limitations under the License. */ -package org.springframework.security.concurrent; +package org.springframework.security.web.concurrent; import junit.framework.TestCase; import org.springframework.mock.web.MockFilterConfig; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpSession; +import org.springframework.security.concurrent.SessionRegistry; +import org.springframework.security.web.concurrent.ConcurrentSessionFilter; +import org.springframework.security.web.concurrent.SessionRegistryImpl; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/web/src/test/java/org/springframework/security/concurrent/SessionInformationTests.java b/web/src/test/java/org/springframework/security/web/concurrent/SessionInformationTests.java similarity index 92% rename from web/src/test/java/org/springframework/security/concurrent/SessionInformationTests.java rename to web/src/test/java/org/springframework/security/web/concurrent/SessionInformationTests.java index d2a1d685b0..6069c89bd8 100644 --- a/web/src/test/java/org/springframework/security/concurrent/SessionInformationTests.java +++ b/web/src/test/java/org/springframework/security/web/concurrent/SessionInformationTests.java @@ -13,12 +13,14 @@ * limitations under the License. */ -package org.springframework.security.concurrent; +package org.springframework.security.web.concurrent; import junit.framework.TestCase; import java.util.Date; +import org.springframework.security.concurrent.SessionInformation; + /** * Tests {@link SessionInformation}. diff --git a/web/src/test/java/org/springframework/security/concurrent/SessionRegistryImplTests.java b/web/src/test/java/org/springframework/security/web/concurrent/SessionRegistryImplTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/concurrent/SessionRegistryImplTests.java rename to web/src/test/java/org/springframework/security/web/concurrent/SessionRegistryImplTests.java index e8c48d157d..b7caa090d6 100644 --- a/web/src/test/java/org/springframework/security/concurrent/SessionRegistryImplTests.java +++ b/web/src/test/java/org/springframework/security/web/concurrent/SessionRegistryImplTests.java @@ -13,11 +13,13 @@ * limitations under the License. */ -package org.springframework.security.concurrent; +package org.springframework.security.web.concurrent; import junit.framework.TestCase; -import org.springframework.security.ui.session.HttpSessionDestroyedEvent; +import org.springframework.security.concurrent.SessionInformation; +import org.springframework.security.web.concurrent.SessionRegistryImpl; +import org.springframework.security.web.session.HttpSessionDestroyedEvent; import org.springframework.mock.web.MockHttpSession; diff --git a/web/src/test/java/org/springframework/security/context/web/HttpSessionContextIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilterTests.java similarity index 98% rename from web/src/test/java/org/springframework/security/context/web/HttpSessionContextIntegrationFilterTests.java rename to web/src/test/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilterTests.java index d1af0d360e..522437cf58 100644 --- a/web/src/test/java/org/springframework/security/context/web/HttpSessionContextIntegrationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilterTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.context.web; +package org.springframework.security.web.context; import junit.framework.TestCase; @@ -24,6 +24,7 @@ import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.context.SecurityContextImpl; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.security.util.AuthorityUtils; +import org.springframework.security.web.context.HttpSessionContextIntegrationFilter; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/web/src/test/java/org/springframework/security/context/web/HttpSessionSecurityContextRepositoryTests.java b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java similarity index 97% rename from web/src/test/java/org/springframework/security/context/web/HttpSessionSecurityContextRepositoryTests.java rename to web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java index 753efd33a1..d6acc3cfd6 100644 --- a/web/src/test/java/org/springframework/security/context/web/HttpSessionSecurityContextRepositoryTests.java +++ b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.context.web; +package org.springframework.security.web.context; import static org.junit.Assert.*; @@ -9,6 +9,9 @@ import org.springframework.security.Authentication; import org.springframework.security.context.SecurityContext; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.TestingAuthenticationToken; +import org.springframework.security.web.context.HttpRequestResponseHolder; +import org.springframework.security.web.context.HttpSessionSecurityContextRepository; +import org.springframework.security.web.context.SaveContextOnUpdateOrErrorResponseWrapper; public class HttpSessionSecurityContextRepositoryTests { private final TestingAuthenticationToken testToken = new TestingAuthenticationToken("someone", "passwd", "ROLE_A"); diff --git a/web/src/test/java/org/springframework/security/context/web/SecurityContextPersistenceFilterTests.java b/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java similarity index 94% rename from web/src/test/java/org/springframework/security/context/web/SecurityContextPersistenceFilterTests.java rename to web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java index b9aa785bbc..0ba754e233 100644 --- a/web/src/test/java/org/springframework/security/context/web/SecurityContextPersistenceFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.context.web; +package org.springframework.security.web.context; import static org.junit.Assert.*; @@ -22,7 +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.ui.FilterChainOrder; +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; public class SecurityContextPersistenceFilterTests { Mockery jmock = new JUnit4Mockery(); diff --git a/web/src/test/java/org/springframework/security/expression/web/support/WebSecurityExpressionRootTests.java b/web/src/test/java/org/springframework/security/web/expression/WebSecurityExpressionRootTests.java similarity index 95% rename from web/src/test/java/org/springframework/security/expression/web/support/WebSecurityExpressionRootTests.java rename to web/src/test/java/org/springframework/security/web/expression/WebSecurityExpressionRootTests.java index 00008fa7bb..9f382f8504 100644 --- a/web/src/test/java/org/springframework/security/expression/web/support/WebSecurityExpressionRootTests.java +++ b/web/src/test/java/org/springframework/security/web/expression/WebSecurityExpressionRootTests.java @@ -1,4 +1,4 @@ -package org.springframework.security.expression.web.support; +package org.springframework.security.web.expression; import static org.junit.Assert.*; @@ -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.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; import org.springframework.security.web.util.FilterInvocationUtils; /** diff --git a/web/src/test/java/org/springframework/security/intercept/web/DefaultFilterInvocationSecurityMetadataSourceTests.java b/web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/intercept/web/DefaultFilterInvocationSecurityMetadataSourceTests.java rename to web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java index 9c09d5d730..3c40cac5e5 100644 --- a/web/src/test/java/org/springframework/security/intercept/web/DefaultFilterInvocationSecurityMetadataSourceTests.java +++ b/web/src/test/java/org/springframework/security/web/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.web; +package org.springframework.security.web.intercept; import static org.junit.Assert.*; import static org.mockito.Mockito.mock; @@ -29,6 +29,9 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.ConfigAttribute; import org.springframework.security.SecurityConfig; import org.springframework.security.util.AntUrlPathMatcher; +import org.springframework.security.web.intercept.DefaultFilterInvocationSecurityMetadataSource; +import org.springframework.security.web.intercept.FilterInvocation; +import org.springframework.security.web.intercept.RequestKey; /** * Tests parts of {@link DefaultFilterInvocationSecurityMetadataSource} not tested by {@link diff --git a/web/src/test/java/org/springframework/security/intercept/web/FilterInvocationTests.java b/web/src/test/java/org/springframework/security/web/intercept/FilterInvocationTests.java similarity index 97% rename from web/src/test/java/org/springframework/security/intercept/web/FilterInvocationTests.java rename to web/src/test/java/org/springframework/security/web/intercept/FilterInvocationTests.java index 224cb40d2a..c4436de9d8 100644 --- a/web/src/test/java/org/springframework/security/intercept/web/FilterInvocationTests.java +++ b/web/src/test/java/org/springframework/security/web/intercept/FilterInvocationTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.web; +package org.springframework.security.web.intercept; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -23,6 +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; /** * Tests {@link FilterInvocation}. diff --git a/web/src/test/java/org/springframework/security/intercept/web/FilterSecurityInterceptorTests.java b/web/src/test/java/org/springframework/security/web/intercept/FilterSecurityInterceptorTests.java similarity index 94% rename from web/src/test/java/org/springframework/security/intercept/web/FilterSecurityInterceptorTests.java rename to web/src/test/java/org/springframework/security/web/intercept/FilterSecurityInterceptorTests.java index 1c455e62d9..5dfa55fa7c 100644 --- a/web/src/test/java/org/springframework/security/intercept/web/FilterSecurityInterceptorTests.java +++ b/web/src/test/java/org/springframework/security/web/intercept/FilterSecurityInterceptorTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.web; +package org.springframework.security.web.intercept; import java.util.List; @@ -36,6 +36,9 @@ import org.springframework.security.RunAsManager; import org.springframework.security.SecurityConfig; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.TestingAuthenticationToken; +import org.springframework.security.web.intercept.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/intercept/web/RequestKeyTests.java b/web/src/test/java/org/springframework/security/web/intercept/RequestKeyTests.java similarity index 92% rename from web/src/test/java/org/springframework/security/intercept/web/RequestKeyTests.java rename to web/src/test/java/org/springframework/security/web/intercept/RequestKeyTests.java index 7c253a7ea2..38bef09bd2 100644 --- a/web/src/test/java/org/springframework/security/intercept/web/RequestKeyTests.java +++ b/web/src/test/java/org/springframework/security/web/intercept/RequestKeyTests.java @@ -1,8 +1,9 @@ -package org.springframework.security.intercept.web; +package org.springframework.security.web.intercept; import static org.junit.Assert.*; import org.junit.Test; +import org.springframework.security.web.intercept.RequestKey; /** * diff --git a/web/src/test/java/org/springframework/security/intercept/web/WebInvocationPrivilegeEvaluatorTests.java b/web/src/test/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluatorTests.java similarity index 91% rename from web/src/test/java/org/springframework/security/intercept/web/WebInvocationPrivilegeEvaluatorTests.java rename to web/src/test/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluatorTests.java index 4de6af79c6..d296f71ecc 100644 --- a/web/src/test/java/org/springframework/security/intercept/web/WebInvocationPrivilegeEvaluatorTests.java +++ b/web/src/test/java/org/springframework/security/web/intercept/WebInvocationPrivilegeEvaluatorTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.intercept.web; +package org.springframework.security.web.intercept; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -35,11 +35,15 @@ import org.springframework.security.MockApplicationEventPublisher; import org.springframework.security.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.intercept.FilterInvocationSecurityMetadataSource; +import org.springframework.security.web.intercept.FilterSecurityInterceptor; +import org.springframework.security.web.intercept.WebInvocationPrivilegeEvaluator; import org.springframework.security.web.util.FilterInvocationUtils; /** - * Tests {@link org.springframework.security.intercept.web.WebInvocationPrivilegeEvaluator}. + * Tests {@link org.springframework.security.web.intercept.WebInvocationPrivilegeEvaluator}. * * @author Ben Alex * @version $Id$ diff --git a/web/src/test/java/org/springframework/security/ui/logout/LogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/logout/LogoutHandlerTests.java similarity index 86% rename from web/src/test/java/org/springframework/security/ui/logout/LogoutHandlerTests.java rename to web/src/test/java/org/springframework/security/web/logout/LogoutHandlerTests.java index 2b0f74df93..e90a6ea6e6 100644 --- a/web/src/test/java/org/springframework/security/ui/logout/LogoutHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/logout/LogoutHandlerTests.java @@ -1,9 +1,11 @@ -package org.springframework.security.ui.logout; +package org.springframework.security.web.logout; import junit.framework.TestCase; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.security.web.logout.LogoutFilter; +import org.springframework.security.web.logout.SecurityContextLogoutHandler; /** * @author Luke Taylor diff --git a/web/src/test/java/org/springframework/security/ui/savedrequest/SavedCookieTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java similarity index 94% rename from web/src/test/java/org/springframework/security/ui/savedrequest/SavedCookieTests.java rename to web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java index 60b8d19368..d57d11f0f0 100644 --- a/web/src/test/java/org/springframework/security/ui/savedrequest/SavedCookieTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java @@ -1,8 +1,11 @@ -package org.springframework.security.ui.savedrequest; +package org.springframework.security.web.savedrequest; import junit.framework.TestCase; import javax.servlet.http.Cookie; + +import org.springframework.security.web.savedrequest.SavedCookie; + import java.io.Serializable; public class SavedCookieTests extends TestCase { diff --git a/web/src/test/java/org/springframework/security/ui/savedrequest/SavedRequestTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestTests.java similarity index 88% rename from web/src/test/java/org/springframework/security/ui/savedrequest/SavedRequestTests.java rename to web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestTests.java index 7ea547d70c..9edb4f706a 100644 --- a/web/src/test/java/org/springframework/security/ui/savedrequest/SavedRequestTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestTests.java @@ -1,7 +1,8 @@ -package org.springframework.security.ui.savedrequest; +package org.springframework.security.web.savedrequest; import junit.framework.TestCase; import org.springframework.security.MockPortResolver; +import org.springframework.security.web.savedrequest.SavedRequest; import org.springframework.mock.web.MockHttpServletRequest; public class SavedRequestTests extends TestCase { diff --git a/web/src/test/java/org/springframework/security/securechannel/ChannelDecisionManagerImplTests.java b/web/src/test/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImplTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/securechannel/ChannelDecisionManagerImplTests.java rename to web/src/test/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImplTests.java index 7ceda60279..d25674eeba 100644 --- a/web/src/test/java/org/springframework/security/securechannel/ChannelDecisionManagerImplTests.java +++ b/web/src/test/java/org/springframework/security/web/securechannel/ChannelDecisionManagerImplTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import static org.mockito.Mockito.mock; @@ -31,7 +31,9 @@ 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.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.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/securechannel/ChannelProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/securechannel/ChannelProcessingFilterTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/securechannel/ChannelProcessingFilterTests.java rename to web/src/test/java/org/springframework/security/web/securechannel/ChannelProcessingFilterTests.java index ac3fd5a97c..08bb3b63af 100644 --- a/web/src/test/java/org/springframework/security/securechannel/ChannelProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/securechannel/ChannelProcessingFilterTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -30,8 +30,10 @@ 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.intercept.web.FilterInvocation; -import org.springframework.security.intercept.web.FilterInvocationSecurityMetadataSource; +import org.springframework.security.web.intercept.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/securechannel/InsecureChannelProcessorTests.java b/web/src/test/java/org/springframework/security/web/securechannel/InsecureChannelProcessorTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/securechannel/InsecureChannelProcessorTests.java rename to web/src/test/java/org/springframework/security/web/securechannel/InsecureChannelProcessorTests.java index 4db3c992ae..1cc4f18ab6 100644 --- a/web/src/test/java/org/springframework/security/securechannel/InsecureChannelProcessorTests.java +++ b/web/src/test/java/org/springframework/security/web/securechannel/InsecureChannelProcessorTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import static org.mockito.Mockito.mock; @@ -24,7 +24,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.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; +import org.springframework.security.web.securechannel.InsecureChannelProcessor; /** diff --git a/web/src/test/java/org/springframework/security/securechannel/RetryWithHttpEntryPointTests.java b/web/src/test/java/org/springframework/security/web/securechannel/RetryWithHttpEntryPointTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/securechannel/RetryWithHttpEntryPointTests.java rename to web/src/test/java/org/springframework/security/web/securechannel/RetryWithHttpEntryPointTests.java index 1d6ea37464..d541277f9b 100644 --- a/web/src/test/java/org/springframework/security/securechannel/RetryWithHttpEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/securechannel/RetryWithHttpEntryPointTests.java @@ -13,13 +13,14 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import junit.framework.TestCase; import org.springframework.security.MockPortResolver; -import org.springframework.security.web.util.PortMapperImpl; +import org.springframework.security.web.PortMapperImpl; +import org.springframework.security.web.securechannel.RetryWithHttpEntryPoint; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/web/src/test/java/org/springframework/security/securechannel/RetryWithHttpsEntryPointTests.java b/web/src/test/java/org/springframework/security/web/securechannel/RetryWithHttpsEntryPointTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/securechannel/RetryWithHttpsEntryPointTests.java rename to web/src/test/java/org/springframework/security/web/securechannel/RetryWithHttpsEntryPointTests.java index 8335998a52..2cd5811371 100644 --- a/web/src/test/java/org/springframework/security/securechannel/RetryWithHttpsEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/securechannel/RetryWithHttpsEntryPointTests.java @@ -13,13 +13,14 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import junit.framework.TestCase; import org.springframework.security.MockPortResolver; -import org.springframework.security.web.util.PortMapperImpl; +import org.springframework.security.web.PortMapperImpl; +import org.springframework.security.web.securechannel.RetryWithHttpsEntryPoint; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/web/src/test/java/org/springframework/security/securechannel/SecureChannelProcessorTests.java b/web/src/test/java/org/springframework/security/web/securechannel/SecureChannelProcessorTests.java similarity index 96% rename from web/src/test/java/org/springframework/security/securechannel/SecureChannelProcessorTests.java rename to web/src/test/java/org/springframework/security/web/securechannel/SecureChannelProcessorTests.java index 2d0fee232a..ada5e1c073 100644 --- a/web/src/test/java/org/springframework/security/securechannel/SecureChannelProcessorTests.java +++ b/web/src/test/java/org/springframework/security/web/securechannel/SecureChannelProcessorTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.securechannel; +package org.springframework.security.web.securechannel; import static org.mockito.Mockito.mock; @@ -24,7 +24,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.intercept.web.FilterInvocation; +import org.springframework.security.web.intercept.FilterInvocation; +import org.springframework.security.web.securechannel.SecureChannelProcessor; /** diff --git a/web/src/test/java/org/springframework/security/ui/session/HttpSessionEventPublisherTests.java b/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java similarity index 95% rename from web/src/test/java/org/springframework/security/ui/session/HttpSessionEventPublisherTests.java rename to web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java index 207327688c..7ee44ae9be 100644 --- a/web/src/test/java/org/springframework/security/ui/session/HttpSessionEventPublisherTests.java +++ b/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.springframework.security.ui.session; +package org.springframework.security.web.session; import static org.junit.Assert.*; @@ -22,6 +22,7 @@ import javax.servlet.http.HttpSessionEvent; import org.junit.Test; import org.springframework.mock.web.MockHttpSession; import org.springframework.mock.web.MockServletContext; +import org.springframework.security.web.session.HttpSessionEventPublisher; import org.springframework.web.context.support.StaticWebApplicationContext; diff --git a/web/src/test/java/org/springframework/security/ui/session/MockApplicationListener.java b/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java similarity index 90% rename from web/src/test/java/org/springframework/security/ui/session/MockApplicationListener.java rename to web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java index 86a7c88ee8..30e2748260 100644 --- a/web/src/test/java/org/springframework/security/ui/session/MockApplicationListener.java +++ b/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java @@ -13,10 +13,12 @@ * limitations under the License. */ -package org.springframework.security.ui.session; +package org.springframework.security.web.session; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; +import org.springframework.security.web.session.HttpSessionCreatedEvent; +import org.springframework.security.web.session.HttpSessionDestroyedEvent; /** diff --git a/web/src/test/java/org/springframework/security/wrapper/SavedRequestAwareWrapperTests.java b/web/src/test/java/org/springframework/security/wrapper/SavedRequestAwareWrapperTests.java index cd19ac145b..c213b424fe 100644 --- a/web/src/test/java/org/springframework/security/wrapper/SavedRequestAwareWrapperTests.java +++ b/web/src/test/java/org/springframework/security/wrapper/SavedRequestAwareWrapperTests.java @@ -11,9 +11,10 @@ import javax.servlet.http.Cookie; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.security.ui.savedrequest.FastHttpDateFormat; -import org.springframework.security.ui.savedrequest.SavedRequest; -import org.springframework.security.web.util.PortResolverImpl; +import org.springframework.security.web.PortResolverImpl; +import org.springframework.security.web.savedrequest.FastHttpDateFormat; +import org.springframework.security.web.savedrequest.SavedRequest; +import org.springframework.security.web.wrapper.SavedRequestAwareWrapper; public class SavedRequestAwareWrapperTests { diff --git a/web/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilterTests.java b/web/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilterTests.java index 98ea22f67e..7a140d3222 100644 --- a/web/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilterTests.java +++ b/web/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestFilterTests.java @@ -25,7 +25,9 @@ import org.jmock.integration.junit4.JUnit4Mockery; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import org.springframework.security.web.util.PortResolverImpl; +import org.springframework.security.web.PortResolverImpl; +import org.springframework.security.web.wrapper.SavedRequestAwareWrapper; +import org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestFilter; /** diff --git a/web/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapperTests.java b/web/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapperTests.java index 4f0f2b27ce..bc14e3c116 100644 --- a/web/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapperTests.java +++ b/web/src/test/java/org/springframework/security/wrapper/SecurityContextHolderAwareRequestWrapperTests.java @@ -23,7 +23,8 @@ import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.TestingAuthenticationToken; import org.springframework.security.userdetails.User; import org.springframework.security.util.AuthorityUtils; -import org.springframework.security.web.util.PortResolverImpl; +import org.springframework.security.web.PortResolverImpl; +import org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestWrapper; /**