aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-moa
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-10-09 13:42:17 +0200
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-10-09 13:42:17 +0200
commit457ea1c16e4238faf5d78ca6e3866cc0d2e87a15 (patch)
treeaf8e6cbf52d7e0433585e6f444de08de03747243 /pdf-as-moa
parent3bd45ace2bfd7e92e744b958ec05cf89dfe602f4 (diff)
downloadpdf-as-4-457ea1c16e4238faf5d78ca6e3866cc0d2e87a15.tar.gz
pdf-as-4-457ea1c16e4238faf5d78ca6e3866cc0d2e87a15.tar.bz2
pdf-as-4-457ea1c16e4238faf5d78ca6e3866cc0d2e87a15.zip
MOA changes
Diffstat (limited to 'pdf-as-moa')
-rw-r--r--pdf-as-moa/build.gradle5
-rw-r--r--pdf-as-moa/src/generated/java/META-INF/MANIFEST.MF3
-rw-r--r--pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java2
-rw-r--r--pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java5
4 files changed, 11 insertions, 4 deletions
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<VerifyResult> resultList = new ArrayList<VerifyResult>();
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);