X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fpazpar2%2FPz2ProxyBean.java;h=72dbccb072ef1825e4182f22042cbcc56e1e8639;hb=33338bd223ec711264392b7768d89d0f3fbce677;hp=473d332bc6fd0a52895d37566e10e8fba7ad27f7;hpb=aa4634e1a3c9eec2103b299dda20d916dcba8b20;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
index 473d332..72dbccb 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
@@ -1,5 +1,8 @@
 package com.indexdata.pz2utils4jsf.pazpar2;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.inject.Alternative;
@@ -8,6 +11,7 @@ import javax.inject.Named;
 
 import org.apache.log4j.Logger;
 
+import com.indexdata.pz2utils4jsf.config.Configuration;
 import com.indexdata.pz2utils4jsf.config.ConfigurationReader;
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyClient;
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyInterface;
@@ -19,7 +23,7 @@ import com.indexdata.pz2utils4jsf.utils.Utils;
 public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
     
   private static final long serialVersionUID = 4221824985678758225L;
-  private static Logger logger = Logger.getLogger(Pz2ProxyBean.class);
+  private static Logger logger = Logger.getLogger(Pz2ProxyBean.class);  
     
   @Inject ConfigurationReader configurator;
   @Inject ServiceProxyUser user;
@@ -28,21 +32,75 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
   }
   
   @PostConstruct
-  public void initiatePz2Session() {
-    logger.debug(Utils.objectId(this) + " will instantiate a Pz2Session next.");
+  public void instantiatePz2SessionObject() {
+    logger.debug(Utils.objectId(this) + " will instantiate a Pz2Session object next.");
     pz2 = new ServiceProxySession();
     searchClient = new ServiceProxyClient();
     logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" 
                           + Utils.objectId(configurator) + "] on session [" 
                           + Utils.objectId(pz2) + "]" );    
-    pz2.init(searchClient,configurator);
+    pz2.configureClient(searchClient,configurator);
   }
 
-
+  @Override
   public String login(String navigateTo) {
     logger.info("doing login");
     ((ServiceProxySession) pz2).setUser(user);
-    return ((ServiceProxySession)pz2).login(navigateTo);
+    return session().login(navigateTo);
+  }
+
+  @Override
+  public void setInitFileName(String fileName) {
+    logger.info("Setting init file name: " + fileName);
+    session().setInitFileName(fileName);      
+  }
+
+  @Override
+  public String getInitFileName() {
+    return session().getInitFileName();
+  }
+  
+  public void setAceFilter (String filterExpression) {
+    session().setAceFilter(filterExpression);
+  }
+  
+  public String getAceFilter () {
+    return session().getAceFilter();
+  }
+
+  @Override
+  public String postInit() throws UnsupportedEncodingException, IOException {
+    logger.info("Posting init: " + System.currentTimeMillis());
+    session().postInit();
+    return "";
+  }
+
+  @Override
+  public void setServiceProxyUrl(String url) {
+    logger.info("Setting Service Proxy url: " + url);
+    session().setServiceProxyUrl(url);    
+  }
+
+  @Override
+  public String getServiceProxyUrl() {
+    return session().getServiceProxyUrl();    
+  }
+  
+  public ServiceProxySession session() {
+    return (ServiceProxySession)pz2;
+  }
+
+  @Override
+  public String getInitResponse() {
+    return session().getInitResponse();
+  }
+  
+  public Configuration getClientConfiguration() {
+    return session().client().getConfiguration();
+  }
+  
+  public String getInitDocPath () {
+    return session().client().getConfiguration().get("INIT_DOC_PATH");
   }
 
 }