Fixes scope for sp session bean. Fixes log statements.

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ForServiceProxy.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ForServiceProxy.java
deleted file mode 100644 (file)
index 786bd20..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ForServiceProxy.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.indexdata.pz2utils4jsf.pazpar2;\r
-\r
-import java.lang.annotation.ElementType;\r
-import java.lang.annotation.Retention;\r
-import java.lang.annotation.RetentionPolicy;\r
-import java.lang.annotation.Target;\r
-\r
-import javax.inject.Qualifier;\r
-\r
-@Qualifier\r
-@Retention(RetentionPolicy.RUNTIME)\r
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})\r
-public @interface ForServiceProxy {\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 345f049..5838626 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -37,20 +37,17 @@ public class Pz2Bean implements Pz2Interface, Serializable {
     \r
   public Pz2Bean () {\r
     logger.info("Instantiating pz2 bean [" + Utils.objectId(this) + "]");\r
-    logger.debug("in Pz2Bean configurator is " + configurator);\r
   }\r
   \r
   @PostConstruct\r
   public void instantiatePz2SessionObject() {    \r
     logger.debug("in start of Pz2Bean post-construct configurator is " + configurator);\r
-    logger.debug(Utils.objectId(this) + " will instantiate a Pz2Session next.");\r
+    logger.debug(Utils.objectId(this) + " will instantiate a Pz2Client next.");\r
     searchClient = new Pz2Client();\r
     logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" \r
                           + Utils.objectId(configurator) + "] on session [" \r
                           + Utils.objectId(pz2) + "]" );    \r
     pz2.configureClient(searchClient,configurator);    \r
-    logger.debug("in end of Pz2Bean post-construct configurator is " + configurator);\r
-\r
   }  \r
   \r
   /* (non-Javadoc)\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
index f5f4e55..ae742f3 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
@@ -13,6 +13,7 @@ import org.apache.log4j.Logger;
 \r
 import com.indexdata.pz2utils4jsf.config.Configuration;\r
 import com.indexdata.pz2utils4jsf.config.ConfigurationReader;\r
+import com.indexdata.pz2utils4jsf.pazpar2.sp.ForServiceProxy;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyClient;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyInterface;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxySession;\r
@@ -26,16 +27,15 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   private static Logger logger = Logger.getLogger(Pz2ProxyBean.class);  \r
     \r
   @Inject ConfigurationReader configurator;\r
-  @Inject ServiceProxyUser user;\r
-  \r
+  @Inject ServiceProxyUser user;  \r
   @Inject @ForServiceProxy ServiceProxySession pz2;\r
   \r
   public Pz2ProxyBean() {\r
   }\r
   \r
   @PostConstruct\r
-  public void instantiatePz2SessionObject() {\r
-    logger.debug(Utils.objectId(this) + " will instantiate a Pz2Session object next.");    \r
+  public void instantiateServiceProxyClient() {\r
+    logger.debug(Utils.objectId(this) + " will instantiate a ServiceProxyClient next.");    \r
     searchClient = new ServiceProxyClient();\r
     logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" \r
                           + Utils.objectId(configurator) + "] on session [" \r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ForServiceProxy.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ForServiceProxy.java
new file mode 100644 (file)
index 0000000..28b918c
--- /dev/null
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ForServiceProxy.java
@@ -0,0 +1,15 @@
+package com.indexdata.pz2utils4jsf.pazpar2.sp;\r
+\r
+import java.lang.annotation.ElementType;\r
+import java.lang.annotation.Retention;\r
+import java.lang.annotation.RetentionPolicy;\r
+import java.lang.annotation.Target;\r
+\r
+import javax.inject.Qualifier;\r
+\r
+@Qualifier\r
+@Retention(RetentionPolicy.RUNTIME)\r
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})\r
+public @interface ForServiceProxy {\r
+\r
+}\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxySession.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxySession.java
index 6dc7b6b..7e79006 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxySession.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxySession.java
@@ -3,15 +3,16 @@ package com.indexdata.pz2utils4jsf.pazpar2.sp;
 import java.io.IOException;\r
 import java.io.UnsupportedEncodingException;\r
 \r
+import javax.enterprise.context.SessionScoped;\r
+\r
 import org.apache.log4j.Logger;\r
 \r
-import com.indexdata.pz2utils4jsf.pazpar2.ForServiceProxy;\r
 import com.indexdata.pz2utils4jsf.pazpar2.Pz2Session;\r
 import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandParameter;\r
 import com.indexdata.pz2utils4jsf.pazpar2.sp.auth.ServiceProxyUser;\r
 import com.indexdata.pz2utils4jsf.utils.Utils;\r
 \r
-@ForServiceProxy\r
+@ForServiceProxy @SessionScoped\r
 public class ServiceProxySession extends Pz2Session implements ServiceProxyInterface {\r
 \r
   private ServiceProxyUser user; \r
@@ -21,7 +22,7 @@ public class ServiceProxySession extends Pz2Session implements ServiceProxyInter
   private String initDocResponse = "";  \r
     \r
   public ServiceProxySession() {\r
-    logger.info("Instantiating pz2 session object [" + Utils.objectId(this) + "]");\r
+    logger.info("Instantiating SP pz2 session object [" + Utils.objectId(this) + "]");\r
   }\r
   \r
   public void setUser(ServiceProxyUser user) {\r