projects
/
mkjsf-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work on error reporting. Adds troubleshooter.
[mkjsf-moved-to-github.git]
/
src
/
main
/
java
/
com
/
indexdata
/
pz2utils4jsf
/
config
/
Pz2ConfigureByMk2Config.java
diff --git
a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
index
2273b7a
..
f10aa1e
100644
(file)
--- a/
src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
+++ b/
src/main/java/com/indexdata/pz2utils4jsf/config/Pz2ConfigureByMk2Config.java
@@
-1,6
+1,8
@@
package com.indexdata.pz2utils4jsf.config;
\r
\r
import java.io.IOException;
\r
package com.indexdata.pz2utils4jsf.config;
\r
\r
import java.io.IOException;
\r
+import java.util.ArrayList;
\r
+import java.util.List;
\r
\r
import javax.enterprise.context.SessionScoped;
\r
import javax.enterprise.inject.Alternative;
\r
\r
import javax.enterprise.context.SessionScoped;
\r
import javax.enterprise.inject.Alternative;
\r
@@
-16,6
+18,8
@@
import com.indexdata.masterkey.config.MasterkeyConfiguration;
import com.indexdata.masterkey.config.ModuleConfiguration;
\r
import com.indexdata.pz2utils4jsf.utils.Utils;
\r
\r
import com.indexdata.masterkey.config.ModuleConfiguration;
\r
import com.indexdata.pz2utils4jsf.utils.Utils;
\r
\r
+import static com.indexdata.pz2utils4jsf.utils.Utils.nl;
\r
+
\r
@Named @SessionScoped @Alternative
\r
public class Pz2ConfigureByMk2Config implements Pz2Configurator {
\r
\r
@Named @SessionScoped @Alternative
\r
public class Pz2ConfigureByMk2Config implements Pz2Configurator {
\r
\r
@@
-43,21
+47,28
@@
public class Pz2ConfigureByMk2Config implements Pz2Configurator {
"pazpar-application-jsf", ((HttpServletRequest) externalContext.getRequest()).getServerName());
\r
ModuleConfiguration moduleConfig = mkConfigContext.getModuleConfiguration("pz2client");
\r
pz2config = new Pz2Config(moduleConfig);
\r
"pazpar-application-jsf", ((HttpServletRequest) externalContext.getRequest()).getServerName());
\r
ModuleConfiguration moduleConfig = mkConfigContext.getModuleConfiguration("pz2client");
\r
pz2config = new Pz2Config(moduleConfig);
\r
- logger.info("Accessing Pazpar2 at: " +pz2config.get("PAZPAR2_URL"));
\r
+ logger.info(document());
\r
+ }
\r
+
\r
+
\r
+ public List<String> document() {
\r
+ List<String> doc = new ArrayList<String>();
\r
+
\r
+ doc.add("Set to access Pazpar2 at: " +pz2config.get("PAZPAR2_URL"));
\r
if (pz2config.get("PAZPAR2_SERVICE_XML") != null) {
\r
if (pz2config.get("PAZPAR2_SERVICE_XML") != null) {
\r
- logger.info("Using the service definition contained in " + pz2config.getConfigFilePath() + "/" + pz2config.get("PAZPAR2_SERVICE_XML"));
\r
+ doc.add("Set to use the service definition contained in " + pz2config.getConfigFilePath() + "/" + pz2config.get("PAZPAR2_SERVICE_XML"));
\r
if (pz2config.get("PAZPAR2_SETTINGS_XML") != null) {
\r
if (pz2config.get("PAZPAR2_SETTINGS_XML") != null) {
\r
- logger.info("Using the target settings contained in " + pz2config.getConfigFilePath() + "/" + pz2config.get("PAZPAR2_SETTINGS_XML"));
\r
+ doc.add("Set to use the target settings contained in " + pz2config.getConfigFilePath() + "/" + pz2config.get("PAZPAR2_SETTINGS_XML"));
\r
} else {
\r
} else {
\r
- logger.info("Using the server side target settings as defined in the service definition.");
\r
+ doc.add("Set to use the server side target settings as defined in the service definition.");
\r
}
\r
} else if (pz2config.get("PAZPAR2_SERVICE_ID") != null) {
\r
}
\r
} else if (pz2config.get("PAZPAR2_SERVICE_ID") != null) {
\r
- logger.info("Using the server side service definition identified by service id "+pz2config.get("PAZPAR2_SERVICE_ID"));
\r
+ doc.add("Set to use the server side service definition identified by service id "+pz2config.get("PAZPAR2_SERVICE_ID"));
\r
} else {
\r
} else {
\r
- logger.error("Did not find service ID nor service definition XML file so set up pazpar2 service.");
\r
+ doc.add("Error: Did not find service ID nor service definition XML file to set up pazpar2 service.");
\r
}
\r
}
\r
-
\r
+ return doc;
\r
}
\r
}
\r
-
\r
+
\r
\r
}
\r
\r
}
\r