From 6ef9bdefc58cb2553f23aaa9711d6341e293c9f7 Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Fri, 10 Oct 2008 11:13:40 +0000
Subject: Deprecated webapp-folder removed from svn repository. New
 DefaultConfiguration.zip integrated in order to allow mocca signatures. Minor
 bug concerning choice of cce within the web application fixed. Signature with
 new online bku MOCCA integrated (new signature device "moc" created).
 Configuration keys for mocca added. New error codes (371 = signature
 verification not supported by this connector, 372 = invalid signing time)
 introduced. Optional check of the signing time for the web application
 implemented. At signature creation time the signing time is checked for
 plausibility. This is a workaround for the ITS:mac-linux signing time bug.
 New configuration key ("signing_time_tolerance") added (applies to web
 application only) to overcome invalid signing times. A signature is only
 accepted if its signing time is within a time frame of [current time -
 signing_time_tolerance, current time + signing_time_tolerance] where
 signing_time_tolerance is interpreted as seconds. Bugfix: Correct extraction
 of signatures with wrong signing times implemented. (The order of the
 signatures is still invalid in case of false signing times.) Optional
 override of the dynamic creation of the signature retrieval url
 (locrefcontent) implemented in order to overcome ssl problems
 (retrieve_signature_data_url_override). Note: Assure that this URL is
 accessible from the citizen card environment. Download of signed pdf-file for
 external application interface adjusted. Verification of mocca signed
 documents implemented. Retrieval of xml response via multipart implemented
 (mocca strictly follows security layer spec)

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@296 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../egov/egiz/sig/connectors/ConnectorChooser.java | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

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

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/ConnectorChooser.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/ConnectorChooser.java
index e991e04..7188273 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/ConnectorChooser.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/ConnectorChooser.java
@@ -6,6 +6,7 @@ package at.knowcenter.wag.egov.egiz.sig.connectors;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import at.gv.egiz.pdfas.api.commons.Constants;
 import at.gv.egiz.pdfas.framework.ConnectorParameters;
 import at.knowcenter.wag.egov.egiz.PdfASID;
 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;
@@ -16,6 +17,7 @@ import at.knowcenter.wag.egov.egiz.sig.connectors.bku.MultipartDetachedBKUConnec
 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.OldEnvelopingBase64BKUConnector;
 import at.knowcenter.wag.egov.egiz.sig.connectors.moa.EnvelopingBase64MOAConnector;
 import at.knowcenter.wag.egov.egiz.sig.connectors.moa.MOASoapWithAttachmentConnector;
+import at.knowcenter.wag.egov.egiz.sig.connectors.mocca.LocRefDetachedMOCCAConnector;
 import at.knowcenter.wag.egov.egiz.sig.sigid.HotfixIdFormatter;
 
 /**
@@ -39,15 +41,21 @@ public final class ConnectorChooser
     log.debug("Choosing LocalConnector for signation...");
 
     log.debug("connector type = " + connector);
-
-    if (!connector.equals("bku"))
-    {
-      log.error("Currently only the BKU connector is fully implemented.");
-    }
-
-    log.debug("choosing locref detached BKU connector.");
+    
     ConnectorParameters cp = new ConnectorParameters();
     cp.setProfileId(profile);
+
+    if (Constants.SIGNATURE_DEVICE_MOC.equals(connector)) {
+    
+       return new LocRefDetachedMOCCAConnector(cp, loc_ref_url);
+       
+    } else if (Constants.SIGNATURE_DEVICE_BKU.equals(connector)){
+    
+       return new LocRefDetachedBKUConnector(cp, loc_ref_url);
+       
+    }
+    
+    log.error("Currently only the BKU connector is fully implemented.");
     return new LocRefDetachedBKUConnector(cp, loc_ref_url);
   }
 
@@ -58,7 +66,7 @@ public final class ConnectorChooser
 
     log.debug("connector type = " + connector);
 
-    if (!connector.equals("moa"))
+    if (!connector.equals(Constants.SIGNATURE_DEVICE_MOA))
     {
       log.error("Currently only the MOA connector is available for non local WEB signation.");
     }
-- 
cgit v1.2.3