A lot of moa sig stuff

6 files changed, 40 insertions, 36 deletions

diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
index a18ee9f..9fa99b1 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
@@ -33,7 +33,9 @@ import java.util.Iterator;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.axis.AxisEngine;
 import org.apache.axis.AxisFault;
+import org.apache.axis.AxisProperties;
 import org.apache.axis.Message;
 import org.apache.axis.MessageContext;
 import org.apache.axis.attachments.AttachmentPart;
@@ -45,17 +47,17 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 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.transaction.TransactionIDGenerator;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 
 /**
  * An handler that is invoked on each web service request and performs some
@@ -141,9 +143,9 @@ public class AxisHandler extends BasicHandler {
 			// Boolean.FALSE);
 			// msgContext.setProperty(org.apache.axis.
 			// AxisEngine.PROP_ENABLE_NAMESPACE_PREFIX_OPTIMIZATION,"false");
-
+			//AxisProperties.setProperty(AxisEngine.PROP_ATTACHMENT_IMPLEMENTATION, AxisEngine.DEFAULT_ATTACHMENT_IMPL);
 			Message soapMessage = msgContext.getCurrentMessage();
-
+			
 			ConfigurationProvider configuration = ConfigurationProvider.getInstance();
 
 			Element xmlRequest = null;
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java
index 5fe96ef..43804a2 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java
@@ -20,12 +20,12 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.config.KeyGroupEntry;
 import at.gv.egovernment.moa.spss.server.logging.TransactionId;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionIDGenerator;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * 
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
index bfefaec..6164154 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
@@ -35,15 +35,14 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
 import at.gv.egovernment.moa.spss.server.init.*;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 
 /**
  * A servlet to initialize and update the MOA configuration.
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
index d986f7a..03eb3d3 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
@@ -31,9 +31,9 @@ import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.util.MOASPSSEntityResolver;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.MOAErrorHandler;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.MOAErrorHandler;
 
 /**
  * Helper methods for the Service classes.
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
index 0c800a2..4effec6 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
@@ -32,7 +32,6 @@ import org.apache.axis.AxisFault;
 import org.apache.axis.i18n.Messages;
 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.cmssign.CreateCMSSignatureRequest;
@@ -52,8 +51,9 @@ import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRequest;
 import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRespone;
 import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFSignatureRequestParser;
 import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFSignatureResponseBuilder;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.StreamUtils;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.StreamUtils;
 
 /**
  * The service endpoint for the <code>SignatureCreation</code> web service.
@@ -100,7 +100,7 @@ public class SignatureCreationService {
 	        new CreatePDFSignatureResponseBuilder();
 	      Element reparsedReq;
 	      CreatePDFRequest requestObj;
-	      CreatePDFRespone responseObj;
+	      CreatePDFRespone responseObj = null;
 
 	      //since Axis (1.1 ff) has problem with namespaces we take the raw request stored by the Axishandler.
 	      TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
@@ -115,7 +115,7 @@ public class SignatureCreationService {
 	      
 		  Logger.trace(">>> creating Signature");
 	      // invoke the core logic
-	      responseObj = PDFASInvoker.getInstance().createPDFSignature(requestObj, context.getTransactionID());
+	      //responseObj = PDFASInvoker.getInstance().createPDFSignature(requestObj, context.getTransactionID());
 		  Logger.trace("<<< created Signature");
 
 		  Logger.trace(">>> building Response");
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();