X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fconfig%2FPz2ConfigureByMk2Config.java;h=e809486b3c0040165fd89ab60fb62916bc23e73c;hb=6300a68c2452725149ec64bbaac8416dce4b3aa8;hp=ac05c0a0e496abed695a80f6313828f577528b75;hpb=b8de1214df604ebb0485b0d4b22d28733c963933;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
index ac05c0a..e809486 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
@@ -17,6 +17,7 @@ import org.apache.log4j.Logger;
 import com.indexdata.masterkey.config.MasterkeyConfiguration;
 import com.indexdata.masterkey.config.ModuleConfiguration;
 import com.indexdata.pz2utils4jsf.utils.Utils;
+import static com.indexdata.pz2utils4jsf.utils.Utils.nl;
 
 @Named @SessionScoped @Alternative
 public class Pz2ConfigureByMk2Config implements Pz2Configurator  {
@@ -24,6 +25,7 @@ public class Pz2ConfigureByMk2Config implements Pz2Configurator  {
   private static final long serialVersionUID = 8865086878660568870L;
   private static Logger logger = Logger.getLogger(Pz2ConfigureByMk2Config.class);
   private Pz2Config pz2config = null;
+  private String configFilePathAndName = "none";
 
   public Pz2ConfigureByMk2Config () throws IOException {
     logger.info(Utils.objectId(this) + " is instantiating Pazpar2 service configuration by MasterKey configuration scheme.");
@@ -39,10 +41,11 @@ public class Pz2ConfigureByMk2Config implements Pz2Configurator  {
   
   private void createConfig () throws IOException {
     ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();
-    ServletContext servletContext = (ServletContext) externalContext.getContext();       
+    ServletContext servletContext = (ServletContext) externalContext.getContext();  
     MasterkeyConfiguration mkConfigContext =
         MasterkeyConfiguration.getInstance(servletContext,
         "pazpar-application-jsf", ((HttpServletRequest) externalContext.getRequest()).getServerName());
+    configFilePathAndName = mkConfigContext.getConfigFileLocation().getConfigFilePath();
     ModuleConfiguration moduleConfig = mkConfigContext.getModuleConfiguration("pz2client");
     pz2config = new Pz2Config(moduleConfig);
     logger.info(document());
@@ -51,19 +54,19 @@ public class Pz2ConfigureByMk2Config implements Pz2Configurator  {
 
   public List<String> document() {
     List<String> doc = new ArrayList<String>();
-    
-    doc.add("-- Set to access Pazpar2 at: " +pz2config.get("PAZPAR2_URL"));
+    doc.add("Attempted to configure service using the file " + configFilePathAndName);
+    doc.add(nl+"-- Configured to access Pazpar2 at: " +pz2config.get("PAZPAR2_URL"));
     if (pz2config.get("PAZPAR2_SERVICE_XML") != null) {
-      doc.add("-- App set to use the service definition contained in " + pz2config.getConfigFilePath() + "/" + pz2config.get("PAZPAR2_SERVICE_XML"));
+      doc.add(nl+"-- Configured to use the service definition contained in " + pz2config.getConfigFilePath() + "/" + pz2config.get("PAZPAR2_SERVICE_XML"));
       if (pz2config.get("PAZPAR2_SETTINGS_XML") != null) {
-        doc.add("-- App set to use the target settings contained in " + pz2config.getConfigFilePath() + "/" + pz2config.get("PAZPAR2_SETTINGS_XML"));
+        doc.add(nl+"-- Configured to use the target settings contained in " + pz2config.getConfigFilePath() + "/" + pz2config.get("PAZPAR2_SETTINGS_XML"));
       } else {
-        doc.add("-- App set to use the server side target settings as defined in the service definition.");
+        doc.add(nl+"-- Configured to use the server side target settings as defined in the service definition.");
       }
     } else if (pz2config.get("PAZPAR2_SERVICE_ID") != null) {
-      doc.add("-- App set to use the server side service definition identified by service id \""+pz2config.get("PAZPAR2_SERVICE_ID") + "\"");
+      doc.add(nl+"-- Configured to use the server side service definition identified by service id \""+pz2config.get("PAZPAR2_SERVICE_ID") + "\"");
     } else {
-      doc.add("Error: Did not find service ID nor service definition XML file to set up pazpar2 service.");
+      doc.add(nl+"Error: Did not find service ID nor service definition XML file for setting up a pazpar2 service.");
     }
     return doc;
   }