Created a casserver module to better isolate it from the cas sample application now that an overlay is being done

samples/cas/cas.gradle

@@ -1,7 +1,5 @@
 // CAS sample build file
 
-import org.apache.tools.ant.filters.ReplaceTokens
-
 apply plugin: 'war'
 apply plugin: 'jetty'
 apply plugin: 'groovy'
@@ -33,8 +31,6 @@ eclipseClasspath {
 dependencies {
     groovy 'org.codehaus.groovy:groovy:1.7.7'
 
-    casServer "org.jasig.cas:cas-server-webapp:3.4.3.1@war"
-
     providedCompile 'javax.servlet:servlet-api:2.5@jar'
 
     compile project(':spring-security-core'),
@@ -67,64 +63,20 @@ dependencies {
 
     connectors = [httpConnector, httpsConnector]
     doFirst() {
-        System.setProperty('cas.server.host', casServer.httpsHost)
+        System.setProperty('cas.server.host', casServer().httpsHost)
         System.setProperty('cas.service.host', jettyRunWar.httpsHost)
     }
 }
-task casServerOverlay(type: Sync) {
-    war = configurations.casServer.resolve().toArray()[0]
-    warName = war.name.replace('.war','-custom')
-    overlayDir = file('src/cas-server-overlay/webapp')
-    explodedWar = file("$buildDir/tmp/${warName}")
-    customWar = file("$buildDir/tmp/${warName}.war")
-    tokens = [logLevel: 'INFO']
 
-    inputs.files(war, overlayDir)
-    inputs.property('tokens',{tokens})
-    outputs.files(customWar,explodedWar,file("$buildDir/tmp/expandedArchives"))
-
-    from zipTree(war)
-    from (overlayDir) {
-        filter(ReplaceTokens,tokens: tokens)
-    }
-    into explodedWar
-
-    doLast {
-        if(customWar.exists()) {
-            customWar.delete()
-        }
-        ant.zip(destfile: customWar, baseDir: explodedWar)
-    }
+task cas (dependsOn: [jettyRunWar,':spring-security-samples-casserver:casServer']) {
 }
 
-casServerOverlay.metaClass.setLogLevel { level ->
-    tokens['logLevel'] = level
-}
-
-task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar, dependsOn: 'casServerOverlay') {
-    contextPath = "/cas"
-    connectors = [new org.mortbay.jetty.security.SslSocketConnector()]
-    connectors[0].port = 9443
-    connectors[0].keystore = connectors[0].truststore = keystore
-    connectors[0].keyPassword = connectors[0].trustPassword = password
-    connectors[0].wantClientAuth = true
-    connectors[0].needClientAuth = false
-    webApp = casServerOverlay.customWar
-
-    inputs.file casServerOverlay.customWar
-
-    doFirst() {
-        System.setProperty('javax.net.ssl.trustStore', keystore)
-        System.setProperty('javax.net.ssl.trustStorePassword', password)
-    }
-}
-
-task cas (dependsOn: [jettyRunWar, casServer]) {
+task casServer(dependsOn: ':spring-security-samples-casserver:casServer') {
 }
 
 integrationTest.dependsOn cas
 integrationTest.doFirst {
-    systemProperties['cas.server.host'] = casServer.httpsHost
+    systemProperties['cas.server.host'] = casServer().httpsHost
     systemProperties['cas.service.host'] = jettyRunWar.httpsHost
     systemProperties['jar.path'] = jar.archivePath
     systemProperties['javax.net.ssl.trustStore'] = keystore
@@ -132,12 +84,22 @@ integrationTest.doFirst {
 }
 
 gradle.taskGraph.whenReady {graph ->
+    def casServer = casServer()
+    [casServer,jettyRunWar]*.metaClass*.getHttpsConnector {->
+        delegate.connectors.find { it instanceof org.mortbay.jetty.security.SslSocketConnector }
+    }
+    [casServer,jettyRunWar]*.metaClass*.getHttpsHost {->
+        "localhost:"+delegate.httpsConnector.port
+    }
+    jettyRunWar.metaClass.getHttpConnector {->
+        delegate.connectors.find { it instanceof org.mortbay.jetty.nio.SelectChannelConnector }
+    }
     if (graph.hasTask(cas)) {
         jettyRunWar.dependsOn(casServer)
         casServer.daemon = true
     }
     if(graph.hasTask(integrationTest)) {
-        casServerOverlay.logLevel = 'ERROR'
+        tasks.getByPath(':spring-security-samples-casserver:casServerOverlay').logLevel = 'ERROR'
         jettyRunWar.additionalRuntimeJars += file("src/integration-test/resources")
 
         jettyRunWar.daemon = true
@@ -146,15 +108,11 @@ gradle.taskGraph.whenReady {graph ->
         casServer.httpsConnector.port = availablePort()
     }
 }
-[casServer,jettyRunWar]*.metaClass*.getHttpsConnector {->
-    delegate.connectors.find { it instanceof org.mortbay.jetty.security.SslSocketConnector }
-}
-[casServer,jettyRunWar]*.metaClass*.getHttpsHost {->
-    "localhost:"+delegate.httpsConnector.port
-}
-jettyRunWar.metaClass.getHttpConnector {->
-    delegate.connectors.find { it instanceof org.mortbay.jetty.nio.SelectChannelConnector }
+
+def casServer() {
+    tasks.getByPath(':spring-security-samples-casserver:casServer')
 }
+
 def availablePort() {
     ServerSocket server = new ServerSocket(0)
     int port = server.localPort

samples/cas/src/cas-server-overlay/webapp/WEB-INF/classes/log4j.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration debug="false" xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %p [%c] - &lt;%m&gt;%n"/>
-        </layout>
-    </appender>
-    <logger name="org.jasig" additivity="true">
-        <level value="@logLevel@" />
-    </logger>
-    <root>
-        <level value="ERROR"/>
-        <appender-ref ref="console"/>
-    </root>
-</log4j:configuration>

samples/cas/src/cas-server-overlay/webapp/WEB-INF/spring-configuration/zzzhttpClientCustomization.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
-    <description>
-        Customizations to the CAS Server. The name starts with zzz to ensure it is the last file loaded to override other bean definitions.
-    </description>
-
-    <!-- Make requests synchronous. This ensures that Single Logout has completed before the Logout page renders. -->
-    <bean id="httpClient" class="org.jasig.cas.util.HttpClient"
-      p:readTimeout="5000"
-      p:connectionTimeout="5000">
-      <property name="executorService">
-        <bean class="org.springframework.core.task.support.ExecutorServiceAdapter">
-            <constructor-arg>
-                <bean class="org.springframework.core.task.SyncTaskExecutor"/>
-            </constructor-arg>
-        </bean>
-      </property>
-    </bean>
-</beans>