aboutsummaryrefslogtreecommitdiff
path: root/moaSig
diff options
context:
space:
mode:
Diffstat (limited to 'moaSig')
-rw-r--r--moaSig/build.gradle31
-rw-r--r--moaSig/common/build.gradle18
-rw-r--r--moaSig/gradle/wrapper/gradle-wrapper.jarbin55616 -> 55627 bytes
-rw-r--r--moaSig/gradle/wrapper/gradle-wrapper.properties4
-rwxr-xr-xmoaSig/gradlew22
-rw-r--r--moaSig/gradlew.bat18
-rw-r--r--moaSig/libs/tsl-lib-2.0.3.jarbin978757 -> 0 bytes
-rw-r--r--moaSig/moa-asic/build.gradle21
-rw-r--r--moaSig/moa-sig-lib/build.gradle49
-rw-r--r--moaSig/moa-sig/build.gradle103
10 files changed, 119 insertions, 147 deletions
diff --git a/moaSig/build.gradle b/moaSig/build.gradle
index accdcad..3935b41 100644
--- a/moaSig/build.gradle
+++ b/moaSig/build.gradle
@@ -10,20 +10,30 @@ buildscript {
}
subprojects {
- apply plugin: 'java'
+ apply plugin: 'java-library'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
repositories {
mavenCentral()
+
+ maven {
+ url "https://apps.egiz.gv.at/maven/"
+ mavenContent {
+ releasesOnly()
+ }
+ }
+ maven {
+ url "https://apps.egiz.gv.at/maven-snapshot/"
+ mavenContent {
+ snapshotsOnly()
+ }
+ }
+
}
-
- tasks.withType(JavaCompile) {
- options.compilerArgs << '-Xlint:-options'
- }
dependencies {
- testCompile 'junit:junit:4.12'
+ testImplementation 'junit:junit:4.13.2'
}
version = '3.1.4-RC1'
@@ -31,10 +41,13 @@ subprojects {
jar { manifest.attributes provider: 'EGIZ', 'Specification-Version': getCheckedOutGitCommitHash(), 'Implementation-Version': project.version }
compileJava {
- sourceCompatibility = 1.7
- targetCompatibility = 1.7
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
}
-
+
+ tasks.withType(JavaCompile) {
+ options.compilerArgs << '-Xlint:-options'
+ }
publishing {
publications {
diff --git a/moaSig/common/build.gradle b/moaSig/common/build.gradle
index 5e0d04f..5e9122b 100644
--- a/moaSig/common/build.gradle
+++ b/moaSig/common/build.gradle
@@ -1,16 +1,16 @@
dependencies {
- compile files('../libs/iaik_jce_full-5.62_moa.jar')
-
- compile 'org.slf4j:slf4j-api:1.7.30'
- compile 'xerces:xercesImpl:2.12.0'
- compile 'xalan:xalan:2.7.1'
- compile 'joda-time:joda-time:2.10.6'
- compile 'jaxen:jaxen:1.2.0'
+ implementation files('../libs/iaik_jce_full-5.62_moa.jar')
+ api 'org.slf4j:slf4j-api:1.7.30'
+ api 'xerces:xercesImpl:2.12.0'
+ api 'xalan:xalan:2.7.1'
+ api group: 'xalan', name: 'serializer', version: '2.7.1'
+ api 'joda-time:joda-time:2.10.10'
+ api 'jaxen:jaxen:1.2.0'
}
task testJar(type: Jar, dependsOn: testClasses) {
- baseName = "test-${project.archivesBaseName}"
from sourceSets.test.output
+ classifier = 'tests'
}
configurations {
@@ -18,6 +18,6 @@ configurations {
}
artifacts {
- tests testJar
+ archives testJar
}
diff --git a/moaSig/gradle/wrapper/gradle-wrapper.jar b/moaSig/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..75ae3ac 100644
--- a/moaSig/gradle/wrapper/gradle-wrapper.jar
+++ b/moaSig/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/moaSig/gradle/wrapper/gradle-wrapper.properties b/moaSig/gradle/wrapper/gradle-wrapper.properties
index 5028f28..e6fc1b1 100644
--- a/moaSig/gradle/wrapper/gradle-wrapper.properties
+++ b/moaSig/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
-zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/moaSig/gradlew b/moaSig/gradlew
index 83f2acf..cccdd3d 100755
--- a/moaSig/gradlew
+++ b/moaSig/gradlew
@@ -1,21 +1,5 @@
#!/usr/bin/env sh
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
##############################################################################
##
## Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -125,8 +109,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/moaSig/gradlew.bat b/moaSig/gradlew.bat
index 24467a1..e95643d 100644
--- a/moaSig/gradlew.bat
+++ b/moaSig/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -30,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/moaSig/libs/tsl-lib-2.0.3.jar b/moaSig/libs/tsl-lib-2.0.3.jar
deleted file mode 100644
index e1321ac..0000000
--- a/moaSig/libs/tsl-lib-2.0.3.jar
+++ /dev/null
Binary files differ
diff --git a/moaSig/moa-asic/build.gradle b/moaSig/moa-asic/build.gradle
index 8df208c..3ef15cb 100644
--- a/moaSig/moa-asic/build.gradle
+++ b/moaSig/moa-asic/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java-library-distribution'
distributions {
main{
- baseName = 'MOA-ASIC'
+ distributionBaseName = 'MOA-ASIC'
}
}
@@ -11,17 +11,14 @@ configurations {
}
dependencies {
-
jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.2.11'
- compile project(':common')
- compile project(':moa-sig-lib')
- compile 'org.slf4j:slf4j-log4j12:1.7.30'
- implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
- implementation group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1'
- //implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.2.11'
- //implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.2.11'
- //implementation group: 'com.sun.xml.ws', name: 'jaxws-ri', version: '2.2.10', ext: 'pom'
+ implementation project(':common')
+ implementation project(':moa-sig-lib')
+ implementation 'org.slf4j:slf4j-log4j12:1.7.30'
+ api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+ api group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1'
+
}
sourceSets {
@@ -54,8 +51,8 @@ task jaxb () {
}
task releases(type: Copy) {
- from jar.outputs
- from distZip.outputs
+ //from jar.outputs
+ //from distZip.outputs
from distTar.outputs
into rootDir.toString() + "/releases/" + version
}
diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle
index 510603b..bb1a8d3 100644
--- a/moaSig/moa-sig-lib/build.gradle
+++ b/moaSig/moa-sig-lib/build.gradle
@@ -2,37 +2,38 @@ apply plugin: 'java-library-distribution'
apply plugin: 'maven-publish'
distributions {
- main{
- baseName = 'MOA-SPSS'
+ main {
+ distributionBaseName = 'moa-spss-lib'
}
}
-dependencies {
- compile fileTree(dir: '../libs', include: '*.jar')
- compile project(':common')
- testCompile project(path: ':common', configuration: 'tests')
+dependencies {
+ implementation project(':common')
+ testImplementation project(path: ':common')
- compile 'log4j:log4j:1.2.17'
- compile 'commons-logging:commons-logging:1.2'
- compile 'commons-io:commons-io:2.7'
- compile 'commons-codec:commons-codec:1.14'
- compile 'org.apache.axis:axis-jaxrpc:1.4'
- compile 'org.xerial:sqlite-jdbc:3.32.3.2'
- compile 'javax.xml.bind:jaxb-api:2.3.1'
- compile 'com.sun.xml.bind:jaxb-core:2.3.0.1'
- compile 'com.sun.xml.bind:jaxb-impl:2.3.2'
- compile 'org.postgresql:postgresql:42.2.15.jre7'
- compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.21'
- compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.21'
- compile group: 'org.apache.pdfbox', name: 'pdfbox-app', version: '2.0.21'
- compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.21'
- compile group: 'org.apache.pdfbox', name: 'preflight-app', version: '2.0.21'
- compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
- compile group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: '4.5.12'
+ api fileTree(dir: '../libs', include: '*.jar')
+ api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.0.4'
+ api 'log4j:log4j:1.2.17'
+ api 'commons-logging:commons-logging:1.2'
+ api 'commons-io:commons-io:2.8.0'
+ api 'commons-codec:commons-codec:1.15'
+ api 'org.apache.axis:axis-jaxrpc:1.4'
+ api 'org.xerial:sqlite-jdbc:3.34.0'
+ api 'javax.xml.bind:jaxb-api:2.3.1'
+ api 'com.sun.xml.bind:jaxb-core:2.3.0.1'
+ api 'com.sun.xml.bind:jaxb-impl:2.3.2'
+ api 'org.postgresql:postgresql:42.2.19.jre7'
+ api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.23'
+ api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.23'
+ api group: 'org.apache.pdfbox', name: 'pdfbox-app', version: '2.0.23'
+ api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.23'
+ api group: 'org.apache.pdfbox', name: 'preflight-app', version: '2.0.23'
+ api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+ api group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: '4.5.13'
}
task releases(type: Copy) {
- from jar.outputs
+ //from jar.outputs
from distZip.outputs
from distTar.outputs
into rootDir.toString() + "/releases/" + version
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
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 21:57:33 +0000