From 1b337e50a9edb280aea49879f901613e1fe17b55 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Fri, 26 Nov 2010 12:01:18 +0000
Subject: Changes for xmldsig reconstruction

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@612 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../connectors/mocca/LocRefDetachedMOCCAConnector.java  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca')

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
index 0101c51..6f872f2 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
@@ -8,14 +8,13 @@ import java.util.regex.Pattern;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-
 import at.gv.egiz.pdfas.algorithmSuite.AlgorithmSuiteObject;
 import at.gv.egiz.pdfas.algorithmSuite.AlgorithmSuiteUtil;
+import at.gv.egiz.pdfas.api.xmldsig.XMLDsigData;
 import at.gv.egiz.pdfas.exceptions.ErrorCode;
 import at.gv.egiz.pdfas.framework.ConnectorParameters;
 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;
 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;
-import at.knowcenter.wag.egov.egiz.exceptions.SettingNotFoundException;
 import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;
 import at.knowcenter.wag.egov.egiz.sig.SignatureData;
 import at.knowcenter.wag.egov.egiz.sig.SignatureResponse;
@@ -26,18 +25,16 @@ import at.knowcenter.wag.egov.egiz.sig.connectors.TemplateReplaces;
 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.BKUHelper;
 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.BKUPostConnection;
 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject;
-import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedMOCIdFormatter;
-import at.knowcenter.wag.egov.egiz.sig.sigkz.SigKZIDHelper;
 import at.knowcenter.wag.egov.egiz.sig.signaturelayout.SignatureLayoutHandler;
 import at.knowcenter.wag.egov.egiz.sig.signaturelayout.SignatureLayoutHandlerFactory;
 import at.knowcenter.wag.egov.egiz.tools.CodingHelper;
-import at.knowcenter.wag.egov.egiz.tools.FileHelper;
 
 /**
  * Connector for MOCCA.
  * @author tknall
  */
 public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
+ //23.11.2010 changed by exthex - added reconstructXMLDsig method and moved xmldsig creation to chooseAndCreateXMLDsig method
 
    private static Log log = LogFactory.getLog(LocRefDetachedMOCCAConnector.class);
 
@@ -120,7 +117,7 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
     * Verification is not supported by MOCCA. Therefore this method always throws a
     * {@link ConnectorException} with error code {@link ErrorCode#SIGNATURE_VERIFICATION_NOT_SUPPORTED}.
     */
-   public SignatureResponse doVerify(SignatureData data, SignSignatureObject so) throws ConnectorException {
+   public SignatureResponse doVerify(SignatureData data, SignSignatureObject so, XMLDsigData dsig) throws ConnectorException {
       throw new ConnectorException(ErrorCode.SIGNATURE_VERIFICATION_NOT_SUPPORTED, "Signature Verification is not supported by MOCCA.");
    }
 
@@ -194,7 +191,7 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
     * Verification is not supported by MOCCA. Therefore this method always throws a
     * {@link ConnectorException} with error code {@link ErrorCode#SIGNATURE_VERIFICATION_NOT_SUPPORTED}.
     */
-   public String prepareVerifyRequest(SignatureData data, SignSignatureObject so) throws ConnectorException {
+   public String prepareVerifyRequest(SignatureData data, SignSignatureObject so, XMLDsigData dsigData) throws ConnectorException {
       throw new ConnectorException(ErrorCode.SIGNATURE_VERIFICATION_NOT_SUPPORTED, "Signature Verification is not supported by MOCCA.");
    }
 
@@ -594,4 +591,10 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
       return result;
    }
 
+   public XMLDsigData reconstructXMLDsig(SignatureData data, SignSignatureObject so)
+       throws ConnectorException {
+     String xmldsig = prepareXMLContent(data, so);
+     return new XMLDsigData(xmldsig, true);
+   }
+
 }
-- 
cgit v1.2.3