From 26fd7c97a6cc333d00800c4c98a4f58a3dc7c2c5 Mon Sep 17 00:00:00 2001 From: clemenso Date: Wed, 11 Feb 2009 20:06:57 +0000 Subject: activation support, GetStatusRequest in stal schema git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@299 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../egiz/bku/online/webapp/BKURequestHandler.java | 6 +- .../gv/egiz/bku/online/webapp/ResultServlet.java | 6 +- .../gv/egiz/stal/service/impl/STALServiceImpl.java | 2 - .../src/main/webapp/WEB-INF/applicationContext.xml | 21 ++- BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd | 14 ++ BKUOnline/src/main/webapp/applet.jsp | 14 +- BKUOnline/src/main/webapp/css/applet.css | 16 ++ BKUOnline/src/main/webapp/css/login.css | 16 -- BKUOnline/src/main/webapp/slRequestForm.html | 183 +++++++++++++-------- BKUOnline/src/main/wsdl/stal-service.xsd | 14 ++ 10 files changed, 186 insertions(+), 106 deletions(-) create mode 100644 BKUOnline/src/main/webapp/css/applet.css delete mode 100644 BKUOnline/src/main/webapp/css/login.css (limited to 'BKUOnline/src/main') 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 c758bcee..b858083b 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 @@ -166,6 +166,10 @@ public class BKURequestHandler extends SpringBKUServlet { log.trace("Found applet hash data display parameter: " + hashDataDisplay); session.setAttribute("appletHashDataDisplay", hashDataDisplay); } + if (extension != null && !"".equals(extension)) { + log.trace("Found applet extension parameter: " + extension); + session.setAttribute("extension", extension); + } if (localeFormParam != null) { log.debug("overrule accept-language locale " + locale + " with form param " + localeFormParam); @@ -179,7 +183,7 @@ public class BKURequestHandler extends SpringBKUServlet { // handle server side redirect url after processing String redirectUrl = bindingProcessor.getRedirectURL(); if ( redirectUrl != null) { - log.debug("Got redirect URL "+redirectUrl+". Deferring browser redirect."); + log.info("Got redirect URL "+redirectUrl+". Deferring browser redirect."); session.setAttribute(REDIRECT_URL_SESSION_ATTRIBUTE, redirectUrl); } // TODO error if no dispatcher found 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 f271dfc9..12707117 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 @@ -109,15 +109,15 @@ public class ResultServlet extends SpringBKUServlet { bp.writeResultTo(new NullOutputStream(), encoding); getBindingProcessorManager().removeBindingProcessor(bp.getId()); } finally { - log.debug("Executing deferred browser redirect to: " + redirectUrl); + log.info("Executing deferred browser redirect to: " + redirectUrl); resp.sendRedirect(redirectUrl); session.invalidate(); } return; } resp.setStatus(bp.getResponseCode()); - resp.setHeader("Cache-Control", "no-store"); // HTTP 1.1 - resp.setHeader("Pragma", "no-cache"); // HTTP 1.0 + resp.setHeader("Cache-Control", "no-store"); // HTTP 1.1 + resp.setHeader("Pragma", "no-cache"); // HTTP 1.0 resp.setDateHeader("Expires", 0); if (configurator.getProperty(USER_AGENT_PROPERTY_KEY) != null) { resp.setHeader(HttpUtil.HTTP_HEADER_USER_AGENT, configurator 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 a30c6bb2..c30cd75d 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 @@ -16,8 +16,6 @@ */ package at.gv.egiz.stal.service.impl; -//import at.buergerkarte.namespaces.cardchannel.service.CommandAPDUType; -//import at.buergerkarte.namespaces.cardchannel.service.ScriptType; import at.buergerkarte.namespaces.cardchannel.service.CommandAPDUType; import at.buergerkarte.namespaces.cardchannel.service.ScriptType; import at.gv.egiz.bku.binding.BindingProcessor; diff --git a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml index 321e1e98..6a234b73 100644 --- a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml +++ b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml @@ -10,9 +10,9 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - --> - + + + @@ -55,9 +61,12 @@ - - - + + diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd index 6f3946dc..2389e043 100644 --- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd +++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd @@ -33,6 +33,7 @@ + @@ -65,6 +66,13 @@ + + + + + + + - -Security-Layer v1.2 Request Formular - - - -

Security-Layer v1.2 Request Formular

- + label { + float: left; + width: 8em; + margin-right: 0.5em; + padding-top: 0.2em; + text-align: right; + font-weight: bold; + color: #000; + padding-top: 0.2em; + } -

-

- -
Enter XML Request -

- -

-

-

-

- - tiny - simple - advanced - activation -

+ + +

+ + tiny + simple + advanced +

+

+

+

-

-
-
- +

+ + Activation + PIN Management +

+ + + +
+ + + diff --git a/BKUOnline/src/main/wsdl/stal-service.xsd b/BKUOnline/src/main/wsdl/stal-service.xsd index 450c8146..870e2db6 100644 --- a/BKUOnline/src/main/wsdl/stal-service.xsd +++ b/BKUOnline/src/main/wsdl/stal-service.xsd @@ -42,6 +42,7 @@ + @@ -77,6 +78,13 @@
+ + + + + + + @@ -133,6 +142,11 @@ + + + + + -- cgit v1.2.3