From c10ade6cd189b02723bf365230d7152b7d0af970 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 20 Aug 2020 06:44:45 +0200 Subject: some test updates --- moaSig/moa-sig/build.gradle | 19 ++++++++++--------- .../moa/spss/server/service/ServiceUtils.java | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'moaSig/moa-sig') diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle index 24ec919..f6268c6 100644 --- a/moaSig/moa-sig/build.gradle +++ b/moaSig/moa-sig/build.gradle @@ -1,7 +1,8 @@ apply plugin: 'war' apply plugin: 'eclipse' apply plugin: 'eclipse-wtp' -apply from: 'https://raw.github.com/akhikhl/gretty/master/pluginScripts/gretty.plugin' +//apply from: 'https://raw.github.com/akhikhl/gretty/master/pluginScripts/gretty.plugin' +apply plugin: 'maven-publish' repositories { maven { @@ -53,14 +54,14 @@ dependencies { // "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}" } -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' -} +//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 diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java index 03eb3d3..697c69e 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java @@ -82,7 +82,7 @@ public class ServiceUtils { byte[] requestBytes = DOMUtils.serializeNode(request, "UTF-8"); Document validatedRequest = DOMUtils.parseDocument(new ByteArrayInputStream(requestBytes), true, - Constants.ALL_SCHEMA_LOCATIONS, + Constants.ONLY_MOASIG_SCHEMA_LOCATIONS, null, new MOASPSSEntityResolver(), new MOAErrorHandler()); -- cgit v1.2.3