Allow to override servlet init parameters with context parameters

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1247 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 15 insertions, 2 deletions

diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java
index 0e2e4b02..4bba6947 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java
@@ -36,6 +36,8 @@ import java.util.Arrays;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.configuration.Configuration;
@@ -47,8 +49,8 @@ import at.gv.egiz.bku.utils.StreamUtil;
 
 public class MoccaParameterBean {
 
-  private final Logger log = LoggerFactory.getLogger(MoccaParameterBean.class);
-  
+  private static final Logger log = LoggerFactory.getLogger(MoccaParameterBean.class);
+
   public static final String PARAM_UI_PAGE_P = "appletPage";
 
   public static final String PARAM_APPLET_WIDTH = "appletWidth";
@@ -234,4 +236,15 @@ public class MoccaParameterBean {
       response.addHeader("P3P", P3P_POLICY);
     }
   }
+
+  public static String getInitParameter(String name, ServletConfig config,
+      ServletContext context) {
+    String initVal = config.getInitParameter(name);
+    String contextVal = context.getInitParameter(config.getServletName() + "." + name);
+    log.debug("Reading init param " + name + ": " + initVal +
+        " - context param " + (config.getServletName() + "." + name) + ": " + contextVal);
+    if (contextVal != null)
+      return contextVal;
+    return initVal;
+  }
 }