From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001 From: mcentner Date: Wed, 5 May 2010 15:29:01 +0000 Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk. git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- BKUOnline/src/main/webapp/IDRequestForm.html | 71 +++++ BKUOnline/src/main/webapp/PINManagement.jsp | 82 +++++- BKUOnline/src/main/webapp/SLRequestForm.html | 6 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 288 ++++++++++++++++----- .../src/main/webapp/WEB-INF/conf/configuration.xml | 10 + BKUOnline/src/main/webapp/WEB-INF/mocca-conf.xml | 51 ---- BKUOnline/src/main/webapp/WEB-INF/web.xml | 62 +++-- BKUOnline/src/main/webapp/applet.jsp | 132 +++++++++- BKUOnline/src/main/webapp/img/dec.png | Bin 0 -> 6311 bytes BKUOnline/src/main/webapp/img/help.png | Bin 0 -> 303 bytes BKUOnline/src/main/webapp/img/inc.png | Bin 0 -> 7198 bytes BKUOnline/src/main/webapp/local.jsp | 63 +++++ 12 files changed, 612 insertions(+), 153 deletions(-) create mode 100644 BKUOnline/src/main/webapp/IDRequestForm.html create mode 100644 BKUOnline/src/main/webapp/WEB-INF/conf/configuration.xml delete mode 100644 BKUOnline/src/main/webapp/WEB-INF/mocca-conf.xml create mode 100644 BKUOnline/src/main/webapp/img/dec.png create mode 100644 BKUOnline/src/main/webapp/img/help.png create mode 100644 BKUOnline/src/main/webapp/img/inc.png create mode 100644 BKUOnline/src/main/webapp/local.jsp (limited to 'BKUOnline/src/main/webapp') diff --git a/BKUOnline/src/main/webapp/IDRequestForm.html b/BKUOnline/src/main/webapp/IDRequestForm.html new file mode 100644 index 00000000..2682df4d --- /dev/null +++ b/BKUOnline/src/main/webapp/IDRequestForm.html @@ -0,0 +1,71 @@ + + + + + ID Request Form + + + + + + +

ID Request Form

+ + + + diff --git a/BKUOnline/src/main/webapp/PINManagement.jsp b/BKUOnline/src/main/webapp/PINManagement.jsp index 3555f99e..d5f71862 100644 --- a/BKUOnline/src/main/webapp/PINManagement.jsp +++ b/BKUOnline/src/main/webapp/PINManagement.jsp @@ -49,11 +49,43 @@ } String backgroundImg = request.getParameter("appletBackground"); %> - + + +

+ + + + + + + + + + +

diff --git a/BKUOnline/src/main/webapp/SLRequestForm.html b/BKUOnline/src/main/webapp/SLRequestForm.html index 2de652a7..2a372d83 100644 --- a/BKUOnline/src/main/webapp/SLRequestForm.html +++ b/BKUOnline/src/main/webapp/SLRequestForm.html @@ -73,7 +73,7 @@

Security-Layer v1.2 Request Formular

Enter XML Request @@ -186,8 +186,8 @@

Applet Page - Default - Alternative + Default + Alternative

- + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - - - - + - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BKUOnline/src/main/webapp/WEB-INF/conf/configuration.xml b/BKUOnline/src/main/webapp/WEB-INF/conf/configuration.xml new file mode 100644 index 00000000..20d27bb0 --- /dev/null +++ b/BKUOnline/src/main/webapp/WEB-INF/conf/configuration.xml @@ -0,0 +1,10 @@ + + + + + 50 + + \ No newline at end of file diff --git a/BKUOnline/src/main/webapp/WEB-INF/mocca-conf.xml b/BKUOnline/src/main/webapp/WEB-INF/mocca-conf.xml deleted file mode 100644 index 5c96dc58..00000000 --- a/BKUOnline/src/main/webapp/WEB-INF/mocca-conf.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml index 41cd400f..13ed30ee 100644 --- a/BKUOnline/src/main/webapp/WEB-INF/web.xml +++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml @@ -15,19 +15,23 @@ http-security-layer-request - - - contextConfigLocation - /WEB-INF/applicationContext.xml - - org.springframework.web.context.ContextLoaderListener + at.gv.egiz.bku.online.webapp.MoccaContextListener + + + + org.springframework.web.context.ContextLoaderListener + + + configurationResource + + - at.gv.egiz.bku.online.webapp.SessionTimeout + at.gv.egiz.bku.online.webapp.SessionListener com.sun.xml.ws.transport.http.servlet.WSServletContextListener @@ -36,6 +40,14 @@ BKUServlet at.gv.egiz.bku.online.webapp.BKURequestHandler + + SAMLServlet + at.gv.egiz.mocca.id.SAMLRequestHandler + + + DataURLServlet + at.gv.egiz.mocca.id.DataURLServerServlet +

ResultServlet

at.gv.egiz.bku.online.webapp.ResultServlet @@ -45,31 +57,39 @@ expiredPage -

expired.html

- - BKUApplet - /applet.jsp - - - STALService - com.sun.xml.ws.transport.http.servlet.WSServlet - 1 - - - BKUServlet - /http-security-layer-request - + + STALService + com.sun.xml.ws.transport.http.servlet.WSServlet + 1 + + + BKUServlet + /http-security-layer-request +

BKUServlet

/https-security-layer-request

+ + DataURLServlet + /DataURLServer +

ResultServlet

/bkuResult

+ + SAMLServlet + /moccaid + + + DataURLServlet + /DataURLServer + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BKUOnline/src/main/webapp/img/dec.png b/BKUOnline/src/main/webapp/img/dec.png new file mode 100644 index 00000000..87693cf4 Binary files /dev/null and b/BKUOnline/src/main/webapp/img/dec.png differ diff --git a/BKUOnline/src/main/webapp/img/help.png b/BKUOnline/src/main/webapp/img/help.png new file mode 100644 index 00000000..5d6da3bf Binary files /dev/null and b/BKUOnline/src/main/webapp/img/help.png differ diff --git a/BKUOnline/src/main/webapp/img/inc.png b/BKUOnline/src/main/webapp/img/inc.png new file mode 100644 index 00000000..26e58b80 Binary files /dev/null and b/BKUOnline/src/main/webapp/img/inc.png differ diff --git a/BKUOnline/src/main/webapp/local.jsp b/BKUOnline/src/main/webapp/local.jsp new file mode 100644 index 00000000..48d62674 --- /dev/null +++ b/BKUOnline/src/main/webapp/local.jsp @@ -0,0 +1,63 @@ + +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8" + import="at.gv.egiz.bku.online.webapp.AppletDispatcher,org.apache.commons.lang.RandomStringUtils,org.apache.commons.lang.StringEscapeUtils" %> + + + + + + MOCCA + + + + + + + + <% + int width = session.getAttribute("appletWidth") == null ? 190 + : (Integer) session.getAttribute("appletWidth"); + int height = session.getAttribute("appletHeight") == null ? 130 + : (Integer) session.getAttribute("appletHeight"); + String backgroundImg = StringEscapeUtils.escapeJavaScript(session + .getAttribute("appletBackground") == null ? "../img/chip32.png" + : (String) session.getAttribute("appletBackground")); + String backgroundColor = StringEscapeUtils + .escapeJavaScript((String) session + .getAttribute("appletBackgroundColor")); + + String sessionId = StringEscapeUtils.escapeJavaScript(session.getId()); + + String dataURL = request.getRequestURL().toString(); + dataURL = dataURL.substring(0, dataURL.lastIndexOf('/')) + "/DataURLServer"; + %> + +

+ +

+ + -- cgit v1.2.3