Explorar o código

Remove (ticket) cache package from CAS module. Unnecesary and has a circular reference.

Luke Taylor %!s(int64=16) %!d(string=hai) anos
pai
achega
83da7be2ea

+ 0 - 1
cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java

@@ -27,7 +27,6 @@ import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 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.core.Authentication;
 import org.springframework.security.core.AuthenticationException;

+ 1 - 3
cas/src/main/java/org/springframework/security/cas/authentication/cache/EhCacheBasedTicketCache.java → cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java

@@ -13,14 +13,12 @@
  * limitations under the License.
  */
 
-package org.springframework.security.cas.authentication.cache;
+package org.springframework.security.cas.authentication;
 
 import net.sf.ehcache.CacheException;
 import net.sf.ehcache.Element;
 import net.sf.ehcache.Ehcache;
 
-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;

+ 1 - 4
cas/src/main/java/org/springframework/security/cas/authentication/cache/NullStatelessTicketCache.java → cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java

@@ -12,11 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.cas.authentication.cache;
+package org.springframework.security.cas.authentication;
 
-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

+ 0 - 5
cas/src/main/java/org/springframework/security/cas/authentication/cache/package.html

@@ -1,5 +0,0 @@
-<html>
-<body>
-Caches CAS tickets for the <code>CasAuthenticationProvider</code>.
-</body>
-</html>

+ 1 - 1
cas/src/test/java/org/springframework/security/cas/authentication/cache/AbstractStatelessTicketCacheTests.java → cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java

@@ -1,4 +1,4 @@
-package org.springframework.security.cas.authentication.cache;
+package org.springframework.security.cas.authentication;
 
 import java.util.ArrayList;
 import java.util.List;

+ 2 - 2
cas/src/test/java/org/springframework/security/cas/authentication/cache/EhCacheBasedTicketCacheTests.java → cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java

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

+ 2 - 2
cas/src/test/java/org/springframework/security/cas/authentication/cache/NullStatelessTicketCacheTests.java → cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java

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