diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java index f6adf847a2..018017446b 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java @@ -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; diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/cache/EhCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java similarity index 93% rename from cas/src/main/java/org/springframework/security/cas/authentication/cache/EhCacheBasedTicketCache.java rename to cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java index a160cdabc4..3103847432 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/cache/EhCacheBasedTicketCache.java +++ b/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; diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/cache/NullStatelessTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java similarity index 84% rename from cas/src/main/java/org/springframework/security/cas/authentication/cache/NullStatelessTicketCache.java rename to cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java index cc9f83ecf9..131bb3e6d4 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/cache/NullStatelessTicketCache.java +++ b/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 diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/cache/package.html b/cas/src/main/java/org/springframework/security/cas/authentication/cache/package.html deleted file mode 100644 index 85101b7dc1..0000000000 --- a/cas/src/main/java/org/springframework/security/cas/authentication/cache/package.html +++ /dev/null @@ -1,5 +0,0 @@ - - -Caches CAS tickets for the CasAuthenticationProvider. - - diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/cache/AbstractStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java similarity index 91% rename from cas/src/test/java/org/springframework/security/cas/authentication/cache/AbstractStatelessTicketCacheTests.java rename to cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java index e49362cc24..daf042ee71 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/cache/AbstractStatelessTicketCacheTests.java +++ b/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; diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/cache/EhCacheBasedTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java similarity index 95% rename from cas/src/test/java/org/springframework/security/cas/authentication/cache/EhCacheBasedTicketCacheTests.java rename to cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java index 324fcfe064..8b843369eb 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/cache/EhCacheBasedTicketCacheTests.java +++ b/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.*; diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/cache/NullStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java similarity index 88% rename from cas/src/test/java/org/springframework/security/cas/authentication/cache/NullStatelessTicketCacheTests.java rename to cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java index 89677bc3e9..4939053142 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/cache/NullStatelessTicketCacheTests.java +++ b/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.*;