PDF-AS API

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

1 files changed, 30 insertions, 6 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 97929af..054da24 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
@@ -344,6 +344,21 @@ public class SettingsReader implements Serializable
   {

     return getInstance(null);

   }

+  

+  /**

+   * Reloads the Settings file.

+   * 

+   * <p>

+   * Subsequent calls to getInstance will return the new settings.

+   * </p>

+   * 

+   * @throws SettingsException f.e.

+   */

+  public synchronized static void createInstance () throws SettingsException

+  {

+    instance_ = null;

+    getInstance();

+  }

 

   /**

    * This method returns an synchronized instance of this class. The settings

@@ -663,6 +678,13 @@ public class SettingsReader implements Serializable
     }

   }

 

+  public static void initialize(String base_dir)

+  {

+    RESOURCES_PATH = base_dir + FILE_SEP; //CATALINA_HOME + FILE_SEP + WEB_APPL_DIR;

+    CONFIG_PATH = RESOURCES_PATH + CFG + FILE_SEP;

+    CERT_PATH = RESOURCES_PATH + CERT + FILE_SEP;

+  }

+  

   /**

    * Initializes the paths of the SettingsReader for web application usage.

    * 

@@ -672,9 +694,10 @@ public class SettingsReader implements Serializable
    */

   public static void initializeForWeb(String base_dir)

   {

-    RESOURCES_PATH = base_dir + FILE_SEP; //CATALINA_HOME + FILE_SEP + WEB_APPL_DIR;

-    CONFIG_PATH = RESOURCES_PATH + CFG + FILE_SEP;

-    CERT_PATH = RESOURCES_PATH + CERT + FILE_SEP;

+    initialize(base_dir);

+//    RESOURCES_PATH = base_dir + FILE_SEP; //CATALINA_HOME + FILE_SEP + WEB_APPL_DIR;

+//    CONFIG_PATH = RESOURCES_PATH + CFG + FILE_SEP;

+//    CERT_PATH = RESOURCES_PATH + CERT + FILE_SEP;

   }

 

   /**

@@ -682,9 +705,10 @@ public class SettingsReader implements Serializable
    */

   public static void initializeForCommandLine()

   {

-    RESOURCES_PATH = USER_DIR + FILE_SEP;

-    CONFIG_PATH = RESOURCES_PATH + CFG + FILE_SEP;

-    CERT_PATH = RESOURCES_PATH + CERT + FILE_SEP;

+    initialize(USER_DIR);

+//    RESOURCES_PATH = USER_DIR + FILE_SEP;

+//    CONFIG_PATH = RESOURCES_PATH + CFG + FILE_SEP;

+//    CERT_PATH = RESOURCES_PATH + CERT + FILE_SEP;

   }

   

   static {