activation support, GetStatusRequest in stal schema

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

3 files changed, 8 insertions, 6 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 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;