locale config

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

2 files changed, 26 insertions, 154 deletions

diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
index 660fee78..f31559cd 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
@@ -37,12 +37,14 @@ import at.gv.egiz.bku.binding.HttpUtil;
 import at.gv.egiz.bku.binding.IdFactory;
 import at.gv.egiz.bku.utils.StreamUtil;
 import at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage;
+import javax.servlet.RequestDispatcher;
 
 /**
  * Handles SL requests and instantiates BindingProcessors
  * 
  */
 public class BKURequestHandler extends SpringBKUServlet {
+  public static final String BKU_APPLET_JSP = "BKUApplet";
 
   private static final long serialVersionUID = 1L;
 
@@ -66,23 +68,26 @@ public class BKURequestHandler extends SpringBKUServlet {
   protected void doPost(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, java.io.IOException {
     log.debug("Got new request");
-    HttpSession session = req.getSession();
-    String lang = req.getHeader("Accept-Language");
-    Locale locale = AcceptLanguage.getLocale(lang);
-    log.debug("Using locale: " + locale);
+    String acceptLanguage = req.getHeader("Accept-Language");
+    Locale locale = AcceptLanguage.getLocale(acceptLanguage);
+    log.debug("Accept-Language locale: " + locale);
 
+    HttpSession session = req.getSession(false);
     if (session != null) {
       log.warn("Already a session with id: " + session.getId()
           + " active, deleting this one");
       getBindingProcessorManager().removeBindingProcessor(
           IdFactory.getInstance().createId(session.getId()));
     }
-    String id = req.getSession(true).getId();
-    log.debug("Using session id: " + id);
+    session = req.getSession(true);
+    if (log.isDebugEnabled()) {
+      log.debug("Using session id: " + session.getId());
+    }
+    
     HTTPBindingProcessor bindingProcessor;
 
     bindingProcessor = (HTTPBindingProcessor) getBindingProcessorManager()
-        .createBindingProcessor(req.getRequestURL().toString(), id, locale);
+        .createBindingProcessor(req.getRequestURL().toString(), session.getId(), locale);
 
     Map<String, String> headerMap = new HashMap<String, String>();
     for (Enumeration<String> headerName = req.getHeaderNames(); headerName
@@ -109,6 +114,7 @@ public class BKURequestHandler extends SpringBKUServlet {
     String background = getStringFromStream(bindingProcessor.getFormData("appletBackground"), charset);
     String guiStyle = getStringFromStream(bindingProcessor.getFormData("appletGuiStyle"), charset);
     String hashDataDisplay = getStringFromStream(bindingProcessor.getFormData("appletHashDataDisplay"), charset);
+    String localeFormParam = getStringFromStream(bindingProcessor.getFormData("locale"), charset);
     if (width != null) {
       try {
         log.trace("Found applet width parameter: " + width);
@@ -139,9 +145,19 @@ public class BKURequestHandler extends SpringBKUServlet {
       log.trace("Found applet hash data display parameter: " + hashDataDisplay);
       session.setAttribute("appletHashDataDisplay", hashDataDisplay);
     }
-    String redirectUrl = REDIRECT_URL+";jsessionid="+session.getId();
-    log.debug("Redirecting to: "+redirectUrl);
-    resp.sendRedirect(redirectUrl);
+    if (localeFormParam != null) {
+      log.debug("overrule accept-language locale " + locale + " with form param " + localeFormParam);
+      locale = new Locale(localeFormParam);
+    }
+    if (locale != null) {
+      log.debug("Using locale " + locale);
+      session.setAttribute("locale", locale.toString());
+    }
+
+    //TODO error if no dispatcher found
+    RequestDispatcher dispatcher = getServletContext().getNamedDispatcher(BKU_APPLET_JSP);
+    log.debug("forward to applet");
+    dispatcher.forward(req, resp);
   }
 
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/HashDataInputServlet.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/HashDataInputServlet.java
deleted file mode 100644
index c095fcc8..00000000
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/HashDataInputServlet.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2008 Federal Chancellery Austria and
- * Graz University of Technology
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package at.gv.egiz.bku.online.webapp;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.binding.BindingProcessor;
-import at.gv.egiz.bku.binding.Id;
-import at.gv.egiz.bku.binding.IdFactory;
-import at.gv.egiz.bku.slexceptions.SLRuntimeException;
-import at.gv.egiz.bku.utils.StreamUtil;
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.STAL;
-import at.gv.egiz.stal.service.impl.STALRequestBroker;
-
-public class HashDataInputServlet extends SpringBKUServlet {
-
-  private static Log log = LogFactory.getLog(HashDataInputServlet.class);
-
-  public HashDataInputServlet() {
-
-  }
-
-  private STALRequestBroker getSTAL(Id id) {
-    BindingProcessor bp = getBindingProcessorManager().getBindingProcessor(id);
-    if (bp == null) {
-      return null;
-    }
-    STAL stal = bp.getSTAL();
-    if (stal instanceof STALRequestBroker) {
-      return (STALRequestBroker) stal;
-    } else {
-      throw new SLRuntimeException("Unexpected STAL type");
-    }
-  }
-
-  private static boolean isMSIE(HttpServletRequest req) {
-    String useragent = req.getHeader("User-Agent");
-    String user = useragent.toLowerCase();
-    return (user.indexOf("msie") != -1);
-  }
-
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {
-    if ((req.getSession() == null) && (req.getSession().getId() != null)) {
-      log.warn("Got request for hashdatainput without session info");
-      resp.sendRedirect("expired.html");
-      return;
-    }
-    Id sessionId = IdFactory.getInstance().createId(req.getSession().getId());
-    log.debug("Got request for hashdata for session " + sessionId);
-    STALRequestBroker rb = getSTAL(sessionId);
-    if (rb == null) {
-      log.info("STAL instance not found for session: " + sessionId);
-      resp.sendRedirect("expired.html");
-      return;
-    }
-    List<HashDataInput> hdi = rb.getHashDataInput();
-    log.debug("Got hashdata list with " + hdi.size() + " entries");
-    String param = req.getParameter("refId");
-    log.debug("Got request for refId:" + param);
-    if ((param == null) && (hdi.size() > 1)) {
-      resp.sendRedirect("multiHashDataInput.html");
-      return;
-    }
-
-    if ((param == null) && (hdi.size() == 1)) {
-      param = hdi.get(0).getReferenceId();
-      log.debug("Request parameter not set, setting to: " + param);
-    }
-    for (HashDataInput hd : hdi) {
-      if (hd.getReferenceId().equals(param)) {
-        log.debug("Found hashdatainput for refId:" + param);
-        resp.setContentType(hd.getMimeType());
-
-        String charSet = hd.getEncoding();
-        if (charSet == null) {
-          charSet = "UTF-8";
-        }
-        resp.setCharacterEncoding(charSet);
-        if (isMSIE(req)) {
-          String fileExt = hd.getMimeType().equalsIgnoreCase("text/plain") ? ".txt"
-              : ".xhtml";
-          if (fileExt.equals(".xhtml")) {
-            if (req.getParameter("ieCType") == null) {
-              resp.sendRedirect("ieView.html");
-              return;
-            } else {
-              resp.setContentType(req.getParameter("ieCType"));
-              if (req.getParameter("ieCType").equals("application/xhtml+xml")) {
-                resp.addHeader("content-disposition", "attachment; filename="
-                    + param + ".xhtml");
-              }
-            }
-          }
-        }
-        Reader r = new InputStreamReader(hd.getHashDataInput(), charSet);
-        Writer w = new OutputStreamWriter(resp.getOutputStream(), charSet);
-        StreamUtil.copyStream(r, w);
-        w.flush();
-        return;
-
-      }
-    }
-    log.error("Cannot find hashdata for id:" + param);
-    resp.sendError(404);
-    return;
-  }
-
-  @Override
-  protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {
-    doGet(req, resp);
-  }
-
-}