1 files changed, 21 insertions, 24 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
index 44beb40..d018a13 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
@@ -19,6 +19,7 @@ import at.knowcenter.wag.egov.egiz.sig.connectors.Connector;
 import at.knowcenter.wag.egov.egiz.sig.connectors.LocalConnector;
 import at.knowcenter.wag.egov.egiz.sig.connectors.TemplateReplaces;
 import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedIdFormatter;
+import at.knowcenter.wag.egov.egiz.sig.sigkz.SigKZIDHelper;
 import at.knowcenter.wag.egov.egiz.tools.CodingHelper;
 import at.knowcenter.wag.egov.egiz.tools.FileHelper;
 
@@ -120,10 +121,6 @@ public class DetachedBKUConnector implements Connector, LocalConnector
     return so;
   }
 
-
-
-
-
   public static String[] parseSigIds(String sig_ids)
   {
     if (sig_ids == null || sig_ids.length() == 0)
@@ -292,29 +289,29 @@ public class DetachedBKUConnector implements Connector, LocalConnector
    * @throws ConnectorException
    *           f.e.
    */
-  public String prepareVerifyRequest(SignatureData data,
-      SignSignatureObject so) throws ConnectorException
+  public String prepareVerifyRequest(SignatureData data, SignSignatureObject so) throws ConnectorException
   {
     String verify_request_template = this.environment.getVerifyRequestTemplate();
 
     String xml_content = null;
-    // TODO implement MOA
-    // if (sigObject.isMOASigned())
-    // {
-    // MOAConnector moa_conn = new MOAConnector();
-    // // get the MOA-template
-    // verify_template_str = moa_conn.getVerifyTemplate(normalizedText,
-    // sigObject);
-    // }
-    // else
-    // {
-    // get the BKU-template
-    xml_content = prepareXMLContent(data, so);
-    // }
+    if (SigKZIDHelper.isMOASigned(so))
+    {
+      // TODO once the detached moa connector is fully functional - implement this.
+      log.error("Zur Zeit gibt es keinen detached MOA connector fuer die Verifikation.");
+      throw new ConnectorException(300, "Detached MOA is disabled.");
+      // MOAConnector moa_conn = new MOAConnector();
+      // // get the MOA-template
+      // verify_template_str = moa_conn.getVerifyTemplate(normalizedText,
+      // sigObject);
+    }
+    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.LOC_REF_CONTENT_REPLACE, this.environment.getLocRefContent());
-    
+
     return verify_request_xml;
   }
 
@@ -441,7 +438,6 @@ public class DetachedBKUConnector implements Connector, LocalConnector
     return signature_response;
   }
 
-
   /**
    * Holds environment configuration information like templates.
    * 
@@ -490,7 +486,7 @@ public class DetachedBKUConnector implements Connector, LocalConnector
     protected static final String RSA_CERT_ALG_KEY = "cert.alg.rsa"; //$NON-NLS-1$
 
     protected String loc_ref_content = null;
-    
+
     protected String sign_keybox_identifier = null;
 
     protected String sign_request_template = null;
@@ -518,7 +514,7 @@ public class DetachedBKUConnector implements Connector, LocalConnector
     public Environment(String profile, String loc_ref_content) throws ConnectorException
     {
       this.loc_ref_content = loc_ref_content;
-      
+
       SettingsReader settings = null;
       try
       {
@@ -566,13 +562,14 @@ public class DetachedBKUConnector implements Connector, LocalConnector
 
     /**
      * Returns the LocRef content.
+     * 
      * @return Returns the LocRef content.
      */
     public String getLocRefContent()
     {
       return this.loc_ref_content;
     }
-    
+
     /**
      * Returns the sign keybox identifier.
      *