License

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

6 files changed, 164 insertions, 143 deletions

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
index b2d6c21f..c095fcc8 100644
--- 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
@@ -1,127 +1,144 @@
-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);

-  }

-

-}

+/*
+ * 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);
+  }
+
+}
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java
index 86da6c06..741b5e32 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java
@@ -1,3 +1,20 @@
+/*

+ * 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 org.apache.commons.logging.Log;

diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/RequestBrokerSTALFactory.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/RequestBrokerSTALFactory.java
index 9c4aca28..305d8c1c 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/RequestBrokerSTALFactory.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/RequestBrokerSTALFactory.java
@@ -14,10 +14,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 
 package at.gv.egiz.stal.service.impl;
 
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBroker.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBroker.java
index 63eac311..d1fe045a 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBroker.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBroker.java
@@ -14,10 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+
 package at.gv.egiz.stal.service.impl;
 
 import at.gv.egiz.stal.HashDataInput;
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
index 7f4a9273..e7fb928a 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
@@ -14,10 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+
 package at.gv.egiz.stal.service.impl;
 
 import at.gv.egiz.stal.ErrorResponse;
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index 99398fe6..13ec73aa 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -14,10 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+
 package at.gv.egiz.stal.service.impl;
 
 import at.gv.egiz.bku.binding.BindingProcessor;