From 273720f556e3ff61d9ba948a25b3e757a0883ede Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 6 Mar 2008 12:37:50 +0000
Subject: [PATCH] SEC-695: moved cas adapter to new cas module

---
 adapters/pom.xml                                              | 1 -
 {adapters => cas}/cas/.cvsignore                              | 0
 {adapters => cas}/cas/pom.xml                                 | 4 ++--
 .../security/adapters/cas/CasPasswordHandler.java             | 2 +-
 .../security/adapters/cas/CasPasswordHandlerProxy.java        | 0
 .../org/springframework/security/adapters/cas/package.html    | 0
 .../security/adapters/cas3/CasAuthenticationHandler.java      | 0
 .../security/adapters/cas/applicationContext.xml              | 0
 .../security/adapters/cas3/applicationContext.xml             | 0
 {adapters => cas}/cas/src/main/site/site.xml                  | 0
 .../security/adapters/cas/CasPasswordHandlerProxyTests.java   | 0
 .../security/adapters/cas/CasPasswordHandlerTests.java        | 2 +-
 .../security/adapters/cas3/CasAuthenticationHandlerTests.java | 2 +-
 .../security/adapters/cas/applicationContext-invalid.xml      | 0
 .../security/adapters/cas/applicationContext-valid.xml        | 0
 cas/pom.xml                                                   | 3 ++-
 16 files changed, 7 insertions(+), 7 deletions(-)
 rename {adapters => cas}/cas/.cvsignore (100%)
 rename {adapters => cas}/cas/pom.xml (90%)
 rename {adapters => cas}/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java (98%)
 rename {adapters => cas}/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java (100%)
 rename {adapters => cas}/cas/src/main/java/org/springframework/security/adapters/cas/package.html (100%)
 rename {adapters => cas}/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java (100%)
 rename {adapters => cas}/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml (100%)
 rename {adapters => cas}/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml (100%)
 rename {adapters => cas}/cas/src/main/site/site.xml (100%)
 rename {adapters => cas}/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java (100%)
 rename {adapters => cas}/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java (97%)
 rename {adapters => cas}/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java (97%)
 rename {adapters => cas}/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml (100%)
 rename {adapters => cas}/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml (100%)

diff --git a/adapters/pom.xml b/adapters/pom.xml
index f71eaf88e2..a618c1f915 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -21,7 +21,6 @@
     </dependency>
   </dependencies>
   <modules>
-    <module>cas</module>
     <module>catalina</module>
     <module>jboss</module>
     <module>jetty</module>
diff --git a/adapters/cas/.cvsignore b/cas/cas/.cvsignore
similarity index 100%
rename from adapters/cas/.cvsignore
rename to cas/cas/.cvsignore
diff --git a/adapters/cas/pom.xml b/cas/cas/pom.xml
similarity index 90%
rename from adapters/cas/pom.xml
rename to cas/cas/pom.xml
index c908fe04e2..ee07a5e094 100644
--- a/adapters/cas/pom.xml
+++ b/cas/cas/pom.xml
@@ -2,11 +2,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.springframework.security</groupId>
-    <artifactId>spring-security-adapters</artifactId>
+    <artifactId>spring-security-cas</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-cas-adapter</artifactId>
-  <name>Spring Security - CAS adapter</name>
+  <name>Spring Security - CAS Adapter</name>
   <dependencies>
     <dependency>
       <groupId>cas</groupId>
diff --git a/adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java b/cas/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java
similarity index 98%
rename from adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java
rename to cas/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java
index bb7e4bc711..1e31d1274d 100644
--- a/adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java
+++ b/cas/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandler.java
@@ -34,7 +34,7 @@ import javax.servlet.ServletRequest;
  * class directly. Instead configure CAS to use the {@link CasPasswordHandlerProxy}.</p>
  *
  * @author Ben Alex
- * @version $Id$
+ * @version $Id:CasPasswordHandler.java 2151 2007-09-22 11:54:13Z luke_t $
  */
 public final class CasPasswordHandler implements InitializingBean {
     //~ Static fields/initializers =====================================================================================
diff --git a/adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java b/cas/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java
similarity index 100%
rename from adapters/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java
rename to cas/cas/src/main/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxy.java
diff --git a/adapters/cas/src/main/java/org/springframework/security/adapters/cas/package.html b/cas/cas/src/main/java/org/springframework/security/adapters/cas/package.html
similarity index 100%
rename from adapters/cas/src/main/java/org/springframework/security/adapters/cas/package.html
rename to cas/cas/src/main/java/org/springframework/security/adapters/cas/package.html
diff --git a/adapters/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java b/cas/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java
similarity index 100%
rename from adapters/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java
rename to cas/cas/src/main/java/org/springframework/security/adapters/cas3/CasAuthenticationHandler.java
diff --git a/adapters/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml b/cas/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml
similarity index 100%
rename from adapters/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml
rename to cas/cas/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml
diff --git a/adapters/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml b/cas/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml
similarity index 100%
rename from adapters/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml
rename to cas/cas/src/main/resources/org/springframework/security/adapters/cas3/applicationContext.xml
diff --git a/adapters/cas/src/main/site/site.xml b/cas/cas/src/main/site/site.xml
similarity index 100%
rename from adapters/cas/src/main/site/site.xml
rename to cas/cas/src/main/site/site.xml
diff --git a/adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java b/cas/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java
similarity index 100%
rename from adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java
rename to cas/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerProxyTests.java
diff --git a/adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java b/cas/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java
similarity index 97%
rename from adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java
rename to cas/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java
index 88e0e83766..846387a7e0 100644
--- a/adapters/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java
+++ b/cas/cas/src/test/java/org/springframework/security/adapters/cas/CasPasswordHandlerTests.java
@@ -26,7 +26,7 @@ import org.springframework.mock.web.MockHttpServletRequest;
  * Tests {@link CasPasswordHandler}.
  *
  * @author Ben Alex
- * @version $Id$
+ * @version $Id:CasPasswordHandlerTests.java 2151 2007-09-22 11:54:13Z luke_t $
  */
 public class CasPasswordHandlerTests extends TestCase {
     //~ Constructors ===================================================================================================
diff --git a/adapters/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java b/cas/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
similarity index 97%
rename from adapters/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
rename to cas/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
index 9798e79a7a..61914e3667 100644
--- a/adapters/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
+++ b/cas/cas/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java
@@ -27,7 +27,7 @@ import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
  * Tests {@link CasAuthenticationHandler}
  *
  * @author Scott Battaglia
- * @version $Id$
+ * @version $Id:CasAuthenticationHandlerTests.java 2151 2007-09-22 11:54:13Z luke_t $
  */
 public class CasAuthenticationHandlerTests extends AbstractDependencyInjectionSpringContextTests {
     //~ Instance fields ================================================================================================
diff --git a/adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml b/cas/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml
similarity index 100%
rename from adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml
rename to cas/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml
diff --git a/adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml b/cas/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml
similarity index 100%
rename from adapters/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml
rename to cas/cas/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml
diff --git a/cas/pom.xml b/cas/pom.xml
index e1aea44c56..d0b6d0cfb0 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -12,6 +12,7 @@
 
     <modules>
         <module>cas-client</module>
+        <module>cas-adapter</module>
     </modules>
 
     <dependencies>
@@ -37,4 +38,4 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>