added DynamicSignatureProfile support

added override properties

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

1 files changed, 14 insertions, 10 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/cfg/SettingsReader.java b/src/main/java/at/knowcenter/wag/egov/egiz/cfg/SettingsReader.java
index f4c28c7..6151b24 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/cfg/SettingsReader.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/cfg/SettingsReader.java
@@ -465,7 +465,10 @@ public class SettingsReader implements Serializable
    */

   public String getSetting(String key) throws SettingNotFoundException

   {

-    String result = properties_.getProperty(key);

+    String result = OverridePropertyHolder.getProperty(key);

+    if (result == null) {

+       result = properties_.getProperty(key);

+    }

     if (result == null)

     {

       String log_message = "Configuration key not found: '" + key + "'! Check '" + settingsFile_ + "' file.";

@@ -476,10 +479,7 @@ public class SettingsReader implements Serializable
       SettingNotFoundException snf = new SettingNotFoundException(log_message);

       throw snf;

     }

-//    if (logger_.isDebugEnabled())

-//    {

-//      logger_.debug("Get Property:" + key + "=" + result);

-//    }

+

     return result;

   }

   

@@ -659,11 +659,11 @@ public class SettingsReader implements Serializable
    */

   public String getValueFromKey(String key)

   {

-    String value = pTree_.getFirstValue(key);

-//    if (logger_.isDebugEnabled())

-//    {

-//      logger_.debug("getValueFromKey:" + key + "=" + value);

-//    }

+     String value = OverridePropertyHolder.getProperty(key);

+     if (value == null) {

+        value = pTree_.getFirstValue(key);

+     }

+

     return value;

   }

 

@@ -889,5 +889,9 @@ public class SettingsReader implements Serializable
 		String paddingString = StringUtils.repeat("*", versionString.length());

 		logger_.info("PDF-AS info\n" + paddingString + "\n" + versionString + "\n" + paddingString);

   }

+  

+  public Properties getProperties() {

+     return this.properties_;

+  }

 

 }
\ No newline at end of file