A lot of moa sig stuff

1 files changed, 18 insertions, 15 deletions

diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
index f676ed4..8278399 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
@@ -27,28 +27,23 @@ package at.gv.egovernment.moa.spss.server.service;
 import org.apache.axis.AxisFault;
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureRequestParser;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureResponseBuilder;
+import at.gv.egovernment.moa.spss.api.xmlbind.VerifyPDFSignatureResponseBuilder;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureRequestParser;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureResponseBuilder;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker;
-import at.gv.egovernment.moa.spss.server.invoke.PDFASInvoker;
 import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequest;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequestParser;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponseBuilder;
-import at.gv.egovernment.moa.util.StreamUtils;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.StreamUtils;
 
 /**
  * The service endpoint for the <code>SignatureVerification</code> web service.
@@ -69,20 +64,28 @@ public class SignatureVerificationService {
 	   */
 	  public Element[] VerifyPDFSignatureRequest(Element[] request)
 	    throws AxisFault {
-	    PDFASInvoker invoker =
-	    		PDFASInvoker.getInstance();
+		CMSSignatureVerificationInvoker invoker =
+			      CMSSignatureVerificationInvoker.getInstance();
 	    Element[] response = new Element[1];
 	    
 	    try {
-	             
+	       
+	    	// create a parser and builder for binding API objects to/from XML
+	        VerifyCMSSignatureRequestParser requestParser =
+	          new VerifyCMSSignatureRequestParser();
+	        VerifyPDFSignatureResponseBuilder responseBuilder =
+	          new VerifyPDFSignatureResponseBuilder();
+	        Element reparsedReq;
+	        VerifyCMSSignatureRequest requestObj;
+	        VerifyCMSSignatureResponse responseObj;
 	      // create a parser and builder for binding API objects to/from XML
-	      VerifyPDFRequestParser requestParser =
+	      /*VerifyPDFRequestParser requestParser =
 	        new VerifyPDFRequestParser();
 	      VerifyPDFResponseBuilder responseBuilder =
 	        new VerifyPDFResponseBuilder();
 	      Element reparsedReq;
 	      VerifyPDFRequest requestObj;
-	      VerifyPDFResponse responseObj;
+	      VerifyPDFResponse responseObj;*/
 
 	      //since Axis (1.1 ff) has problem with namespaces we take the raw request stored by the Axishandler.
 	      TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
@@ -90,10 +93,10 @@ public class SignatureVerificationService {
 	      reparsedReq = ServiceUtils.reparseRequest(request[0]);//context.getRequest());
 	      
 	      // convert to API objects
-	      requestObj = requestParser.parse(reparsedReq);
+	      requestObj = requestParser.parsePDF(reparsedReq);
 
 	      // invoke the core logic
-	      responseObj = invoker.verifyPDFSignature(requestObj);
+	      responseObj = invoker.verifyCMSSignature(requestObj);
 
 	      // map back to XML
 	      response[0] = responseBuilder.build(responseObj).getDocumentElement();