From 457ea1c16e4238faf5d78ca6e3866cc0d2e87a15 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Thu, 9 Oct 2014 13:42:17 +0200 Subject: MOA changes --- pdf-as-moa/build.gradle | 5 +++++ pdf-as-moa/src/generated/java/META-INF/MANIFEST.MF | 3 +++ pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java | 2 +- pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java | 5 ++--- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 pdf-as-moa/src/generated/java/META-INF/MANIFEST.MF (limited to 'pdf-as-moa') diff --git a/pdf-as-moa/build.gradle b/pdf-as-moa/build.gradle index 459a75df..c00c456b 100644 --- a/pdf-as-moa/build.gradle +++ b/pdf-as-moa/build.gradle @@ -75,6 +75,11 @@ task wsdl2Java() { } } +task releases(type: Copy) { + from jar.outputs + into rootDir.toString() + "/releases/" + version +} + test { systemProperties 'property': 'value' } diff --git a/pdf-as-moa/src/generated/java/META-INF/MANIFEST.MF b/pdf-as-moa/src/generated/java/META-INF/MANIFEST.MF new file mode 100644 index 00000000..5e949512 --- /dev/null +++ b/pdf-as-moa/src/generated/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java index 1b4064a5..405c02a6 100644 --- a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java +++ b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java @@ -136,7 +136,7 @@ public class MOAConnector implements ISignatureConnector, logger.info("signing with MOA @ " + this.moaEndpoint); URL moaUrl; try { - moaUrl = new URL(this.moaEndpoint); + moaUrl = new URL(this.moaEndpoint+"?wsdl"); } catch (MalformedURLException e1) { throw new PdfAsException("Invalid MOA endpoint!", e1); } diff --git a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java index 42af02f7..f71dceee 100644 --- a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java +++ b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java @@ -18,8 +18,6 @@ import org.slf4j.LoggerFactory; import org.w3._2000._09.xmldsig.KeyInfoType; import org.w3._2000._09.xmldsig.X509DataType; -import com.sun.org.apache.xerces.internal.dom.ElementNSImpl; - import at.gv.e_government.reference.namespace.moa._20020822.CMSContentBaseType; import at.gv.e_government.reference.namespace.moa._20020822.CMSDataObjectOptionalMetaType; import at.gv.e_government.reference.namespace.moa._20020822.CheckResultType; @@ -53,7 +51,8 @@ public class MOAVerifier implements IVerifier { List resultList = new ArrayList(); try { logger.info("verification with MOA @ " + this.moaEndpoint); - URL moaUrl = new URL(this.moaEndpoint); + + URL moaUrl = new URL(this.moaEndpoint + "?wsdl"); SignatureVerificationService service = new SignatureVerificationService(moaUrl); -- cgit v1.2.3