Merge branch 'temp'

Conflicts:
	src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java

diff --git a/pom.xml b/pom.xml
index 3f686e4..42a9c9a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -43,9 +43,7 @@
   </dependencies>\r
 \r
   <build>\r
-    <directory>target</directory>\r
-    <outputDirectory>target/classes</outputDirectory>\r
-    <sourceDirectory>src/main/java</sourceDirectory>\r
+    <sourceDirectory>src</sourceDirectory>\r
     <resources>\r
       <resource>\r
         <directory>src</directory>\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
index 4585fc0..fc23ae2 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
@@ -86,8 +86,8 @@ public class Pz2Config implements ModuleConfigurationGetter, Serializable {
   }\r
 \r
   @Override\r
-  public String getConfigFilePath() {\r
-    return ""; // moduleConfig.getConfigFilePath();\r
+  public String getConfigFilePath() {
+    return (moduleConfig != null ? moduleConfig.getConfigFilePath() : "nopath");\r
   }\r
   \r
   \r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByHardcoding.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByHardcoding.java
deleted file mode 100644 (file)
index 354543b..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByHardcoding.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**\r
- * \r
- */\r
-package com.indexdata.pz2utils4jsf.config;\r
-\r
-import java.io.IOException;\r
-import java.util.ArrayList;\r
-import java.util.HashMap;\r
-import java.util.List;\r
-import java.util.Map;\r
-\r
-import javax.enterprise.context.SessionScoped;\r
-import javax.enterprise.inject.Alternative;\r
-import javax.inject.Named;\r
-\r
-@Named @SessionScoped @Alternative\r
-public class Pz2ConfigureByHardcoding implements Pz2Configurator {\r
-\r
-  /**\r
-   * \r
-   */\r
-  private static final long serialVersionUID = -3833516705975419652L;\r
-  private Pz2Config pz2config = null;\r
-\r
-  \r
-  @Override\r
-  public Pz2Config getConfig() throws IOException {\r
-    if (pz2config == null) {\r
-      createConfig();\r
-    }\r
-    return pz2config;\r
-  }\r
-  \r
-  private void createConfig () throws IOException {\r
-    Map<String,String> parameters = new HashMap<String,String>();\r
-    parameters.put("PAZPAR2_URL", "http://mk2-test.indexdata.com/test-pazpar2/");\r
-    parameters.put("PAZPAR2_SERVICE_ID", "jsfdemo");\r
-    pz2config = new Pz2Config(parameters);    \r
-  }\r
-\r
-\r
-  /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.config.Pz2Configurator#document()\r
-   */\r
-  @Override\r
-  public List<String> document() {\r
-    List<String> docs = new ArrayList<String>();\r
-    docs.add("No docs");\r
-    return docs;\r
-  }\r
-\r
-}\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
index df0099d..a085561 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
@@ -51,7 +51,7 @@ public class Pz2ConfigureByMk2Config implements Pz2Configurator  {
 \r
   public List<String> document() {\r
     List<String> doc = new ArrayList<String>();\r
-    doc.add("Application was configured using the file "+ pz2config.getConfigFilePath());\r
+    \r
     doc.add("-- App set to access Pazpar2 at: " +pz2config.get("PAZPAR2_URL"));\r
     if (pz2config.get("PAZPAR2_SERVICE_XML") != null) {\r
       doc.add("-- App set to use the service definition contained in " + pz2config.getConfigFilePath() + "/" + pz2config.get("PAZPAR2_SERVICE_XML"));\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
index 4845ad0..ff38ae7 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
@@ -27,7 +27,6 @@ public class Pz2ConfigureByWebXml implements Pz2Configurator {
     logger.info("Instantiating Pazpar2 service configuration by web.xml parameters");\r
   }\r
   \r
-  @Override\r
   public Pz2Config getConfig() throws IOException {\r
     if (pz2config == null) {\r
       createConfig();\r