Fixes config file path resolution issues

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Configuration.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Configuration.java
index adab4bb..67106c3 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Configuration.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Configuration.java
@@ -9,6 +9,12 @@ import org.apache.log4j.Logger;
 import com.indexdata.masterkey.config.MissingMandatoryParameterException;\r
 import com.indexdata.pz2utils4jsf.utils.Utils;\r
 \r
+/**\r
+ * Represents a configuration as a set of key-value pairs\r
+ * \r
+ * @author Niels Erik\r
+ *\r
+ */\r
 public class Configuration implements Serializable {\r
 \r
   private static final long serialVersionUID = -6801241975338182197L;\r
@@ -62,7 +68,7 @@ public class Configuration implements Serializable {
   }\r
 \r
   public String getConfigFilePath() {
-    return get("configfilepath","nopathgiven");\r
+    return get("configpath","nopathgiven");\r
   }\r
   \r
   public Map<String,String> getConfigMap() {\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Mk2ConfigReader.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Mk2ConfigReader.java
index 430cc73..554f931 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Mk2ConfigReader.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Mk2ConfigReader.java
@@ -22,6 +22,13 @@ import com.indexdata.pz2utils4jsf.errors.ConfigurationException;
 import com.indexdata.pz2utils4jsf.utils.Utils;\r
 import static com.indexdata.pz2utils4jsf.utils.Utils.nl;\r
 \r
+/**\r
+ * Reads configuration from a MasterKey configuration scheme\r
+ * \r
+ * \r
+ * @author Niels Erik\r
+ *\r
+ */\r
 @Named @SessionScoped @Alternative\r
 public class Mk2ConfigReader implements ConfigurationReader  {\r
 \r
@@ -58,7 +65,7 @@ public class Mk2ConfigReader implements ConfigurationReader  {
     try {\r
       ModuleConfiguration moduleConfig = mkConfigContext.getModuleConfiguration(configurable.getModuleName());      \r
       config.addAll(configurable.getDefaults(),moduleConfig.getConfigMap());\r
-      config.set("configpath", mkConfigContext.getConfigFileLocation().getConfigFilePath());            \r
+      config.set("configpath", moduleConfig.getConfigFilePath());            \r
     } catch (IOException e) {\r
       throw new ConfigurationException(Mk2ConfigReader.class + " could not read configuration for '"+ configurable.getModuleName() + "': "+e.getMessage(),e);\r
     }        \r