Stable version.

Known problems:

Verification with MOA 1.0.0 signatures

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@151 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 1 insertions, 26 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 38680c4..4dcd1b5 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
@@ -7,9 +7,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

 

 import at.knowcenter.wag.egov.egiz.PdfASID;

-import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;

-import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;

 import at.knowcenter.wag.egov.egiz.framework.SignatorFactory;

 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.EnvelopedBase64BKUConnector;

 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.LocRefDetachedBKUConnector;

@@ -31,8 +29,6 @@ public final class ConnectorChooser
    * The log.

    */

   private static Log log = LogFactory.getLog(ConnectorChooser.class);

-  

-  private static final String MOA_DETACHED_ENABLED_KEY = "moa.sign.console.detached.enabled";

 

   public static LocalConnector chooseLocalConnectorForSign(String connector,

       String profile, String loc_ref_url) throws ConnectorException

@@ -81,21 +77,7 @@ public final class ConnectorChooser
     }

     if (connector.equals(MOA))

     {

-      // is detached mode enabled from console

-      String detached_mode_enabled = null;

-	  

-      try 

-      {

-		detached_mode_enabled = SettingsReader.getInstance().getValueFromKey(MOA_DETACHED_ENABLED_KEY);

- 	  } catch (SettingsException e)

- 	  {

-		e.printStackTrace();

-	  }

-      

- 	  // currently MOA does'nt support detached mode in command line

-      if(detached_mode_enabled == null || detached_mode_enabled.equals("true"))

-    	  return new DetachedLocRefMOAConnector(profile, "formdata:fileupload");

-        

+      // TODO MOA detached signing is not allowed at the commandline

       log.warn("Detached MOA is not supported on the commandline. -> choosing Base64 temporarily.");

       return new EnvelopingBase64MOAConnector(profile);

     }

@@ -223,13 +205,6 @@ public final class ConnectorChooser
 

         return chooseEnvelopedBase64ConnectorHotfix(profile, connector);

       }

-      // test

-      if (sig_id.equals(""))

-      {

-        log.debug("sig_id is null, which means that it is a MOA signature -> choose a hotfix base64 connector (thus it is moa - it doesn't matter).");

-

-        return chooseEnvelopedBase64ConnectorHotfix(profile, connector);

-      }

 

       String[] sig_id_parts = sig_id.split("@");

       if (sig_id_parts.length == 2)