Catches and reports missing web.xml init parameter

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / pz2utils4jsf / errors / ErrorHelper.java

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/errors/ErrorHelper.java b/src/main/java/com/indexdata/pz2utils4jsf/errors/ErrorHelper.java
index 4f05b77..0fcc526 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/errors/ErrorHelper.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/errors/ErrorHelper.java
@@ -24,6 +24,7 @@ public class ErrorHelper implements Serializable {
                          LOCAL_SETTINGS_FILE_NOT_FOUND,\r
                          MASTERKEY_CONFIG_FILE_NOT_FOUND,\r
                          MISSING_MANDATORY_PARAMETER,\r
+                         MISSING_MK2_CONFIG_INIT_PARAMETER,\r
                          NOT_RESOLVED,\r
                          SKIP_SUGGESTIONS};\r
 \r
@@ -72,6 +73,10 @@ public class ErrorHelper implements Serializable {
       return ErrorCode.SKIP_SUGGESTIONS;\r
     } else if (appError.getMessage().contains("Missing mandatory parameter")) {\r
       return ErrorCode.MISSING_MANDATORY_PARAMETER;\r
+    } else if (appError.getMessage().contains("Init parameter")\r
+               && appError.getMessage().contains("MASTERKEY")\r
+               && appError.getMessage().contains("missing in deployment descriptor")) {\r
+      return ErrorCode.MISSING_MK2_CONFIG_INIT_PARAMETER;\r
     }\r
     return ErrorCode.NOT_RESOLVED;\r
   }\r
@@ -113,6 +118,12 @@ public class ErrorHelper implements Serializable {
                " file used. Please check the property file for the parameter given in the error message ");\r
       addConfigurationDocumentation(suggestions);\r
       break;\r
+    case MISSING_MK2_CONFIG_INIT_PARAMETER:\r
+      suggestions.add("A mandatory init parameter was not found in the deployment descriptor (web.xml)." +\r
+               " Following init parameters must be present in web.xml when using the Masterkey (MK2) configuration scheme:" +\r
+               " MASTERKEY_ROOT_CONFIG_DIR (i.e. '/etc/masterkey'), MASTERKEY_COMPONENT_CONFIG_DIR (i.e. '/myapp'), " +\r
+               "MASTERKEY_CONFIG_FILE_NAME (i.e. 'myapp.properties'");      \r
+      break;\r
     case NOT_RESOLVED:\r
       suggestions.add("Unforeseen error situation. No suggestions prepared.");\r
       break;\r