SOAP Service for backend upload + transaction ID fixes

3 files changed, 57 insertions, 7 deletions

diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignParameters.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignParameters.java
index 4f626e17..ad17a236 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignParameters.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignParameters.java
@@ -15,8 +15,26 @@ public class PDFASSignParameters implements Serializable {
 
 	@XmlType(name="Connector")
 	public enum Connector {
-		JKS,
-		MOA
+		JKS("jks"),
+		MOA("moa"),
+		BKU("bku"),
+		MOBILEBKU("mobilebku"),
+		ONLINEBKU("onlinebku");
+		
+		
+		private final String name;       
+
+	    private Connector(String s) {
+	        name = s;
+	    }
+
+	    public boolean equalsName(String otherName){
+	        return (otherName == null)? false:name.equals(otherName);
+	    }
+
+	    public String toString(){
+	       return name;
+	    }
 	}
 	
 	
@@ -24,8 +42,9 @@ public class PDFASSignParameters implements Serializable {
 	
 	
 	String position;
-	
-	
+	String invokeUrl;
+	String invokeErrorUrl;
+	String transactionId;
 	String profile;
 	
 	@XmlElement(required = true, nillable = false, name="connector")
@@ -53,6 +72,28 @@ public class PDFASSignParameters implements Serializable {
 		this.profile = profile;
 	}
 	
+	@XmlElement(required = false, nillable = true, name="invoke-url")
+	public String getInvokeURL() {
+		return invokeUrl;
+	}
+	public void setInvokeURL(String invokeUrl) {
+		this.invokeUrl = invokeUrl;
+	}
+	
+	@XmlElement(required = false, nillable = true, name="invoke-error-url")
+	public String getInvokeErrorURL() {
+		return invokeErrorUrl;
+	}
+	public void setInvokeErrorURL(String invokeErrorUrl) {
+		this.invokeErrorUrl = invokeErrorUrl;
+	}
 	
+	@XmlElement(required = false, nillable = true, name="transactionId")
+	public String getTransactionId() {
+		return transactionId;
+	}
+	public void setTransactionId(String transactionId) {
+		this.transactionId = transactionId;
+	}
 	
 }
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignResponse.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignResponse.java
index 1da4fa98..a43272f1 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignResponse.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignResponse.java
@@ -16,6 +16,7 @@ public class PDFASSignResponse implements Serializable {
 	String requestID;
 	String error;
 	byte[] signedPDF;
+	String redirectUrl;
 	
 	@XmlElement(required = true, nillable = false, name="requestID")
 	public String getRequestID() {
@@ -40,4 +41,12 @@ public class PDFASSignResponse implements Serializable {
 	public void setError(String error) {
 		this.error = error;
 	}
+	
+	@XmlElement(required = false, name="redirectUrl")
+	public String getRedirectUrl() {
+		return redirectUrl;
+	}
+	public void setRedirectUrl(String redirectUrl) {
+		this.redirectUrl = redirectUrl;
+	}
 }
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSigning.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSigning.java
index 63049bc5..698a2845 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSigning.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSigning.java
@@ -10,9 +10,9 @@ import javax.jws.soap.SOAPBinding.Style;
 @WebService
 @SOAPBinding(style = Style.RPC)
 public interface PDFASSigning {
-	@WebMethod(operationName = "sign")
-	@WebResult(name="signedPDF")
-	public byte[] signPDFDokument(@WebParam(name = "pdfDocument")byte[] inputDocument, @WebParam(name = "parameters")PDFASSignParameters parameters);
+	//@WebMethod(operationName = "sign")
+	//@WebResult(name="signedPDF")
+	//public byte[] signPDFDokument(@WebParam(name = "pdfDocument")byte[] inputDocument, @WebParam(name = "parameters")PDFASSignParameters parameters);
 	
 	@WebMethod(operationName = "signSingle")
 	@WebResult(name="signResponse")