SEC-1906: Update to Gradle 1.0

samples/aspectj/aspectj.gradle

@@ -6,4 +6,4 @@ dependencies {
 
     runtime project(':spring-security-config'),
             project(':spring-security-aspects')
-}
+}

samples/cas/sample/cassample.gradle

@@ -24,9 +24,7 @@ sourceSets.integrationTest {
     groovy.srcDir file('src/integration-test/groovy')
 }
 
-eclipseClasspath {
-    plusConfigurations += configurations.integrationTestRuntime
-}
+eclipse.classpath.plusConfigurations += configurations.integrationTestRuntime
 
 dependencies {
     groovy 'org.codehaus.groovy:groovy:1.7.10'
@@ -53,10 +51,10 @@ dependencies {
 
 [jettyRun, jettyRunWar]*.configure {
     contextPath = "/cas-sample"
-    def httpConnector = new org.mortbay.jetty.nio.SelectChannelConnector();
+    def httpConnector = jettyRunWar.class.classLoader.loadClass('org.mortbay.jetty.nio.SelectChannelConnector').newInstance()
     httpConnector.port = 8080
     httpConnector.confidentialPort = 8443
-    def httpsConnector = new org.mortbay.jetty.security.SslSocketConnector();
+    def httpsConnector = jettyRunWar.class.classLoader.loadClass('org.mortbay.jetty.security.SslSocketConnector').newInstance()
     httpsConnector.port = 8443
     httpsConnector.keystore = httpsConnector.truststore = keystore
     httpsConnector.keyPassword = httpsConnector.trustPassword = password
@@ -87,13 +85,15 @@ integrationTest.doFirst {
 gradle.taskGraph.whenReady {graph ->
     def casServer = casServer()
     [casServer,jettyRunWar]*.metaClass*.getHttpsConnector {->
-        delegate.connectors.find { it instanceof org.mortbay.jetty.security.SslSocketConnector }
+        def sslSocketConnClass = jettyRunWar.class.classLoader.loadClass('org.mortbay.jetty.security.SslSocketConnector')
+        delegate.connectors.find { it in sslSocketConnClass }
     }
     [casServer,jettyRunWar]*.metaClass*.getHttpsHost {->
         "localhost:"+delegate.httpsConnector.port
     }
     jettyRunWar.metaClass.getHttpConnector {->
-        delegate.connectors.find { it instanceof org.mortbay.jetty.nio.SelectChannelConnector }
+        def channelConnClass = jettyRunWar.class.classLoader.loadClass('org.mortbay.jetty.nio.SelectChannelConnector')
+        delegate.connectors.find { it in channelConnClass }
     }
     if (graph.hasTask(cas)) {
         casServer.daemon = true
@@ -118,4 +118,4 @@ def availablePort() {
     int port = server.localPort
     server.close()
     port
-}
+}

samples/cas/server/casserver.gradle

@@ -13,12 +13,12 @@ dependencies {
 }
 
 task casServerOverlay(type: Sync) {
-    war = configurations.casServer.resolve().toArray()[0]
-    warName = war.name.replace('.war','-custom')
-    overlayDir = file('src/main/webapp')
-    explodedWar = file("$buildDir/tmp/${warName}")
-    customWar = file("$buildDir/tmp/${warName}.war")
-    tokens = [logLevel: 'INFO']
+    def war = configurations.casServer.resolve().toArray()[0]
+    def warName = war.name.replace('.war','-custom')
+    def overlayDir = file('src/main/webapp')
+    def explodedWar = file("$buildDir/tmp/${warName}")
+    ext.customWar = file("$buildDir/tmp/${warName}.war")
+    ext.tokens = [logLevel: 'INFO']
 
     inputs.files(war, overlayDir)
     inputs.property('tokens',{tokens})
@@ -44,7 +44,7 @@ casServerOverlay.metaClass.setLogLevel { level ->
 
 task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar, dependsOn: 'casServerOverlay') {
     contextPath = "/cas"
-    connectors = [new org.mortbay.jetty.security.SslSocketConnector()]
+    connectors = [casServer.class.classLoader.loadClass('org.mortbay.jetty.security.SslSocketConnector').newInstance()]
     connectors[0].port = 9443
     connectors[0].keystore = connectors[0].truststore = keystore
     connectors[0].keyPassword = connectors[0].trustPassword = password
@@ -58,4 +58,4 @@ task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar, dependsOn: 'casS
         System.setProperty('javax.net.ssl.trustStore', keystore)
         System.setProperty('javax.net.ssl.trustStorePassword', password)
     }
-}
+}

samples/gae/gae.gradle

@@ -2,13 +2,19 @@ apply plugin: 'war'
 apply plugin: 'jetty'
 apply plugin: 'gae'
 
-gaeVersion="1.4.2"
+def gaeVersion="1.4.2"
 
 repositories {
-    // Hibernate Validator
-    mavenRepo name: 'JBoss', urls: 'https://repository.jboss.org/nexus/content/repositories/releases'
-    // GAE Jars
-    mavenRepo name: 'GAE', urls:'http://maven-gae-plugin.googlecode.com/svn/repository'
+    maven {
+        // Hibernate Validator
+        name =  'JBoss'
+        url = 'https://repository.jboss.org/nexus/content/repositories/releases'
+    }
+    maven {
+        // GAE Jars
+        name =  'GAE'
+        url = 'http://maven-gae-plugin.googlecode.com/svn/repository'
+    }
 }
 
 // Remove logback as it causes security issues with GAE.

samples/preauth/preauth.gradle

@@ -23,5 +23,5 @@ dependencies {
 
 jettyRun {
     contextPath = "/preauth"
-    userRealms = [new org.mortbay.jetty.security.HashUserRealm('Preauth Realm', "$projectDir/realm.properties")]
+    userRealms = [jettyRun.class.classLoader.loadClass('org.mortbay.jetty.security.HashUserRealm').newInstance('Preauth Realm', "$projectDir/realm.properties")]
 }

samples/tutorial/tutorial.gradle

@@ -34,10 +34,10 @@ dependencies {
 jettyRun {
     contextPath = "/tutorial"
 
-    def httpConnector = new org.mortbay.jetty.nio.SelectChannelConnector();
+    def httpConnector = jettyRunWar.class.classLoader.loadClass('org.mortbay.jetty.nio.SelectChannelConnector').newInstance()
     httpConnector.port = 8080
     httpConnector.confidentialPort = 8443
-    def httpsConnector = new org.mortbay.jetty.security.SslSocketConnector();
+    def httpsConnector = jettyRunWar.class.classLoader.loadClass('org.mortbay.jetty.security.SslSocketConnector').newInstance()
     httpsConnector.port = 8443
     httpsConnector.keystore = "$rootDir/samples/certificates/server.jks"
     httpsConnector.keyPassword = 'password'