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">
-
* 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: *
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.
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.
* 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.
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.
*
* 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; /**