summaryrefslogtreecommitdiff
path: root/BKUOnline/src/main/java/at
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-03-09 17:25:29 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-03-09 17:25:29 +0000
commita94eadabb2c0e524023619734ebb88162fb38c5c (patch)
tree32f6f3b32dfe0657801a515621d876f84c668056 /BKUOnline/src/main/java/at
parente177419331b8849497d25d3eb1866c5dc715bc88 (diff)
downloadmocca-a94eadabb2c0e524023619734ebb88162fb38c5c.tar.gz
mocca-a94eadabb2c0e524023619734ebb88162fb38c5c.tar.bz2
mocca-a94eadabb2c0e524023619734ebb88162fb38c5c.zip
AppletPageAlternative
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@313 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUOnline/src/main/java/at')
-rw-r--r--BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java33
-rw-r--r--BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java1
2 files changed, 25 insertions, 9 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 b858083b..4b275298 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
@@ -45,7 +45,9 @@ import at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage;
*
*/
public class BKURequestHandler extends SpringBKUServlet {
- public static final String BKU_APPLET_JSP = "BKUApplet";
+
+ public static final String APPLET_PAGE_P = "appletPage";
+ public static final String APPLET_PAGE_DEFAULT = "BKUApplet";
private static final long serialVersionUID = 1L;
@@ -69,7 +71,7 @@ public class BKURequestHandler extends SpringBKUServlet {
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, java.io.IOException {
- log.debug("Received new request");
+ log.debug("Received SecurityLayer request");
HttpSession session = req.getSession(false);
if (session != null) {
@@ -79,9 +81,9 @@ public class BKURequestHandler extends SpringBKUServlet {
IdFactory.getInstance().createId(session.getId()));
if (bp != null) {
log.debug("Found binding processor, using this one");
- RequestDispatcher dispatcher = getServletContext().getNamedDispatcher(
- BKU_APPLET_JSP);
- log.debug("forward to applet");
+ String appletPage = (String) session.getAttribute(APPLET_PAGE_P);
+ RequestDispatcher dispatcher = getServletContext().getNamedDispatcher(appletPage);
+ log.debug("forward to applet " + appletPage);
dispatcher.forward(req, resp);
return;
}
@@ -121,6 +123,15 @@ public class BKURequestHandler extends SpringBKUServlet {
getBindingProcessorManager().process(bindingProcessor);
log.trace("Trying to find applet parameters in request");
+
+ String appletPage = getStringFromStream(bindingProcessor
+ .getFormData(APPLET_PAGE_P), charset);
+ if (appletPage == null) {
+ appletPage = APPLET_PAGE_DEFAULT;
+ }
+ log.trace("requested appletPage " + appletPage);
+ session.setAttribute(APPLET_PAGE_P, appletPage);
+
String width = getStringFromStream(bindingProcessor
.getFormData("appletWidth"), charset);
String height = getStringFromStream(bindingProcessor
@@ -186,10 +197,16 @@ public class BKURequestHandler extends SpringBKUServlet {
log.info("Got redirect URL "+redirectUrl+". Deferring browser redirect.");
session.setAttribute(REDIRECT_URL_SESSION_ATTRIBUTE, redirectUrl);
}
- // TODO error if no dispatcher found
RequestDispatcher dispatcher = getServletContext().getNamedDispatcher(
- BKU_APPLET_JSP);
- log.debug("forward to applet");
+ appletPage);
+ if (dispatcher == null) {
+ log.warn("requested AppletPage " + appletPage + " not configured");
+ appletPage = APPLET_PAGE_DEFAULT;
+ session.setAttribute(APPLET_PAGE_P, APPLET_PAGE_DEFAULT);
+ dispatcher = getServletContext().getNamedDispatcher(
+ appletPage);
+ }
+ log.debug("forward to applet " + appletPage);
dispatcher.forward(req, resp);
}
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
index 7855b73c..a4d3e5d1 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
@@ -116,7 +116,6 @@ public class ResultServlet extends SpringBKUServlet {
return;
}
resp.setStatus(bp.getResponseCode());
-// log.info("ALLOW CACHING OF RESULT PAGE");
resp.setHeader("Cache-Control", "no-store"); // HTTP 1.1
resp.setHeader("Pragma", "no-cache"); // HTTP 1.0
resp.setDateHeader("Expires", 0);