Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf.git into...

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / pz2utils4jsf / config / Pz2ConfigureByWebXml.java

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
deleted file mode 100644 (file)
index 0fc81d4..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.indexdata.pz2utils4jsf.config;\r
-\r
-import static com.indexdata.pz2utils4jsf.utils.Utils.nl;\r
-\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.faces.context.ExternalContext;\r
-import javax.faces.context.FacesContext;\r
-import javax.inject.Named;\r
-import javax.servlet.ServletContext;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-import com.indexdata.pz2utils4jsf.errors.ConfigurationException;\r
-\r
-\r
-@Named @SessionScoped @Alternative\r
-public class Pz2ConfigureByWebXml implements Pz2Configurator {\r
-\r
-  private static final long serialVersionUID = 144390224959311772L;\r
-  private static Logger logger = Logger.getLogger(Pz2ConfigureByWebXml.class);\r
-  private Pz2Config pz2config = null;\r
-  private Map<String,String> parameters = new HashMap<String,String>(); \r
-  \r
-  public Pz2ConfigureByWebXml () {\r
-    logger.info("Instantiating Pazpar2 service configuration by web.xml parameters");\r
-  }\r
-  \r
-  @Override\r
-  public Pz2Config getConfig() throws ConfigurationException {\r
-    if (pz2config == null) {\r
-      createConfig();\r
-    }\r
-    return pz2config;\r
-  }\r
-  \r
-  private void createConfig () throws ConfigurationException {\r
-    ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();\r
-    ServletContext servletContext = (ServletContext) externalContext.getContext();    \r
-    parameters.put("PAZPAR2_URL", servletContext.getInitParameter("PAZPAR2_URL"));\r
-    if (parameters.get("PAZPAR2_URL")==null || parameters.get("PAZPAR2_URL").length()==0) {      \r
-      throw new ConfigurationException("Pz2ConfigureByWebXml could not find mandatory context-param 'PAZPAR2_URL'");\r
-    }\r
-    parameters.put("PAZPAR2_SERVICE_ID", servletContext.getInitParameter("PAZPAR2_SERVICE_ID"));\r
-    if (parameters.get("PAZPAR2_SERVICE_ID")==null || parameters.get("PAZPAR2_SERVICE_ID").length()==0) {      \r
-      throw new ConfigurationException("Pz2ConfigureByWebXml could not find mandatory context-param 'PAZPAR2_SERVICE_ID'");\r
-    }\r
-    pz2config = new Pz2Config(parameters);\r
-  }\r
-  \r
-  public List<String> document() {\r
-    List<String> doc = new ArrayList<String>();    \r
-    doc.add("Attempted to configure service using web.xml context-parameters ");\r
-    doc.add(nl+"-- Configured to access Pazpar2 at [" +parameters.get("PAZPAR2_URL") + "]");\r
-    doc.add(nl+"-- Configured to use the server side service definition identified by service id [" +parameters.get("PAZPAR2_SERVICE_ID") + "]");\r
-    return doc;    \r
-  }\r
-}\r