From d8980535b774c67edc883d6c23aaf0d9ec50e3aa Mon Sep 17 00:00:00 2001
From: "Marvin S. Addison" <marvin.addison@gmail.com>
Date: Tue, 14 Apr 2015 16:19:12 -0400
Subject: [PATCH] Move SAML components into separate module.

---
 cas-client-core/pom.xml                       | 29 ++++++-----
 cas-client-integration-atlassian/pom.xml      |  5 ++
 cas-client-integration-tomcat-v6/pom.xml      |  8 +++
 cas-client-integration-tomcat-v7/pom.xml      |  8 +++
 cas-client-support-saml/pom.xml               | 38 ++++++++++++++
 .../Saml11AuthenticationFilter.java           |  0
 .../Saml11TicketValidationFilter.java         |  0
 .../validation/Saml11TicketValidator.java     |  0
 .../Saml11TicketValidationFilterTests.java    |  0
 .../Saml11TicketValidatorTests.java           |  2 +-
 pom.xml                                       | 52 +++++++++++++++++++
 11 files changed, 129 insertions(+), 13 deletions(-)
 create mode 100644 cas-client-support-saml/pom.xml
 rename {cas-client-core => cas-client-support-saml}/src/main/java/org/jasig/cas/client/authentication/Saml11AuthenticationFilter.java (100%)
 rename {cas-client-core => cas-client-support-saml}/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java (100%)
 rename {cas-client-core => cas-client-support-saml}/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java (100%)
 rename {cas-client-core => cas-client-support-saml}/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidationFilterTests.java (100%)
 rename {cas-client-core => cas-client-support-saml}/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidatorTests.java (98%)

diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml
index 795b674..08a42b1 100644
--- a/cas-client-core/pom.xml
+++ b/cas-client-core/pom.xml
@@ -10,6 +10,23 @@
     <packaging>jar</packaging>
     <name>Jasig CAS Client for Java - Core</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -49,27 +66,18 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -95,7 +103,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <spring.version>3.1.3.RELEASE</spring.version>
-    </properties>
 </project>
diff --git a/cas-client-integration-atlassian/pom.xml b/cas-client-integration-atlassian/pom.xml
index 96895e9..ce13bce 100644
--- a/cas-client-integration-atlassian/pom.xml
+++ b/cas-client-integration-atlassian/pom.xml
@@ -46,6 +46,11 @@
 		    <optional>true</optional>
 		</dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+
         <dependency>
             <artifactId>atlassian-osuser</artifactId>
             <groupId>com.atlassian.osuser</groupId>
diff --git a/cas-client-integration-tomcat-v6/pom.xml b/cas-client-integration-tomcat-v6/pom.xml
index 5d40ce4..37d0465 100644
--- a/cas-client-integration-tomcat-v6/pom.xml
+++ b/cas-client-integration-tomcat-v6/pom.xml
@@ -20,6 +20,14 @@
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jasig.cas.client</groupId>
+            <artifactId>cas-client-support-saml</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>catalina</artifactId>
diff --git a/cas-client-integration-tomcat-v7/pom.xml b/cas-client-integration-tomcat-v7/pom.xml
index 5bc817d..e1068ba 100644
--- a/cas-client-integration-tomcat-v7/pom.xml
+++ b/cas-client-integration-tomcat-v7/pom.xml
@@ -20,6 +20,14 @@
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jasig.cas.client</groupId>
+            <artifactId>cas-client-support-saml</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-catalina</artifactId>
diff --git a/cas-client-support-saml/pom.xml b/cas-client-support-saml/pom.xml
new file mode 100644
index 0000000..60c49f7
--- /dev/null
+++ b/cas-client-support-saml/pom.xml
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jasig.cas.client</groupId>
+        <version>3.3.4-SNAPSHOT</version>
+        <artifactId>cas-client</artifactId>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jasig.cas.client</groupId>
+    <artifactId>cas-client-support-saml</artifactId>
+    <packaging>jar</packaging>
+    <name>Jasig CAS Client for Java - SAML Protocol Support</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jasig.cas.client</groupId>
+            <artifactId>cas-client-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jasig.cas.client</groupId>
+            <artifactId>cas-client-core</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/authentication/Saml11AuthenticationFilter.java b/cas-client-support-saml/src/main/java/org/jasig/cas/client/authentication/Saml11AuthenticationFilter.java
similarity index 100%
rename from cas-client-core/src/main/java/org/jasig/cas/client/authentication/Saml11AuthenticationFilter.java
rename to cas-client-support-saml/src/main/java/org/jasig/cas/client/authentication/Saml11AuthenticationFilter.java
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java b/cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java
similarity index 100%
rename from cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java
rename to cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java b/cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java
similarity index 100%
rename from cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java
rename to cas-client-support-saml/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java
diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidationFilterTests.java b/cas-client-support-saml/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidationFilterTests.java
similarity index 100%
rename from cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidationFilterTests.java
rename to cas-client-support-saml/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidationFilterTests.java
diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidatorTests.java b/cas-client-support-saml/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidatorTests.java
similarity index 98%
rename from cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidatorTests.java
rename to cas-client-support-saml/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidatorTests.java
index c648232..7738966 100644
--- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidatorTests.java
+++ b/cas-client-support-saml/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidatorTests.java
@@ -46,7 +46,7 @@ public final class Saml11TicketValidatorTests extends AbstractTicketValidatorTes
 
     @Before
     public void setUp() throws Exception {
-        this.validator = new Saml11TicketValidator(CONST_CAS_SERVER_URL_PREFIX + "9051");
+        this.validator = new Saml11TicketValidator(AbstractTicketValidatorTests.CONST_CAS_SERVER_URL_PREFIX + "9051");
         this.validator.setTolerance(1000L);
     }
 
diff --git a/pom.xml b/pom.xml
index 70befae..bac41ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,6 +159,56 @@
         </plugins>
     </build>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>commons-logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>${spring.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <scope>test</scope>
+                <version>1.2.15</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>jmxri</artifactId>
+                        <groupId>com.sun.jmx</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.jdmk</groupId>
+                        <artifactId>jmxtools</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.jms</groupId>
+                        <artifactId>jms</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -198,12 +248,14 @@
         <module>cas-client-integration-jboss</module>
         <module>cas-client-support-distributed-ehcache</module>
         <module>cas-client-support-distributed-memcached</module>
+        <module>cas-client-support-saml</module>
         <module>cas-client-integration-tomcat-common</module>
         <module>cas-client-integration-tomcat-v6</module>
         <module>cas-client-integration-tomcat-v7</module>
     </modules>
 
     <properties>
+        <spring.version>3.1.3.RELEASE</spring.version>
         <ehcache.version>2.2.0</ehcache.version>
         <clover.version>3.0.2</clover.version>
         <slf4j.version>1.7.1</slf4j.version>