Template Versioning, BKU and MOA 1.1.0 (detached)

NOTE: MOA enveloping is still not fixed

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

1 files changed, 12 insertions, 26 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/ConnectorFactory.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/ConnectorFactory.java
index 236f260..8d9a480 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/ConnectorFactory.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/ConnectorFactory.java
@@ -49,8 +49,6 @@ public abstract class ConnectorFactory
    * </p>

    */

   protected static final String CONNECTOR_INFORMATION_FIELD_NAME = "CONNECTOR_INFORMATION";

-  

-  protected static final String MOA_SIG_ID_VISIBLE_KEY = "moa.sign.id.active";

 

   /**

    * The list of available Connector implementations.

@@ -322,30 +320,18 @@ public abstract class ConnectorFactory
    */

   public static boolean needsSIG_ID(String connector)

   {

-	//boolean return_result = true;

-	

-	if(connector.contains("moa"))

-	{

-		String moa_sig_id_visible = null;

-		

-	    try

-	    {

-	      moa_sig_id_visible = SettingsReader.getInstance().getValueFromKey(MOA_SIG_ID_VISIBLE_KEY);

-	      

-	      if(moa_sig_id_visible == null)

-	    	  return false;

-	      

-	      if(!moa_sig_id_visible.equals("true"))

-	    	  return false;

-	    }

-	    catch (SettingsException e)

-	    {

-	      String log_message = "Can not load signature settings. Cause:\n" + e.getMessage();

-	      logger_.error(log_message);

-	      throw new RuntimeException(e);

-	    }

+    // all modernn detached signatures have the SIG_ID field.

+	  

+	try {

+		if(!SettingsReader.getInstance().getValueFromKey("moa.id.field.visible").equals("true"))

+			return false;

+	} catch (SettingsException e) {

+		e.printStackTrace();

 	}

-	

-    return true;//return_result;

+		

+	  

+    return true;

+    //return !connector.equals("moa");

   }

+

 }