SEC-1132: package refactoring of non-core modules

cas/src/main/java/org/springframework/security/cas/ServiceProperties.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.cas;
+package org.springframework.security.cas;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;

cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.providers.cas;
+package org.springframework.security.cas.authentication;
 
 import org.jasig.cas.client.validation.Assertion;
 import org.jasig.cas.client.validation.TicketValidationException;
@@ -26,11 +26,11 @@ import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.BadCredentialsException;
 import org.springframework.security.SpringSecurityMessageSource;
+import org.springframework.security.cas.ServiceProperties;
+import org.springframework.security.cas.authentication.cache.NullStatelessTicketCache;
+import org.springframework.security.cas.web.CasProcessingFilter;
 import org.springframework.security.providers.AuthenticationProvider;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
-import org.springframework.security.providers.cas.cache.NullStatelessTicketCache;
-import org.springframework.security.ui.cas.CasProcessingFilter;
-import org.springframework.security.ui.cas.ServiceProperties;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UserDetailsChecker;
 import org.springframework.security.userdetails.UserDetailsService;

cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.providers.cas;
+package org.springframework.security.cas.authentication;
 
 import org.jasig.cas.client.validation.Assertion;
 import org.springframework.security.GrantedAuthority;

cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.providers.cas;
+package org.springframework.security.cas.authentication;
 
 /**
  * Caches CAS service tickets and CAS proxy tickets for stateless connections.

cas/src/main/java/org/springframework/security/cas/authentication/cache/EhCacheBasedTicketCache.java

@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package org.springframework.security.providers.cas.cache;
+package org.springframework.security.cas.authentication.cache;
 
 import net.sf.ehcache.CacheException;
 import net.sf.ehcache.Element;
 import net.sf.ehcache.Ehcache;
 
-import org.springframework.security.providers.cas.CasAuthenticationToken;
-import org.springframework.security.providers.cas.StatelessTicketCache;
+import org.springframework.security.cas.authentication.CasAuthenticationToken;
+import org.springframework.security.cas.authentication.StatelessTicketCache;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

cas/src/main/java/org/springframework/security/cas/authentication/cache/NullStatelessTicketCache.java

@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.providers.cas.cache;
+package org.springframework.security.cas.authentication.cache;
 
-import org.springframework.security.providers.cas.CasAuthenticationProvider;
-import org.springframework.security.providers.cas.CasAuthenticationToken;
-import org.springframework.security.providers.cas.StatelessTicketCache;
+import org.springframework.security.cas.authentication.CasAuthenticationProvider;
+import org.springframework.security.cas.authentication.CasAuthenticationToken;
+import org.springframework.security.cas.authentication.StatelessTicketCache;
 
 /**
  * Implementation of @link {@link StatelessTicketCache} that has no backing cache.  Useful

cas/src/main/java/org/springframework/security/cas/web/CasProcessingFilter.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.cas;
+package org.springframework.security.cas.web;
 
 import java.io.IOException;
 
@@ -23,10 +23,11 @@ import org.jasig.cas.client.validation.TicketValidator;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
 
+import org.springframework.security.cas.ServiceProperties;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.springframework.security.web.FilterChainOrder;
 import org.springframework.security.web.authentication.AbstractProcessingFilter;
+import org.springframework.security.web.util.FilterChainOrder;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

cas/src/main/java/org/springframework/security/cas/web/CasProcessingFilterEntryPoint.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.cas;
+package org.springframework.security.cas.web;
 
 import java.io.IOException;
 
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.jasig.cas.client.util.CommonUtils;
 import org.springframework.security.AuthenticationException;
+import org.springframework.security.cas.ServiceProperties;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;

cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.providers.cas;
+package org.springframework.security.cas.authentication;
 
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
@@ -21,11 +21,14 @@ import org.springframework.security.BadCredentialsException;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
 
+import org.springframework.security.cas.ServiceProperties;
+import org.springframework.security.cas.authentication.CasAuthenticationProvider;
+import org.springframework.security.cas.authentication.CasAuthenticationToken;
+import org.springframework.security.cas.authentication.StatelessTicketCache;
+import org.springframework.security.cas.web.CasProcessingFilter;
 import org.springframework.security.providers.TestingAuthenticationToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
-import org.springframework.security.ui.cas.CasProcessingFilter;
-import org.springframework.security.ui.cas.ServiceProperties;
 
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;

cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.providers.cas;
+package org.springframework.security.cas.authentication;
 
 import java.util.List;
 
@@ -22,6 +22,7 @@ import junit.framework.TestCase;
 import org.jasig.cas.client.validation.Assertion;
 import org.jasig.cas.client.validation.AssertionImpl;
 import org.springframework.security.GrantedAuthority;
+import org.springframework.security.cas.authentication.CasAuthenticationToken;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;

cas/src/test/java/org/springframework/security/cas/authentication/cache/AbstractStatelessTicketCacheTests.java

@@ -1,11 +1,11 @@
-package org.springframework.security.providers.cas.cache;
+package org.springframework.security.cas.authentication.cache;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.jasig.cas.client.validation.Assertion;
 import org.jasig.cas.client.validation.AssertionImpl;
-import org.springframework.security.providers.cas.CasAuthenticationToken;
+import org.springframework.security.cas.authentication.CasAuthenticationToken;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.util.AuthorityUtils;
 

cas/src/test/java/org/springframework/security/cas/authentication/cache/EhCacheBasedTicketCacheTests.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.providers.cas.cache;
+package org.springframework.security.cas.authentication.cache;
 
 import net.sf.ehcache.Ehcache;
 import net.sf.ehcache.CacheManager;
@@ -22,7 +22,8 @@ import net.sf.ehcache.Cache;
 import org.junit.Test;
 import org.junit.BeforeClass;
 import org.junit.AfterClass;
-import org.springframework.security.providers.cas.CasAuthenticationToken;
+import org.springframework.security.cas.authentication.CasAuthenticationToken;
+import org.springframework.security.cas.authentication.cache.EhCacheBasedTicketCache;
 
 import static org.junit.Assert.*;
 

cas/src/test/java/org/springframework/security/cas/authentication/cache/NullStatelessTicketCacheTests.java

@@ -12,12 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.providers.cas.cache;
+package org.springframework.security.cas.authentication.cache;
 
 
 import org.junit.Test;
-import org.springframework.security.providers.cas.CasAuthenticationToken;
-import org.springframework.security.providers.cas.StatelessTicketCache;
+import org.springframework.security.cas.authentication.CasAuthenticationToken;
+import org.springframework.security.cas.authentication.StatelessTicketCache;
+import org.springframework.security.cas.authentication.cache.NullStatelessTicketCache;
 
 import static org.junit.Assert.*;
 

cas/src/test/java/org/springframework/security/cas/web/CasProcessingFilterEntryPointTests.java

@@ -13,12 +13,14 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.cas;
+package org.springframework.security.cas.web;
 
 import junit.framework.TestCase;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.security.cas.ServiceProperties;
+import org.springframework.security.cas.web.CasProcessingFilterEntryPoint;
 
 import java.net.URLEncoder;
 
@@ -30,26 +32,8 @@ import java.net.URLEncoder;
  * @version $Id$
  */
 public class CasProcessingFilterEntryPointTests extends TestCase {
-    //~ Constructors ===================================================================================================
-
-    public CasProcessingFilterEntryPointTests() {
-        super();
-    }
-
-    public CasProcessingFilterEntryPointTests(String arg0) {
-        super(arg0);
-    }
-
     //~ Methods ========================================================================================================
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CasProcessingFilterEntryPointTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
     public void testDetectsMissingLoginFormUrl() throws Exception {
         CasProcessingFilterEntryPoint ep = new CasProcessingFilterEntryPoint();
         ep.setServiceProperties(new ServiceProperties());

cas/src/test/java/org/springframework/security/cas/web/CasProcessingFilterTests.java

@@ -13,13 +13,14 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.cas;
+package org.springframework.security.cas.web;
 
 import junit.framework.TestCase;
 
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.cas.web.CasProcessingFilter;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;

cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java

@@ -13,7 +13,9 @@
  * limitations under the License.
  */
 
-package org.springframework.security.ui.cas;
+package org.springframework.security.cas.web;
+
+import org.springframework.security.cas.ServiceProperties;
 
 import junit.framework.TestCase;
 
@@ -25,26 +27,8 @@ import junit.framework.TestCase;
  * @version $Id$
  */
 public class ServicePropertiesTests extends TestCase {
-    //~ Constructors ===================================================================================================
-
-    public ServicePropertiesTests() {
-        super();
-    }
-
-    public ServicePropertiesTests(String arg0) {
-        super(arg0);
-    }
-
     //~ Methods ========================================================================================================
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(ServicePropertiesTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
     public void testDetectsMissingLoginFormUrl() throws Exception {
         ServiceProperties sp = new ServiceProperties();