Adds injectable pazpar2 client configs

To allow users of the toolkit a freedom of choice regarding
configuration scheme (ie web.xml, property file, masterkey configuration
scheme, etc)

diff --git a/pom.xml b/pom.xml
index 58d2ff2..42a9c9a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     <dependency>\r
       <groupId>com.indexdata</groupId>\r
       <artifactId>masterkey-common</artifactId>\r
-      <version>0.1.9-SNAPSHOT</version>\r
+      <version>0.1.10-SNAPSHOT</version>\r
     </dependency>\r
   </dependencies>\r
 \r
@@ -47,8 +47,9 @@
     <resources>\r
       <resource>\r
         <directory>src</directory>\r
-        <excludes>\r
-          <exclude>**/*.java</exclude>\r
+        <excludes>          \r
+          <exclude>main/</exclude>\r
+          <exclude>*.java</exclude>\r
         </excludes>\r
       </resource>\r
     </resources>\r
@@ -57,6 +58,9 @@
         <artifactId>maven-compiler-plugin</artifactId>\r
         <version>2.3.2</version>\r
         <configuration>\r
+          <excludes>\r
+             <exclude>src/META-INF/</exclude>\r
+          </excludes>\r
           <source>1.7</source>\r
           <target>1.7</target>\r
         </configuration>\r

diff --git a/src/META-INF/context.xml b/src/META-INF/context.xml
index 7f18535..c4ecc5d 100644 (file)
--- a/src/META-INF/context.xml
+++ b/src/META-INF/context.xml
@@ -4,6 +4,6 @@
               auth="Container"\r
               type="javax.enterprise.inject.spi.BeanManager"\r
               factory="org.jboss.weld.resources.ManagerObjectFactory"/>\r
-    <WatchedResource>WEB-INF/web.xml</WatchedResource>\r
-    <WatchedResource>META-INF/context.xml</WatchedResource>\r
+    <!-- WatchedResource>WEB-INF/web.xml</WatchedResource>\r
+    <WatchedResource>META-INF/context.xml</WatchedResource -->\r
 </Context>
\ No newline at end of file

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
index 3caa832..fc3c538 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
@@ -1,13 +1,18 @@
 package com.indexdata.pz2utils4jsf.config;\r
 \r
+import java.io.Serializable;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
+import org.apache.log4j.Logger;\r
+\r
 import com.indexdata.masterkey.config.MissingMandatoryParameterException;\r
 import com.indexdata.masterkey.config.ModuleConfigurationGetter;\r
 \r
-public class Pz2Config implements ModuleConfigurationGetter {\r
+public class Pz2Config implements ModuleConfigurationGetter, Serializable {\r
 \r
+  private static final long serialVersionUID = -6801241975338182197L;\r
+  private static Logger logger = Logger.getLogger(Pz2Config.class);\r
   Map<String,String> properties = new HashMap<String,String>();\r
   \r
   public Pz2Config () {\r
@@ -18,6 +23,7 @@ public class Pz2Config implements ModuleConfigurationGetter {
     setStatics();\r
     setPazpar2Url(pazpar2Url);\r
     setPazpar2ServiceId(pazpar2ServiceId);\r
+    logger.debug("Creating pazpar2 configuration with "+ get("PAZPAR2_URL") + " and " + get("PAZPAR2_SERVICE_ID"));\r
   }\r
   \r
   private void setStatics () {\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
index 9a225b0..92ea7d8 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByWebXml.java
@@ -8,8 +8,7 @@ import javax.servlet.ServletContext;
 \r
 import org.apache.log4j.Logger;\r
 \r
-@Named("pz2configwebxml")\r
-@SessionScoped\r
+@SessionScoped @Named\r
 public class Pz2ConfigureByWebXml implements Pz2Configurator {\r
 \r
   private static final long serialVersionUID = 144390224959311772L;\r
@@ -21,7 +20,7 @@ public class Pz2ConfigureByWebXml implements Pz2Configurator {
     ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();\r
     ServletContext servletContext = (ServletContext) externalContext.getContext();\r
     String pazpar2Url = servletContext.getInitParameter("PAZPAR2_URL");\r
-    String pazpar2ServiceId = servletContext.getInitParameter("PAZPAR2_SERVICE_id");\r
+    String pazpar2ServiceId = servletContext.getInitParameter("PAZPAR2_SERVICE_ID");\r
     config = new Pz2Config(pazpar2Url,pazpar2ServiceId);\r
   }\r
   \r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
index c139786..e5cfb1c 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -3,15 +3,15 @@ package com.indexdata.pz2utils4jsf.pazpar2;
 import java.io.Serializable;\r
 import java.util.List;\r
 \r
+import javax.annotation.PostConstruct;\r
 import javax.enterprise.context.SessionScoped;\r
 import javax.inject.Inject;\r
 import javax.inject.Named;\r
 \r
-import com.indexdata.pz2utils4jsf.config.Pz2ConfigureByWebXml;\r
+import org.apache.log4j.Logger;\r
+\r
+import com.indexdata.pz2utils4jsf.config.Pz2Configurator;\r
 import com.indexdata.pz2utils4jsf.controls.ResultsPager;\r
-import com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface;\r
-import com.indexdata.pz2utils4jsf.pazpar2.Pz2Session;\r
-import com.indexdata.pz2utils4jsf.pazpar2.TargetFilter;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.ByTarget;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.RecordResponse;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.ShowResponse;\r
@@ -24,14 +24,21 @@ import com.indexdata.pz2utils4jsf.pazpar2.data.TermResponse;
 public class Pz2Bean implements Pz2Interface, Serializable {\r
 \r
   private static final long serialVersionUID = 3440277287081557861L;\r
-  Pz2Session pz2;\r
-\r
-  @Inject \r
-  private Pz2ConfigureByWebXml pz2conf;\r
-\r
+  private static Logger logger = Logger.getLogger(Pz2Bean.class);\r
+  \r
+  Pz2Session pz2;  \r
+  @Inject Pz2Configurator pz2conf;\r
+  \r
   public Pz2Bean () {\r
-    pz2 = new Pz2Session(pz2conf);    \r
+    logger.debug("Instantiating pz2 bean");      \r
+    pz2 = new Pz2Session();    \r
+  }\r
+  \r
+  @PostConstruct\r
+  public void initiatePz2Session() {\r
+    pz2.init(pz2conf);\r
   }\r
+  \r
   /* (non-Javadoc)\r
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#doSearch(java.lang.String)\r
    */\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Interface.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Interface.java
index 6aa1921..8f6153a 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Interface.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Interface.java
@@ -1,5 +1,6 @@
 package com.indexdata.pz2utils4jsf.pazpar2;\r
 \r
+import java.io.Serializable;\r
 import java.util.List;\r
 \r
 import com.indexdata.pz2utils4jsf.controls.ResultsPager;\r
@@ -11,7 +12,7 @@ import com.indexdata.pz2utils4jsf.pazpar2.data.StatResponse;
 import com.indexdata.pz2utils4jsf.pazpar2.data.TermListsResponse;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.TermResponse;\r
 \r
-public interface Pz2Interface {\r
+public interface Pz2Interface extends Serializable {\r
 \r
   /**\r
    * Executes a Pazpar2 search using the given query string\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
index 53e542d..b4323fc 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
@@ -1,12 +1,14 @@
 package com.indexdata.pz2utils4jsf.pazpar2;\r
 \r
-import java.io.Serializable;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.StringTokenizer;\r
 import java.util.concurrent.ConcurrentHashMap;\r
 \r
+import javax.enterprise.context.SessionScoped;\r
+import javax.inject.Named;\r
+\r
 import org.apache.log4j.Logger;\r
 \r
 import com.indexdata.masterkey.pazpar2.client.exceptions.ProxyErrorException;\r
@@ -22,7 +24,9 @@ import com.indexdata.pz2utils4jsf.pazpar2.data.TermListsResponse;
 import com.indexdata.pz2utils4jsf.pazpar2.data.TermResponse;\r
 import com.indexdata.pz2utils4jsf.pazpar2.state.QueryStates;\r
 \r
-public class Pz2Session implements Serializable, Pz2Interface {\r
+@Named\r
+@SessionScoped\r
+public class Pz2Session implements Pz2Interface {\r
   \r
   private static Logger logger = Logger.getLogger(Pz2Session.class);\r
   \r
@@ -34,19 +38,26 @@ public class Pz2Session implements Serializable, Pz2Interface {
   private com.indexdata.masterkey.pazpar2.client.Pazpar2Client client = null;   \r
   private TargetFilter targetFilter = null;  \r
   private ResultsPager pager = null; \r
-  \r
-  public Pz2Session (Pz2Configurator pz2conf) {\r
-    logger.debug("Instantiating pz2");  \r
-    if (pz2conf == null) {logger.error("conf is null!!!!!!!!!!!!!!!"); }\r
+      \r
+  public Pz2Session () {\r
+    logger.debug("Instantiating pz2 session object");      \r
+  }\r
+    \r
+  public void init(Pz2Configurator pz2conf) {\r
+    if (client==null) {\r
+    logger.debug("Initiating a session holding object ");\r
     try {\r
       cfg = new com.indexdata.masterkey.pazpar2.client.Pazpar2ClientConfiguration(pz2conf.getConfig());\r
       client = new com.indexdata.masterkey.pazpar2.client.Pazpar2ClientGeneric(cfg);\r
       resetDataObjects();\r
     } catch (ProxyErrorException e) {\r
       e.printStackTrace();\r
-    }    \r
+    }        \r
+    } else {\r
+      logger.error("??? attempt to initiate session but already has a client");\r
+    }\r
   }\r
-\r
+    \r
   public void doSearch(String query) {\r
     setCommandParameter("search",new CommandParameter("query","=",query));     \r
     doSearch();\r