1 files changed, 13 insertions, 6 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
index 4cc09e1..44a7c38 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
@@ -11,6 +11,8 @@ import java.util.Date;
 import java.util.Properties;
 import java.util.SimpleTimeZone;
 import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -29,6 +31,7 @@ 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.DetachedBKUConnector;
 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject;
+import at.knowcenter.wag.egov.egiz.sig.connectors.mocca.LocRefDetachedMOCCAConnector;
 import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedLocRefMOAIdFormatter;
 import at.knowcenter.wag.egov.egiz.sig.sigkz.SigKZIDHelper;
 import at.knowcenter.wag.egov.egiz.tools.CodingHelper;
@@ -186,15 +189,19 @@ public class MOASoapWithAttachmentConnector implements Connector
     String verify_request_template = this.environment.getVerifyRequestTemplate();
 
     String xml_content = null;
-    if (!SigKZIDHelper.isMOASigned(so))
-    {
+    
+    if (SigKZIDHelper.isMOASigned(so)) {
+       log.debug("MOA signature detected.");
+       xml_content = prepareXMLContent(data, so);
+    } else if (SigKZIDHelper.isMOCCASigned(so)) {
+       log.debug("MOCCA signature detected.");
+       LocRefDetachedMOCCAConnector mocca_connector = new LocRefDetachedMOCCAConnector(this.params, "not needed here");
+       xml_content = mocca_connector.prepareXMLContent(data, so);
+    } else {
+       log.debug("Generic signature (not MOA/MOCCA) signature detected.");
       DetachedBKUConnector bku_connector = new DetachedBKUConnector(this.params, "not needed here");
       xml_content = bku_connector.prepareXMLContent(data, so);
     }
-    else
-    {
-      xml_content = prepareXMLContent(data, so);
-    }
 
     String verify_request_xml = verify_request_template.replaceFirst(TemplateReplaces.XML_CONTENT_REPLACE, xml_content);
     verify_request_xml = verify_request_xml.replaceFirst(TemplateReplaces.TRUST_PROFILE_ID_REPLACE, this.environment.getVerifyTrustProfileId());