Adds another config option (by MasterKey config)

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
new file mode 100644 (file)
index 0000000..91cc08e
--- /dev/null
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
@@ -0,0 +1,44 @@
+package com.indexdata.pz2utils4jsf.config;\r
+\r
+import java.io.IOException;\r
+\r
+import javax.enterprise.context.SessionScoped;\r
+import javax.enterprise.inject.Alternative;\r
+import javax.faces.context.ExternalContext;\r
+import javax.faces.context.FacesContext;\r
+import javax.inject.Named;\r
+import javax.servlet.ServletContext;\r
+import javax.servlet.http.HttpServletRequest;\r
+\r
+import org.apache.log4j.Logger;\r
+\r
+import com.indexdata.masterkey.config.MasterkeyConfiguration;\r
+import com.indexdata.masterkey.config.ModuleConfiguration;\r
+\r
+@Named @SessionScoped @Alternative\r
+public class Pz2ConfigureByMk2Config implements Pz2Configurator  {\r
+\r
+  private static final long serialVersionUID = 8865086878660568870L;\r
+  private static Logger logger = Logger.getLogger(Pz2ConfigureByMk2Config.class);\r
+  private Pz2Config pz2config = null;\r
+\r
+  public Pz2ConfigureByMk2Config () throws IOException {\r
+    logger.debug("Instantiating Pazpar2 service configuration by MasterKey configuration scheme.");\r
+    ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();\r
+    ServletContext servletContext = (ServletContext) externalContext.getContext();       \r
+    MasterkeyConfiguration mkConfigContext =\r
+        MasterkeyConfiguration.getInstance(servletContext,\r
+        "faces-component", ((HttpServletRequest) externalContext.getRequest()).getServerName());\r
+    ModuleConfiguration moduleConfig = mkConfigContext.getModuleConfiguration("pz2client");    \r
+    String pazpar2Url = moduleConfig.get("PAZPAR2_URL");\r
+    String pazpar2ServiceId = moduleConfig.get("PAZPAR2_SERVICE_ID");\r
+    pz2config = new Pz2Config(pazpar2Url,pazpar2ServiceId);\r
+  }\r
+    \r
+  @Override\r
+  public Pz2Config getConfig() {\r
+    return pz2config;\r
+  }\r
+  \r
+\r
+}\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
index 92ea7d8..3c6223f 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
@@ -1,6 +1,7 @@
 package com.indexdata.pz2utils4jsf.config;\r
 \r
 import javax.enterprise.context.SessionScoped;\r
+import javax.enterprise.inject.Alternative;\r
 import javax.faces.context.ExternalContext;\r
 import javax.faces.context.FacesContext;\r
 import javax.inject.Named;\r
@@ -8,7 +9,8 @@ import javax.servlet.ServletContext;
 \r
 import org.apache.log4j.Logger;\r
 \r
-@SessionScoped @Named\r
+\r
+@Named @SessionScoped @Alternative\r
 public class Pz2ConfigureByWebXml implements Pz2Configurator {\r
 \r
   private static final long serialVersionUID = 144390224959311772L;\r