update gradle version and build process to assemble release packages

1 files changed, 48 insertions, 55 deletions

diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle
index f03d350..3ac9f32 100644
--- a/moaSig/moa-sig/build.gradle
+++ b/moaSig/moa-sig/build.gradle
@@ -1,34 +1,20 @@
 apply plugin: 'war'
 apply plugin: 'eclipse'
 apply plugin: 'eclipse-wtp'
-//apply from: 'https://raw.github.com/akhikhl/gretty/master/pluginScripts/gretty.plugin'
+apply plugin: 'distribution'
 apply plugin: 'maven-publish'
 
-repositories {
-    maven {
-        url "http://joinup.ec.europa.eu/site/pdf-as/maven/"
-    }
-}
-
 dependencies {
-	compile project(':moa-sig-lib')
-    compile project(':moa-asic')
-	compile fileTree(dir: 'libs', include: '*.jar')
-	providedCompile 'javax.servlet:servlet-api:2.4'
-	compile 'commons-discovery:commons-discovery:0.5'
-	compile 'org.slf4j:slf4j-log4j12:1.7.30'
+	implementation project(':common')
+	implementation project(':moa-sig-lib')
+    implementation project(':moa-asic')
+	implementation fileTree(dir: 'libs', include: '*.jar')
+	compileOnly 'javax.servlet:servlet-api:2.4'
+	
+	implementation 'commons-discovery:commons-discovery:0.5'
+	implementation 'org.slf4j:slf4j-log4j12:1.7.30'
     implementation group: 'javax.jws', name: 'javax.jws-api', version: '1.1'
 		
-	//compile group: 'org.slf4j', name: 'log4j-over-slf4j', version: '1.7.30'
-	
-	//compile 'org.apache.cxf:cxf-rt-frontend-jaxws:3.1.4'
-	//compile 'org.apache.cxf:cxf-rt-transports-http:3.1.4'
-	//compile 'org.aspectj:aspectjrt:1.8.7'
-	//compile 'org.aspectj:aspectjweaver:1.8.7'
-	
-	//compile 'at.gv.egiz.pdfas:pdf-as-lib:4.0.7'
-	//compile 'at.gv.egiz.pdfas:pdf-as-pdfbox:4.0.7'
-	//compile 'at.gv.egiz.pdfas:sigs-pades:4.0.7'
 }
 
 sourceSets {
@@ -40,7 +26,8 @@ sourceSets {
 }
 
 war {
-	baseName = "moa-spss"
+	archiveBaseName = "moa-spss"
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 configurations {
@@ -49,34 +36,19 @@ configurations {
 
 dependencies {
     jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.2.4-1'
-    compile group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3'
-    compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
-    //def tomcatVersion = '7.0.59'
-    //tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
-    //       "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
-    //       "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
+    implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
 }
 
-//gretty {
-//	jvmArgs = [
-//		'-Dmoa.spss.server.configuration=/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/spss.config.xml',
-//		'-Dlog4j.configuration=/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/log4j.properties'
-//	]
-//	loggingLevel = "TRACE"
-//    servletContainer = 'tomcat8'
-//}
-
 task jaxb () {
     // output directory
     def jaxbTargetDir = file( "${projectDir}/src/generated/java" )
-    //jaxbTargetDirMoaSig = file( jaxbTargetDir.path )
 
     // perform actions
     doLast {
         jaxbTargetDir.mkdirs()
 
         ant.taskdef(name: 'xjc', classname: 'com.sun.tools.xjc.XJCTask', classpath: configurations.jaxb.asPath)
-        //ant.jaxbTargetDirMoaSig = jaxbTargetDir
 
         // MOA Sig 
         ant.xjc(
@@ -87,20 +59,41 @@ task jaxb () {
     }
 }
 
-task releases(type: Copy) {
-    from war.outputs
-    into rootDir.toString() + "/releases/" + version
+distributions {
+  main {
+   distributionBaseName = "moa-spss"
+    contents {    	
+      into('/') {  // Copy the following jars to the lib/ directory in the distribution archive
+      	from war.outputs
+        from "$rootDir/../release-infos/readme_" + "$version" + ".txt"                
+        dirMode = 0755
+        fileMode = 0644
+      }
+      into('/handbook') {      
+      	from rootDir.toString() + "/../release-infos/handbook/"
+      }
+      into('/endorsed_libs') {      
+      	from findJar('serializer')
+      	from findJar('xalan')
+      	from findJar('xercesImpl')
+      	from findJar('xml-apis') 
+      }
+      into('/ext_libs') {      
+      	from findJar('iaik_jce_full')
+      	from rootDir.toString() + "/../release-infos/ext_libs/"
+       
+      }
+    }
+  }
 }
 
-//compileJava.dependsOn jaxb
-// context where tomcat is deployed, by defautl localhost:8080/
-
-//tomcat {
-//	stopKey = 'x'
-	//daemon = true
-//}
-//System.setProperty('moa.spss.server.configuration', '/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/spss.config.xml')
-//	System.setProperty('log4j.configuration', '/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/log4j.properties')
+def findJar(prefix) { 
+    configurations.runtimeClasspath.filter { it.name.startsWith(prefix) }
+    
+}
 
-//tomcatRun.contextPath = '/'
-//tomcatRunWar.contextPath = '/'
+task releases(type: Copy) {
+    from distZip.outputs
+	from distTar.outputs
+    into rootDir.toString() + "/releases/" + version
+}