1 files changed, 16 insertions, 8 deletions
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.");
     }