From 295078772e6786b5ba1a6933133f977e2e93d3b5 Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
Date: Wed, 22 Oct 2014 09:39:52 +0200
Subject: MOA performance improved. No live client generation from online
 service wsdl

---
 pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java | 6 +++---
 pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java  | 4 ++--
 pdf-as-moa/src/main/resources/wsdl/MOA-SPSS-1.5.2.xsd           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'pdf-as-moa')

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 d79320e3..a44d6ea5 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,13 +136,13 @@ public class MOAConnector implements ISignatureConnector,
 			RequestedSignature requestedSignature) throws PdfAsException {
 		
 		logger.info("signing with MOA @ " + this.moaEndpoint);
-		URL moaUrl;
+		/*URL moaUrl;
 		try {
 			moaUrl = new URL(this.moaEndpoint+"?wsdl");
 		} catch (MalformedURLException e1) {
 			throw new PdfAsException("Invalid MOA endpoint!", e1);
-		}
-		SignatureCreationService service = new SignatureCreationService(moaUrl);
+		}*/
+		SignatureCreationService service = new SignatureCreationService();
 		
 		SignatureCreationPortType creationPort = service.getSignatureCreationPort();
 		BindingProvider provider = (BindingProvider) creationPort;
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 f71dceee..45f9a223 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
@@ -52,9 +52,9 @@ public class MOAVerifier implements IVerifier {
 		try {
 			logger.info("verification with MOA @ " + this.moaEndpoint);
 
-			URL moaUrl = new URL(this.moaEndpoint + "?wsdl");
+			//URL moaUrl = new URL(this.moaEndpoint + "?wsdl");
 			
-			SignatureVerificationService service = new SignatureVerificationService(moaUrl);
+			SignatureVerificationService service = new SignatureVerificationService();
 			
 			SignatureVerificationPortType verificationPort = service.getSignatureVerificationPort();
 			BindingProvider provider = (BindingProvider) verificationPort;
diff --git a/pdf-as-moa/src/main/resources/wsdl/MOA-SPSS-1.5.2.xsd b/pdf-as-moa/src/main/resources/wsdl/MOA-SPSS-1.5.2.xsd
index cc0a7c88..9b94d993 100644
--- a/pdf-as-moa/src/main/resources/wsdl/MOA-SPSS-1.5.2.xsd
+++ b/pdf-as-moa/src/main/resources/wsdl/MOA-SPSS-1.5.2.xsd
@@ -3,8 +3,8 @@
   MOA SP/SS 2.0.0 Schema
 -->
 <xsd:schema xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">
-	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="./xmldsig-core-schema.xsd"/>
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="./xml.xsd"/>
 	<!--########## Create CMS Signature ###-->
 	<!--### Create CMS Signature Request ###-->
 	<xsd:element name="CreateCMSSignatureRequest">
-- 
cgit v1.2.3