From 66e441c808de4269103cecf31ffd09252983917e Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 27 Nov 2008 15:25:58 +0000
Subject: locale config

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@222 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../egiz/bku/online/webapp/BKURequestHandler.java  |  36 ++++--
 .../bku/online/webapp/HashDataInputServlet.java    | 144 ---------------------
 2 files changed, 26 insertions(+), 154 deletions(-)
 delete mode 100644 BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/HashDataInputServlet.java

(limited to 'BKUOnline/src/main/java')

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 660fee78..f31559cd 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
@@ -37,12 +37,14 @@ import at.gv.egiz.bku.binding.HttpUtil;
 import at.gv.egiz.bku.binding.IdFactory;
 import at.gv.egiz.bku.utils.StreamUtil;
 import at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage;
+import javax.servlet.RequestDispatcher;
 
 /**
  * Handles SL requests and instantiates BindingProcessors
  * 
  */
 public class BKURequestHandler extends SpringBKUServlet {
+  public static final String BKU_APPLET_JSP = "BKUApplet";
 
   private static final long serialVersionUID = 1L;
 
@@ -66,23 +68,26 @@ public class BKURequestHandler extends SpringBKUServlet {
   protected void doPost(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, java.io.IOException {
     log.debug("Got new request");
-    HttpSession session = req.getSession();
-    String lang = req.getHeader("Accept-Language");
-    Locale locale = AcceptLanguage.getLocale(lang);
-    log.debug("Using locale: " + locale);
+    String acceptLanguage = req.getHeader("Accept-Language");
+    Locale locale = AcceptLanguage.getLocale(acceptLanguage);
+    log.debug("Accept-Language locale: " + locale);
 
+    HttpSession session = req.getSession(false);
     if (session != null) {
       log.warn("Already a session with id: " + session.getId()
           + " active, deleting this one");
       getBindingProcessorManager().removeBindingProcessor(
           IdFactory.getInstance().createId(session.getId()));
     }
-    String id = req.getSession(true).getId();
-    log.debug("Using session id: " + id);
+    session = req.getSession(true);
+    if (log.isDebugEnabled()) {
+      log.debug("Using session id: " + session.getId());
+    }
+    
     HTTPBindingProcessor bindingProcessor;
 
     bindingProcessor = (HTTPBindingProcessor) getBindingProcessorManager()
-        .createBindingProcessor(req.getRequestURL().toString(), id, locale);
+        .createBindingProcessor(req.getRequestURL().toString(), session.getId(), locale);
 
     Map<String, String> headerMap = new HashMap<String, String>();
     for (Enumeration<String> headerName = req.getHeaderNames(); headerName
@@ -109,6 +114,7 @@ public class BKURequestHandler extends SpringBKUServlet {
     String background = getStringFromStream(bindingProcessor.getFormData("appletBackground"), charset);
     String guiStyle = getStringFromStream(bindingProcessor.getFormData("appletGuiStyle"), charset);
     String hashDataDisplay = getStringFromStream(bindingProcessor.getFormData("appletHashDataDisplay"), charset);
+    String localeFormParam = getStringFromStream(bindingProcessor.getFormData("locale"), charset);
     if (width != null) {
       try {
         log.trace("Found applet width parameter: " + width);
@@ -139,9 +145,19 @@ public class BKURequestHandler extends SpringBKUServlet {
       log.trace("Found applet hash data display parameter: " + hashDataDisplay);
       session.setAttribute("appletHashDataDisplay", hashDataDisplay);
     }
-    String redirectUrl = REDIRECT_URL+";jsessionid="+session.getId();
-    log.debug("Redirecting to: "+redirectUrl);
-    resp.sendRedirect(redirectUrl);
+    if (localeFormParam != null) {
+      log.debug("overrule accept-language locale " + locale + " with form param " + localeFormParam);
+      locale = new Locale(localeFormParam);
+    }
+    if (locale != null) {
+      log.debug("Using locale " + locale);
+      session.setAttribute("locale", locale.toString());
+    }
+
+    //TODO error if no dispatcher found
+    RequestDispatcher dispatcher = getServletContext().getNamedDispatcher(BKU_APPLET_JSP);
+    log.debug("forward to applet");
+    dispatcher.forward(req, resp);
   }
 
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
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
deleted file mode 100644
index c095fcc8..00000000
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/HashDataInputServlet.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * 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);
-  }
-
-}
-- 
cgit v1.2.3


From 05fdd03fdc275a3b728b6b6b5892c9fae5e401ee Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 28 Nov 2008 12:07:40 +0000
Subject: Changed session handling strategy when reconnecting (eg. reload
 pressed)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@224 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/webapp/BKURequestHandler.java   |   8 +++++---
 .../main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar    | Bin 0 -> 182156 bytes
 .../java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java |   8 ++------
 3 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar

(limited to 'BKUOnline/src/main/java')

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 f31559cd..3aa6bc19 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
@@ -75,9 +75,11 @@ public class BKURequestHandler extends SpringBKUServlet {
     HttpSession session = req.getSession(false);
     if (session != null) {
       log.warn("Already a session with id: " + session.getId()
-          + " active, deleting this one");
-      getBindingProcessorManager().removeBindingProcessor(
-          IdFactory.getInstance().createId(session.getId()));
+          + " active, continuing");
+      RequestDispatcher dispatcher = getServletContext().getNamedDispatcher(BKU_APPLET_JSP);
+      log.debug("forward to applet");
+      dispatcher.forward(req, resp);
+      return;
     }
     session = req.getSession(true);
     if (log.isDebugEnabled()) {
diff --git a/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar b/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar
new file mode 100644
index 00000000..669a1f92
Binary files /dev/null and b/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar differ
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
index 04d8d0dd..55f51b22 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
@@ -24,8 +24,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -36,7 +34,6 @@ import at.gv.egiz.stal.InfoboxReadRequest;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
-import java.util.Collections;
 
 public abstract class AbstractSMCCSTAL implements STAL {
   private static Log log = LogFactory.getLog(AbstractSMCCSTAL.class);
@@ -106,7 +103,7 @@ public abstract class AbstractSMCCSTAL implements STAL {
           log.info("Interrupt in handleRequest, do not retry");
           throw e;
         } catch (Exception e) {
-          log.info("Error while handling STAL request:" + e);
+          log.info("Error while handling STAL request:", e);
           if (++retryCounter < maxRetries) {
             signatureCard.disconnect(true);
             signatureCard = null;
@@ -143,8 +140,7 @@ public abstract class AbstractSMCCSTAL implements STAL {
         }
       } catch (InterruptedException ex) {
         log.error("got interrupted, return ErrorResponse 6001");
-        responseList = Collections.singletonList((STALResponse) new ErrorResponse(6001));
-        break;
+        throw new RuntimeException(ex);
       }
       
     }
-- 
cgit v1.2.3


From 2df9621154ad057f6cace73efe49c9ef42515fde Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 9 Dec 2008 08:14:43 +0000
Subject: Refactored STAL interface. Additional infobox functionality.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@236 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/local/stal/LocalBKUWorker.java  |   4 +-
 .../src/main/webapp/WEB-INF/applicationContext.xml |   9 +-
 .../stal/service/impl/STALRequestBrokerImpl.java   |   2 +-
 STAL/src/main/java/at/gv/egiz/stal/STAL.java       |   2 +-
 .../gv/egiz/bku/slcommands/SLCommandFactory.java   |  38 +++-
 .../slcommands/impl/AbstractBinaryFileInfobox.java |   4 +-
 .../impl/AbstractInfoboxCommandImpl.java           |   9 +
 .../bku/slcommands/impl/AbstractInfoboxImpl.java   |  19 ++
 .../slcommands/impl/CardChannelInfoboxImpl.java    | 235 +++++++++++++++++++++
 .../at/gv/egiz/bku/slcommands/impl/Infobox.java    |  21 +-
 .../slcommands/impl/InfoboxReadCommandImpl.java    |   9 -
 .../bku/slcommands/impl/InfoboxReadResultImpl.java |  12 ++
 .../slcommands/impl/InfoboxUpdateCommandImpl.java  | 124 ++---------
 .../gv/egiz/bku/slcommands/impl/SLResultImpl.java  |  56 +++++
 .../at/gv/egiz/bku/slcommands/impl/STALHelper.java |   2 +-
 .../test/java/at/gv/egiz/stal/dummy/DummySTAL.java |   2 +-
 .../at/gv/egiz/smcc/AbstractSignatureCard.java     |  30 ++-
 smcc/src/main/java/at/gv/egiz/smcc/SWCard.java     |  12 +-
 .../main/java/at/gv/egiz/smcc/SignatureCard.java   |  12 +-
 .../java/at/gv/egiz/smcc/SignatureCardFactory.java |   8 +-
 .../main/java/at/gv/egiz/smcc/util/SMCCHelper.java |   4 +-
 .../java/at/gv/egiz/smcc/util/SmartCardIO.java     |   9 +-
 .../at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java  |   2 +-
 .../java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java |  15 +-
 .../at/gv/egiz/bku/utils/DebugOutputStream.java    |  48 +++++
 .../java/at/gv/egiz/bku/utils/DebugReader.java     |  58 +++++
 .../java/at/gv/egiz/bku/utils/DebugWriter.java     |  55 +++++
 27 files changed, 657 insertions(+), 144 deletions(-)
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CardChannelInfoboxImpl.java
 create mode 100644 utils/src/main/java/at/gv/egiz/bku/utils/DebugOutputStream.java
 create mode 100644 utils/src/main/java/at/gv/egiz/bku/utils/DebugReader.java
 create mode 100644 utils/src/main/java/at/gv/egiz/bku/utils/DebugWriter.java

(limited to 'BKUOnline/src/main/java')

diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
index 57b159ad..91d0aba0 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
@@ -22,6 +22,8 @@ import at.gv.egiz.stal.QuitRequest;
 import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
+import at.gv.egiz.stal.ext.APDUScriptRequest;
+
 import java.util.List;
 import javax.swing.JDialog;
 
@@ -40,7 +42,7 @@ public class LocalBKUWorker extends AbstractBKUWorker {
   }
 
   @Override
-  public List<STALResponse> handleRequest(List<STALRequest> requestList) {
+  public List<STALResponse> handleRequest(List<? extends STALRequest> requestList) {
     signatureCard = null;
     List<STALResponse> responses = super.handleRequest(requestList);
     // container.setVisible(false);
diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index 5ac12ece..eb7d5b7a 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -59,6 +59,9 @@
         <entry
           key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:InfoboxReadRequest"
           value="at.gv.egiz.bku.slcommands.impl.InfoboxReadCommandImpl" />
+        <entry
+          key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:InfoboxUpdateRequest"
+          value="at.gv.egiz.bku.slcommands.impl.InfoboxUpdateCommandImpl" />
         <entry
           key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:CreateXMLSignatureRequest"
           value="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandImpl" />
@@ -76,9 +79,9 @@
         <entry
           key="IdentityLink"
           value="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxImpl" />
-<!--        <entry-->
-<!--          key="CardChannel"-->
-<!--          value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />-->
+        <entry
+          key="CardChannel"
+          value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />
       </map>
     </property>
   </bean>
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 e7fb928a..5e3a1a99 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
@@ -85,7 +85,7 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
      * @pre requests: either single SignRequest, QuitRequest or multiple ReadInfoboxRequests
      */
     @Override
-    public List<STALResponse> handleRequest(List<STALRequest> stalRequests) {
+    public List<STALResponse> handleRequest(List<? extends STALRequest> stalRequests) {
       if (interrupted) {
         return null;
       }
diff --git a/STAL/src/main/java/at/gv/egiz/stal/STAL.java b/STAL/src/main/java/at/gv/egiz/stal/STAL.java
index de29de9a..7fa7cb45 100644
--- a/STAL/src/main/java/at/gv/egiz/stal/STAL.java
+++ b/STAL/src/main/java/at/gv/egiz/stal/STAL.java
@@ -32,7 +32,7 @@ public interface STAL {
    * @param aRequestList
    * @return
    */
-  public List<STALResponse> handleRequest(List<STALRequest> aRequestList);
+  public List<STALResponse> handleRequest(List<? extends STALRequest> aRequestList);
   
   /**
    * Sets the preferred locale for userinteraction (e.g. PIN dialogs).
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
index 9c98ef8a..bec2b253 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
@@ -17,6 +17,7 @@
 package at.gv.egiz.bku.slcommands;
 
 import java.io.IOException;
+import java.io.Reader;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -41,10 +42,12 @@ import org.apache.commons.logging.LogFactory;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
+import at.buergerkarte.namespaces.cardchannel.ObjectFactory;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLExceptionMessages;
 import at.gv.egiz.bku.slexceptions.SLRequestException;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.bku.utils.DebugReader;
 import at.gv.egiz.slbinding.RedirectEventFilter;
 import at.gv.egiz.slbinding.RedirectUnmarshallerListener;
 
@@ -163,8 +166,9 @@ public class SLCommandFactory {
         if (jaxbContext == null) {
             try {
                 String slPkg = at.buergerkarte.namespaces.securitylayer._1.ObjectFactory.class.getPackage().getName();
-                String xmldsigPkg = org.w3._2000._09.xmldsig_.ObjectFactory.class.getPackage().getName();
-                setJaxbContext(JAXBContext.newInstance(slPkg + ":" + xmldsigPkg));
+                String xmldsigPkg = org.w3._2000._09.xmldsig_.ObjectFactory.class.getPackage().getName();
+                String cardChannelPkg = at.buergerkarte.namespaces.cardchannel.ObjectFactory.class.getPackage().getName();
+                setJaxbContext(JAXBContext.newInstance(slPkg + ":" + xmldsigPkg + ":" + cardChannelPkg));
             } catch (JAXBException e) {
                 log.error("Failed to setup JAXBContext security layer request.", e);
                 throw new SLRuntimeException(e);
@@ -325,12 +329,31 @@ public class SLCommandFactory {
      */
     @SuppressWarnings("unchecked")
     public SLCommand createSLCommand(Source source, SLCommandContext context)
-      throws SLCommandException, SLRuntimeException, SLRequestException {
+      throws SLCommandException, SLRuntimeException, SLRequestException {
+      
+        DebugReader dr = null;
+        if (log.isTraceEnabled() && source instanceof StreamSource) {
+          StreamSource streamSource = (StreamSource) source;
+          if (streamSource.getReader() != null) {
+            dr = new DebugReader(streamSource.getReader(), "SLCommand unmarshalled from:\n");
+            streamSource.setReader(dr);
+          }
+        }
 
-        Object object = unmarshal(source);
+        Object object;
+        try {
+          object = unmarshal(source);
+        } catch (SLRequestException e) {
+          throw e;
+        } finally {
+          if (dr != null) {
+            log.trace(dr.getCachedString());
+          }
+        }
+        
         if (!(object instanceof JAXBElement)) {
             // invalid request
-            log.info("Invalid security layer request. " + object.toString());
+            log.info("Invalid security layer request. " + object.toString());
             throw new SLRequestException(3002, SLExceptionMessages.EC3002_INVALID,
               new Object[]{object.toString()});
         }
@@ -343,7 +366,9 @@ public class SLCommandFactory {
             throw new SLCommandException(4011,
               SLExceptionMessages.EC4011_NOTIMPLEMENTED, new Object[]{qName.toString()});
         }
-
+
+        
+        
         // try to instantiate
         SLCommand slCommand;
         try {
@@ -360,6 +385,7 @@ public class SLCommandFactory {
               e);
             throw new SLRuntimeException(e);
         }
+
         slCommand.init(context, (JAXBElement) object);
 
         return slCommand;
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractBinaryFileInfobox.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractBinaryFileInfobox.java
index 07ca639c..23394bd5 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractBinaryFileInfobox.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractBinaryFileInfobox.java
@@ -37,7 +37,7 @@ public abstract class AbstractBinaryFileInfobox extends AbstractInfoboxImpl impl
   /**
    * Is this infobox' content an XML entity?
    */
-  private boolean isXMLEntity = false;
+  protected boolean isXMLEntity = false;
   
   /**
    * @return <code>true</code> if this infobox' content is an XML entity or <code>false</code> otherwise.
@@ -61,8 +61,6 @@ public abstract class AbstractBinaryFileInfobox extends AbstractInfoboxImpl impl
     }
     
   }
-
-  
   
 
 }
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxCommandImpl.java
index 305769a8..8a7edb71 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxCommandImpl.java
@@ -52,4 +52,13 @@ public abstract class AbstractInfoboxCommandImpl<T> extends SLCommandImpl<T> {
    */
   protected abstract String getInfoboxIdentifier(T request);
 
+
+  public String getInfoboxIdentifier() {
+    if (infobox != null) {
+      return infobox.getIdentifier();
+    } else {
+      return null;
+    }
+  }
+  
 }
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxImpl.java
index e5c7afcc..564cb8ff 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxImpl.java
@@ -16,6 +16,13 @@
  */
 package at.gv.egiz.bku.slcommands.impl;
 
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadRequestType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxUpdateRequestType;
+import at.gv.egiz.bku.slcommands.InfoboxReadResult;
+import at.gv.egiz.bku.slcommands.InfoboxUpdateResult;
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+
 /**
  * An abstract base class for {@link Infobox} implementations.
  * 
@@ -23,4 +30,16 @@ package at.gv.egiz.bku.slcommands.impl;
  */
 public abstract class AbstractInfoboxImpl implements Infobox {
 
+  @Override
+  public InfoboxReadResult read(InfoboxReadRequestType request,
+      SLCommandContext cmdCtx) throws SLCommandException {
+    throw new SLCommandException(4011);
+  }
+
+  @Override
+  public InfoboxUpdateResult update(InfoboxUpdateRequestType request,
+      SLCommandContext cmdCtx) throws SLCommandException {
+    throw new SLCommandException(4011);
+  }
+  
 }
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CardChannelInfoboxImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CardChannelInfoboxImpl.java
new file mode 100644
index 00000000..4b1cc779
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CardChannelInfoboxImpl.java
@@ -0,0 +1,235 @@
+/*
+* 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.slcommands.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.WeakHashMap;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.buergerkarte.namespaces.cardchannel.ATRType;
+import at.buergerkarte.namespaces.cardchannel.CommandAPDUType;
+import at.buergerkarte.namespaces.cardchannel.ObjectFactory;
+import at.buergerkarte.namespaces.cardchannel.ResetType;
+import at.buergerkarte.namespaces.cardchannel.ResponseAPDUType;
+import at.buergerkarte.namespaces.cardchannel.ResponseType;
+import at.buergerkarte.namespaces.cardchannel.ScriptType;
+import at.buergerkarte.namespaces.cardchannel.VerifyAPDUType;
+import at.buergerkarte.namespaces.securitylayer._1.Base64XMLContentType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadRequestType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxUpdateRequestType;
+import at.buergerkarte.namespaces.securitylayer._1.XMLContentType;
+import at.gv.egiz.bku.slcommands.InfoboxReadResult;
+import at.gv.egiz.bku.slcommands.InfoboxUpdateResult;
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.stal.STAL;
+import at.gv.egiz.stal.ext.APDUScriptRequest;
+import at.gv.egiz.stal.ext.APDUScriptResponse;
+import at.gv.egiz.stal.ext.APDUScriptRequest.RequestScriptElement;
+import at.gv.egiz.stal.ext.APDUScriptResponse.ResponseScriptElement;
+
+public class CardChannelInfoboxImpl extends AbstractBinaryFileInfobox {
+  
+  private static Log log = LogFactory.getLog(CardChannelInfoboxImpl.class);
+  
+  private static WeakHashMap<STAL, JAXBElement<ResponseType>> scriptResults = new WeakHashMap<STAL, JAXBElement<ResponseType>>();
+  
+  private static JAXBContext jaxbContext; 
+  
+  static {
+    try {
+      jaxbContext = JAXBContext.newInstance(ObjectFactory.class.getPackage().getName());
+    } catch (JAXBException e) {
+      throw new SLRuntimeException("Failed to initalize CardChannel infobox.", e);
+    }
+  }
+
+  public CardChannelInfoboxImpl() {
+    isXMLEntity = true;
+  }
+  
+  @Override
+  public String getIdentifier() {
+    return "CardChannel";
+  }
+
+  @Override
+  public InfoboxReadResult read(InfoboxReadRequestType request,
+      SLCommandContext cmdCtx) throws SLCommandException {
+    
+    at.buergerkarte.namespaces.securitylayer._1.ObjectFactory objectFactory 
+    = new at.buergerkarte.namespaces.securitylayer._1.ObjectFactory();
+
+    Base64XMLContentType content = objectFactory.createBase64XMLContentType();
+    XMLContentType xmlContent = objectFactory.createXMLContentType();
+    content.setXMLContent(xmlContent);
+
+    JAXBElement<ResponseType> response = scriptResults.get(cmdCtx.getSTAL());
+    if (response != null) {
+      xmlContent.getContent().add(response);
+    }
+
+    return new InfoboxReadResultImpl(content);
+    
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public InfoboxUpdateResult update(InfoboxUpdateRequestType request,
+      SLCommandContext cmdCtx) throws SLCommandException {
+
+    Base64XMLContentType binaryFileParameters = request.getBinaryFileParameters();
+    
+    if (binaryFileParameters.getBase64Content() != null) {
+      log.info("Got Base64Content but ContentIsXMLEntity is true.");
+      throw new SLCommandException(4010);
+    }
+    
+    XMLContentType content = binaryFileParameters.getXMLContent();
+    if (content instanceof at.gv.egiz.slbinding.impl.XMLContentType) {
+
+      ByteArrayOutputStream redirectedStream = ((at.gv.egiz.slbinding.impl.XMLContentType) content).getRedirectedStream();
+      if (redirectedStream != null) {
+        
+        if (log.isDebugEnabled()) {
+
+          StringBuilder sb = new StringBuilder();
+          sb.append("CardChannel script:\n");
+          try {
+            sb.append(new String(redirectedStream.toByteArray(), "UTF-8"));
+          } catch (UnsupportedEncodingException e) {
+            sb.append(e.getMessage());
+          }
+          log.debug(sb.toString());
+        }
+        
+        Object object;
+        try {
+          Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+          object = unmarshaller.unmarshal(new ByteArrayInputStream(redirectedStream.toByteArray()));
+        } catch (JAXBException e) {
+          log.info("Failed to parse CardChannel script.", e);
+          throw new SLCommandException(4011);
+        }
+        
+        if (object instanceof JAXBElement) {
+          executeCardChannelScript(((JAXBElement<ScriptType>) object).getValue(), cmdCtx);
+          return new InfoboxUpdateResultImpl();
+        }
+        
+      }
+
+    
+    }
+    log.info("Infobox identifier is '" + getIdentifier() + "' but XMLContent does not contain 'Script'.");
+    throw new SLCommandException(4010);
+    
+  }
+
+  protected void executeCardChannelScript(ScriptType script,
+      SLCommandContext cmdCtx) throws SLCommandException {
+    
+    List<Object> resetOrCommandAPDUOrVerifyAPDU = script.getResetOrCommandAPDUOrVerifyAPDU();
+    List<RequestScriptElement> requestScript = new ArrayList<RequestScriptElement>();
+    
+    for (Object element : resetOrCommandAPDUOrVerifyAPDU) {
+      
+      if (element instanceof ResetType) {
+      
+        requestScript.add(new APDUScriptRequest.Reset());
+      
+      } else if (element instanceof CommandAPDUType) {
+      
+        CommandAPDUType commandAPDU = (CommandAPDUType) element;
+        int sequence = (commandAPDU.getSequence() != null) 
+              ? commandAPDU.getSequence().intValue() 
+              : 0;
+
+        requestScript.add(
+            new APDUScriptRequest.Command(
+                sequence, 
+                commandAPDU.getValue(), 
+                commandAPDU.getExpectedSW()));
+        
+      } else if (element instanceof VerifyAPDUType) {
+        log.warn("CardChannel script command 'VerifyAPDU' not implemented.");
+        throw new SLCommandException(4011);
+      }
+    }
+    
+    APDUScriptRequest scriptRequest = new APDUScriptRequest(requestScript);
+    
+    STAL stal = cmdCtx.getSTAL();
+    STALHelper helper = new STALHelper(stal);
+    
+    helper.transmitSTALRequest(Collections.singletonList(scriptRequest));
+    
+    List<ResponseScriptElement> responseScript = ((APDUScriptResponse) helper
+        .nextResponse(APDUScriptResponse.class)).getScript();
+    
+    ObjectFactory objectFactory = new ObjectFactory();
+    
+    ResponseType responseType = objectFactory.createResponseType();
+    
+    
+    for (ResponseScriptElement element : responseScript) {
+      
+      if (element instanceof APDUScriptResponse.ATR) {
+        
+        byte[] atr = ((APDUScriptResponse.ATR) element).getAtr();
+        
+        ATRType atrType = objectFactory.createATRType();
+        atrType.setValue(atr);
+        atrType.setRc(BigInteger.ZERO);
+        responseType.getATROrResponseAPDU().add(atrType);
+        
+      } else if (element instanceof APDUScriptResponse.Response) {
+        
+        APDUScriptResponse.Response response = (APDUScriptResponse.Response) element;
+        
+        ResponseAPDUType responseAPDUType = objectFactory.createResponseAPDUType();
+        responseAPDUType.setSequence(BigInteger.valueOf(response.getSequence()));
+//        if (response.getRc() != 0) {
+          responseAPDUType.setRc(BigInteger.valueOf(response.getRc()));
+//        }
+        responseAPDUType.setSw(response.getSw());
+        responseAPDUType.setValue(response.getApdu());
+        
+        responseType.getATROrResponseAPDU().add(responseAPDUType);
+      }
+      
+    }
+    
+    scriptResults.put(stal, objectFactory.createResponse(responseType));
+  }
+
+  
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/Infobox.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/Infobox.java
index a6f8cbb2..99d62721 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/Infobox.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/Infobox.java
@@ -17,7 +17,9 @@
 package at.gv.egiz.bku.slcommands.impl;
 
 import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadRequestType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxUpdateRequestType;
 import at.gv.egiz.bku.slcommands.InfoboxReadResult;
+import at.gv.egiz.bku.slcommands.InfoboxUpdateResult;
 import at.gv.egiz.bku.slcommands.SLCommandContext;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 
@@ -44,10 +46,25 @@ public interface Infobox {
    * 
    * @return the data read from this infobox as InfoboxReadResult
    * 
-   * @throws SLCommandException
-   *           if reading from this infobox fails
+   * @throws SLCommandException 
+   * 
+   *            if reading from this infobox fails
    */
   public InfoboxReadResult read(InfoboxReadRequestType request,
       SLCommandContext cmdCtx) throws SLCommandException;
 
+  /**
+   * Update data in this infobox.
+   * 
+   * @param request
+   *          the InfoboxUpdateRequest
+   * @param cmdCtx
+   *          the command context
+   * @return a corresponding InfoboxUpdateResult
+   * @throws SLCommandException
+   *           if updating this infobox fails
+   */
+  public InfoboxUpdateResult update(InfoboxUpdateRequestType request,
+      SLCommandContext cmdCtx) throws SLCommandException;
+
 }
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java
index aaa786a6..693f444f 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java
@@ -83,7 +83,6 @@ public class InfoboxReadCommandImpl extends AbstractInfoboxCommandImpl<InfoboxRe
     }
     
   }
- 
 
   @Override
   public String getIdentityLinkDomainId() {
@@ -94,12 +93,4 @@ public class InfoboxReadCommandImpl extends AbstractInfoboxCommandImpl<InfoboxRe
     }
   }
 
-  @Override
-  public String getInfoboxIdentifier() {
-    if (infobox != null) {
-      return infobox.getIdentifier();
-    } else {
-      return null;
-    }
-  }
 }
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultImpl.java
index a2b8ac9f..e508941d 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultImpl.java
@@ -20,6 +20,7 @@ import javax.xml.bind.JAXBElement;
 import javax.xml.transform.Result;
 import javax.xml.transform.Templates;
 
+import at.buergerkarte.namespaces.securitylayer._1.Base64XMLContentType;
 import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadDataAssocArrayType;
 import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadResponseType;
 import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
@@ -41,6 +42,17 @@ public class InfoboxReadResultImpl extends SLResultImpl implements InfoboxReadRe
     
     this.infoboxReadResponse = infoboxReadResponseType;
   }
+  
+  public InfoboxReadResultImpl(Base64XMLContentType value) {
+    
+    ObjectFactory objectFactory = new ObjectFactory();
+    InfoboxReadResponseType infoboxReadResponseType = objectFactory.createInfoboxReadResponseType();
+    
+    infoboxReadResponseType.setBinaryFileData(value);
+    
+    this.infoboxReadResponse = infoboxReadResponseType;
+    
+  }
 
   @Override
   public void writeTo(Result result, Templates templates) {
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxUpdateCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxUpdateCommandImpl.java
index 6d281686..1cdeda94 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxUpdateCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxUpdateCommandImpl.java
@@ -16,143 +16,59 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
-import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import at.buergerkarte.namespaces.cardchannel.CommandAPDUType;
-import at.buergerkarte.namespaces.cardchannel.ResetType;
-import at.buergerkarte.namespaces.cardchannel.ScriptType;
-import at.buergerkarte.namespaces.cardchannel.VerifyAPDUType;
-import at.buergerkarte.namespaces.securitylayer._1.Base64XMLContentType;
 import at.buergerkarte.namespaces.securitylayer._1.InfoboxUpdateRequestType;
 import at.gv.egiz.bku.slcommands.InfoboxUpdateCommand;
 import at.gv.egiz.bku.slcommands.SLCommandContext;
 import at.gv.egiz.bku.slcommands.SLResult;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
-import at.gv.egiz.bku.slexceptions.SLExceptionMessages;
 
 public class InfoboxUpdateCommandImpl extends
-    SLCommandImpl<InfoboxUpdateRequestType> implements InfoboxUpdateCommand {
+    AbstractInfoboxCommandImpl<InfoboxUpdateRequestType> implements InfoboxUpdateCommand {
   
   private static Log log = LogFactory.getLog(InfoboxUpdateCommandImpl.class);
 
-  public static final String INFOBOX_IDENTIFIER_CARD_CHANNEL = "CardChannel";
+  @Override
+  public String getName() {
+    return "InfoboxUpdateRequest";
+  }
 
-  protected String infoboxIdentifier;
-  
-  protected List<Object> cardChannelScript;
-  
   @Override
-  public String getInfoboxIdentifier() {
-    return infoboxIdentifier;
+  protected String getInfoboxIdentifier(InfoboxUpdateRequestType request) {
+    return request.getInfoboxIdentifier();
   }
-  
+
   @Override
-  public void init(SLCommandContext ctx, Object request)
-      throws SLCommandException {
+  public void init(SLCommandContext ctx, Object request) throws SLCommandException {
     super.init(ctx, request);
     
     InfoboxUpdateRequestType req = getRequestValue();
     
-    infoboxIdentifier = req.getInfoboxIdentifier();
+    if (req.getAssocArrayParameters() != null && 
+        !(infobox instanceof AssocArrayInfobox)) {
+      log.info("Got AssocArrayParameters but Infobox type is not AssocArray.");
+      throw new SLCommandException(4010);
+    }
     
-    if (INFOBOX_IDENTIFIER_CARD_CHANNEL.equals(infoboxIdentifier)) {
-
-      if (req.getAssocArrayParameters() != null) {
-        log.info("Got AssocArrayParameters but Infobox type is BinaryFile.");
-        throw new SLCommandException(4010);
-      }
-      
-      Base64XMLContentType binaryFileParameters = req.getBinaryFileParameters();
-      if (binaryFileParameters == null) {
-        log.info("Got no BinaryFileParameters but Infobox type is BinaryFile.");
-        throw new SLCommandException(4010);
-      }
-
-      if (binaryFileParameters.getBase64Content() == null) {
-        log.info("Got Base64Content but ContentIsXMLEntity is true.");
-        throw new SLCommandException(4010);
-      }
-      
-      List<Object> content = binaryFileParameters.getXMLContent().getContent();
-      if (content.isEmpty()) {
-        log.info("Got no XMLContent but ContentIsXMLEntity is true.");
-        throw new SLCommandException(4010);
-      }
-      
-      for (Object element : content) {
-        if (!(element instanceof ScriptType)) {
-          log.info("Infobox identifier is '" + infoboxIdentifier + "' but XMLContent does not contain 'Script'.");
-          throw new SLCommandException(4010);
-        }
-        
-        setCardChannelScript(((ScriptType) element).getResetOrCommandAPDUOrVerifyAPDU());
-      }
-      
-      if (getCardChannelScript() == null) {
-        log.info("Infobox identifier is '" + infoboxIdentifier + "' but XMLContent does not contain 'Script'.");
-        throw new SLCommandException(4010);
-      }
-      
-    } else {
-      throw new SLCommandException(4002,
-          SLExceptionMessages.EC4002_INFOBOX_UNKNOWN,
-          new Object[] { infoboxIdentifier });
+    if (req.getBinaryFileParameters() != null &&
+        !(infobox instanceof BinaryFileInfobox)) {
+      log.info("Got BinaryFileParameters but Infobox type is not BinaryFile.");
+      throw new SLCommandException(4010);
     }
     
   }
 
-  public List<Object> getCardChannelScript() {
-    return cardChannelScript;
-  }
-
-  public void setCardChannelScript(List<Object> cardChannelScript) {
-    this.cardChannelScript = cardChannelScript;
-  }
-
   @Override
   public SLResult execute() {
     
     try {
-      if (INFOBOX_IDENTIFIER_CARD_CHANNEL.equals(getInfoboxIdentifier())) {
-        
-        executeCardChannelScript();
-        return new InfoboxUpdateResultImpl();
-        
-      } else {
-        throw new SLCommandException(4002,
-            SLExceptionMessages.EC4002_INFOBOX_UNKNOWN,
-            new Object[] { infoboxIdentifier });
-      }
+      return infobox.update(getRequestValue(), getCmdCtx());
     } catch (SLCommandException e) {
-      return new ErrorResultImpl(e, cmdCtx.getLocale());
+      return new ErrorResultImpl(e, getCmdCtx().getLocale());
     }
     
   }
-  
-  protected void executeCardChannelScript() throws SLCommandException {
-    
-    if (cardChannelScript != null) {
-      
-      for (Object element : cardChannelScript) {
-        if (element instanceof ResetType) {
-          
-        } else if (element instanceof CommandAPDUType) {
-          
-        } else if (element instanceof VerifyAPDUType) {
-          
-        }
-      }
-      
-    }
-    
-  }
-
-  @Override
-  public String getName() {
-    return "InfoboxUpdateRequest";
-  }
 
 }
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java
index 80bbdca8..99a3b119 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java
@@ -16,6 +16,7 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
+import java.io.UnsupportedEncodingException;
 import java.util.Locale;
 
 import javax.xml.bind.JAXBContext;
@@ -32,6 +33,7 @@ import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXTransformerFactory;
 import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -45,6 +47,8 @@ import at.gv.egiz.bku.slexceptions.SLBindingException;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLException;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.bku.utils.DebugOutputStream;
+import at.gv.egiz.bku.utils.DebugWriter;
 
 /**
  * This class serves as an abstract base class for the implementation of a
@@ -128,6 +132,20 @@ public abstract class SLResultImpl implements SLResult {
    * @param templates
    */
   protected void writeTo(JAXBElement<?> response, Result result, Templates templates) {
+    
+    DebugWriter dw = null;
+    DebugOutputStream ds = null;
+    if (log.isTraceEnabled() && result instanceof StreamResult) {
+      StreamResult streamResult = (StreamResult) result;
+      if (streamResult.getOutputStream() != null) {
+        ds = new DebugOutputStream(streamResult.getOutputStream());
+        streamResult.setOutputStream(ds);
+      }
+      if (streamResult.getWriter() != null) {
+        dw = new DebugWriter(streamResult.getWriter());
+        streamResult.setWriter(dw);
+      }
+    }
 
     TransformerHandler transformerHandler = null;
     if (templates != null) {
@@ -151,10 +169,36 @@ public abstract class SLResultImpl implements SLResult {
       writeErrorTo(commandException, result, templates);
     }
     
+    if (ds != null) {
+      try {
+        log.trace("Marshalled result:\n" + new String(ds.getBufferedBytes(), "UTF-8"));
+      } catch (UnsupportedEncodingException e) {
+        log.trace(e.getMessage());
+      }
+    }
+    
+    if (dw != null) {
+      log.trace("Marshalled result:\n" + dw.getBufferedString());
+    }
+    
   }
   
   protected void writeTo(Node node, Result result, Templates templates) {
 
+    DebugWriter dw = null;
+    DebugOutputStream ds = null;
+    if (log.isTraceEnabled() && result instanceof StreamResult) {
+      StreamResult streamResult = (StreamResult) result;
+      if (streamResult.getOutputStream() != null) {
+        ds = new DebugOutputStream(streamResult.getOutputStream());
+        streamResult.setOutputStream(ds);
+      }
+      if (streamResult.getWriter() != null) {
+        dw = new DebugWriter(streamResult.getWriter());
+        streamResult.setWriter(dw);
+      }
+    }
+
     if (templates == null) {
       try {
         TransformerFactory transformerFactory = TransformerFactory.newInstance();
@@ -179,7 +223,19 @@ public abstract class SLResultImpl implements SLResult {
         writeErrorTo(new SLException(2008), result, templates);
       }
     }
+
+    if (ds != null) {
+      try {
+        log.trace("Marshalled result:\n" + new String(ds.getBufferedBytes(), "UTF-8"));
+      } catch (UnsupportedEncodingException e) {
+        log.trace(e.getMessage());
+      }
+    }
     
+    if (dw != null) {
+      log.trace("Marshalled result:\n" + dw.getBufferedString());
+    }
+
   }
   
   protected void writeErrorTo(SLException slException, Result result, Templates templates) {
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/STALHelper.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/STALHelper.java
index 969288c1..0c7ce3f5 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/STALHelper.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/STALHelper.java
@@ -85,7 +85,7 @@ public class STALHelper {
    * @param stalRequests
    * @throws SLCommandException
    */
-   public void transmitSTALRequest(List<STALRequest> stalRequests) throws SLCommandException {
+   public void transmitSTALRequest(List<? extends STALRequest> stalRequests) throws SLCommandException {
     List<STALResponse> responses = stal.handleRequest(stalRequests);
     if (responses == null) {
       Log log = LogFactory.getLog(this.getClass());
diff --git a/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java b/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java
index 2ea0bae0..dd8b8c8f 100644
--- a/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java
+++ b/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java
@@ -71,7 +71,7 @@ public class DummySTAL implements STAL {
   }
 
   @Override
-  public List<STALResponse> handleRequest(List<STALRequest> requestList) {
+  public List<STALResponse> handleRequest(List<? extends STALRequest> requestList) {
 
     List<STALResponse> responses = new ArrayList<STALResponse>();
     for (STALRequest request : requestList) {
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
index b828e8cd..e34c4899 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -36,6 +36,7 @@ import javax.smartcardio.ATR;
 import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
+import javax.smartcardio.CardTerminal;
 import javax.smartcardio.CommandAPDU;
 import javax.smartcardio.ResponseAPDU;
 
@@ -53,7 +54,12 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   int ifs_ = 254;
 
-  Card card_;
+  private Card card_;
+  
+  /**
+   * The card terminal that connects the {@link #card_}.  
+   */
+  private CardTerminal cardTerminal;
 
   protected AbstractSignatureCard(String resourceBundleName) {
     this.resourceBundleName = resourceBundleName;
@@ -331,8 +337,9 @@ public abstract class AbstractSignatureCard implements SignatureCard {
   }
 
   
-  public void init(Card card) {
+  public void init(Card card, CardTerminal cardTerminal) {
     card_ = card;
+    this.cardTerminal = cardTerminal;
     ATR atr = card.getATR();
     byte[] atrBytes = atr.getBytes();
     if (atrBytes.length >= 6) {
@@ -340,6 +347,11 @@ public abstract class AbstractSignatureCard implements SignatureCard {
       log.trace("Setting IFS (information field size) to " + ifs_);
     }
   }
+  
+  @Override
+  public Card getCard() {
+    return card_;
+  }
 
   protected CardChannel getCardChannel() {
     return card_.getBasicChannel();
@@ -372,4 +384,18 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     }
   }
 
+  @Override
+  public void reset() throws SignatureCardException {
+    try {
+      log.debug("Disconnect and reset smart card.");
+      card_.disconnect(true);
+      log.debug("Reconnect smart card.");
+      if (cardTerminal != null) {
+        card_ = cardTerminal.connect("*");
+      }
+    } catch (CardException e) {
+      throw new SignatureCardException("Failed to reset card.", e);
+    }
+  }
+
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
index 42943541..439be034 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
@@ -40,6 +40,7 @@ import java.util.Enumeration;
 import java.util.Locale;
 
 import javax.smartcardio.Card;
+import javax.smartcardio.CardTerminal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -102,7 +103,12 @@ public class SWCard implements SignatureCard {
     SWCard.swCardDir = swCardDir;
   }
 
-  public void init(Card card) {
+  public void init(Card card, CardTerminal cardTerminal) {
+  }
+  
+  @Override
+  public Card getCard() {
+    return null;
   }
 
   private String getFileName(String fileName) {
@@ -379,4 +385,8 @@ public class SWCard implements SignatureCard {
   public void disconnect(boolean reset) {    
   }
 
+  @Override
+  public void reset() throws SignatureCardException {
+  }
+
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
index b6a453df..d7e76dd8 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
@@ -31,6 +31,7 @@ package at.gv.egiz.smcc;
 import java.util.Locale;
 
 import javax.smartcardio.Card;
+import javax.smartcardio.CardTerminal;
 
 public interface SignatureCard {
 
@@ -75,12 +76,21 @@ public interface SignatureCard {
 
   }
 
-  public void init(Card card);
+  public void init(Card card, CardTerminal cardTerminal);
+  
+  public Card getCard();
 
   public byte[] getCertificate(KeyboxName keyboxName)
       throws SignatureCardException, InterruptedException;
   
   public void disconnect(boolean reset);
+  
+  /**
+   * Performs a reset of the card.
+   * 
+   * @throws SignatureCardException if reset fails.
+   */
+  public void reset() throws SignatureCardException;
 
   /**
    * 
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
index 777299d9..ab66e9a1 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
@@ -34,6 +34,7 @@ import java.util.List;
 
 import javax.smartcardio.ATR;
 import javax.smartcardio.Card;
+import javax.smartcardio.CardTerminal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -204,6 +205,7 @@ public class SignatureCardFactory {
    * @param card
    *          the smart card, or <code>null</code> if a software card should be
    *          created
+   * @param cardTerminal TODO
    * 
    * @return a SignatureCard instance
    * 
@@ -211,12 +213,12 @@ public class SignatureCardFactory {
    *           if no implementation of the given <code>card</code> could be
    *           found
    */
-  public SignatureCard createSignatureCard(Card card)
+  public SignatureCard createSignatureCard(Card card, CardTerminal cardTerminal)
       throws CardNotSupportedException {
     
     if(card == null) {
       SignatureCard sCard = new SWCard();
-      sCard.init(card);
+      sCard.init(card, cardTerminal);
       return sCard;
     }
 
@@ -231,7 +233,7 @@ public class SignatureCardFactory {
         try {
           Class<?> scClass = cl.loadClass(supportedCard.getImplementationClassName());
           sc = (SignatureCard) scClass.newInstance();
-          sc.init(card);
+          sc.init(card, cardTerminal);
           return sc;
 
         } catch (ClassNotFoundException e) {
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java b/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
index 4dae7975..f7d3bab7 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
@@ -57,7 +57,7 @@ public class SMCCHelper {
     SignatureCardFactory factory = SignatureCardFactory.getInstance();
     if (useSWCard) {
       try {
-        signatureCard = factory.createSignatureCard(null);
+        signatureCard = factory.createSignatureCard(null, null);
         resultCode = CARD_FOUND;
       } catch (CardNotSupportedException e) {
         resultCode = CARD_NOT_SUPPORTED;
@@ -83,7 +83,7 @@ public class SMCCHelper {
             if (c == null) {
               throw new CardNotSupportedException();
             }
-            signatureCard = factory.createSignatureCard(c);
+            signatureCard = factory.createSignatureCard(c, cardTerminal);
             ATR atr = newCards.get(cardTerminal).getATR();
             log.trace("Found supported card (" + signatureCard.toString() + ") "
                 + "in terminal '" + cardTerminal.getName() + "', ATR = "
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java b/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
index b70b44a7..b1866894 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
@@ -16,6 +16,7 @@
 */
 package at.gv.egiz.smcc.util;
 
+import java.security.NoSuchAlgorithmException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -54,7 +55,13 @@ public class SmartCardIO {
   CardTerminals cardTerminals_;
 
   private void updateTerminalFactory() {
-    TerminalFactory terminalFactory = TerminalFactory.getDefault();
+    TerminalFactory terminalFactory;
+    try {
+      terminalFactory = TerminalFactory.getInstance("PC/SC", null);
+    } catch (NoSuchAlgorithmException e) {
+      log.info("Failed to get TerminalFactory of type 'PC/SC'.", e);
+      terminalFactory = TerminalFactory.getDefault();
+    }
     log.debug("TerminalFactory : " + terminalFactory);
     if ("PC/SC".equals(terminalFactory.getType())) {
       terminalFactory_ = terminalFactory;
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
index 55f51b22..6f08a135 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
@@ -121,7 +121,7 @@ public abstract class AbstractSMCCSTAL implements STAL {
   }
 
   @Override
-  public List<STALResponse> handleRequest(List<STALRequest> requestList) {
+  public List<STALResponse> handleRequest(List<? extends STALRequest> requestList) {
     log.debug("Got request list containing " + requestList.size()
         + " STAL requests");
     List<STALResponse> responseList = new ArrayList<STALResponse>(requestList
diff --git a/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java b/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
index 59ea141c..77997217 100644
--- a/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
+++ b/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Locale;
 
 import javax.smartcardio.Card;
+import javax.smartcardio.CardTerminal;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -61,7 +62,7 @@ public class AbstractSMCCSTALTest extends AbstractSMCCSTAL implements
     }
 
     @Override
-    public void init(Card card) {
+    public void init(Card card, CardTerminal cardTerminal) {
       // TODO Auto-generated method stub
       
     }
@@ -71,6 +72,18 @@ public class AbstractSMCCSTALTest extends AbstractSMCCSTAL implements
       // TODO Auto-generated method stub
       
     }
+
+    @Override
+    public Card getCard() {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    @Override
+    public void reset() throws SignatureCardException {
+      // TODO Auto-generated method stub
+      
+    }
      
    };
     return false;
diff --git a/utils/src/main/java/at/gv/egiz/bku/utils/DebugOutputStream.java b/utils/src/main/java/at/gv/egiz/bku/utils/DebugOutputStream.java
new file mode 100644
index 00000000..8516b76c
--- /dev/null
+++ b/utils/src/main/java/at/gv/egiz/bku/utils/DebugOutputStream.java
@@ -0,0 +1,48 @@
+/*
+* 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.utils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class DebugOutputStream extends FilterOutputStream {
+
+  private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+
+  public DebugOutputStream(OutputStream out) {
+    super(out);
+  }
+
+  @Override
+  public void write(byte[] b, int off, int len) throws IOException {
+    buffer.write(b, off, len);
+    super.write(b, off, len);
+  }
+
+  @Override
+  public void write(int b) throws IOException {
+    buffer.write(b);
+    super.write(b);
+  }
+  
+  public byte[] getBufferedBytes() {
+    return buffer.toByteArray();
+  }
+
+}
diff --git a/utils/src/main/java/at/gv/egiz/bku/utils/DebugReader.java b/utils/src/main/java/at/gv/egiz/bku/utils/DebugReader.java
new file mode 100644
index 00000000..cafe4a72
--- /dev/null
+++ b/utils/src/main/java/at/gv/egiz/bku/utils/DebugReader.java
@@ -0,0 +1,58 @@
+/*
+* 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.utils;
+
+import java.io.FilterReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringWriter;
+
+public class DebugReader extends FilterReader {
+  
+  private StringWriter buffer = new StringWriter();
+  
+  public DebugReader(Reader in) {
+    super(in);
+  }
+  
+  public DebugReader(Reader in, String start) {
+    super(in);
+    buffer.write(start);
+  }
+
+  @Override
+  public int read() throws IOException {
+    int c = super.read();
+    if (c != -1)
+      buffer.write(c);
+    return c;
+  }
+
+  @Override
+  public int read(char[] cbuf, int off, int len) throws IOException {
+    int l = super.read(cbuf, off, len);
+    if (l != -1 ) {
+      buffer.write(cbuf, off, l);
+    }
+    return l;
+  }
+
+  public String getCachedString() {
+    return buffer.toString();
+  }
+  
+}
diff --git a/utils/src/main/java/at/gv/egiz/bku/utils/DebugWriter.java b/utils/src/main/java/at/gv/egiz/bku/utils/DebugWriter.java
new file mode 100644
index 00000000..5566f927
--- /dev/null
+++ b/utils/src/main/java/at/gv/egiz/bku/utils/DebugWriter.java
@@ -0,0 +1,55 @@
+/*
+* 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.utils;
+
+import java.io.FilterWriter;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+
+public class DebugWriter extends FilterWriter {
+
+  private Writer buffer = new StringWriter();
+  
+  public DebugWriter(Writer out) {
+    super(out);
+  }
+
+  @Override
+  public void write(char[] cbuf, int off, int len) throws IOException {
+    buffer.write(cbuf, off, len);
+    super.write(cbuf, off, len);
+  }
+
+  @Override
+  public void write(String str, int off, int len) throws IOException {
+    buffer.write(str, off, len);
+    super.write(str, off, len);
+  }
+
+  @Override
+  public void write(int c) throws IOException {
+    buffer.write(c);
+    super.write(c);
+  }
+  
+  public String getBufferedString() {
+    return buffer.toString();
+  }
+  
+
+}
-- 
cgit v1.2.3


From 77a19e106e4128c21dd2d1270fdc8d930e415247 Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 18 Dec 2008 08:58:39 +0000
Subject: Fixed BUG #366, changed applet name in BKUOnline to have no version
 number

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@253 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/applet/AppletBKUWorker.java |  59 ++++--
 .../online/applet/InternalSSLSocketFactory.java    | 235 +++++++++++----------
 .../conf/certs/CACerts/A-CERT GLOBALTRUST.cer      | Bin 0 -> 1561 bytes
 .../local/conf/certs/certStore/A-CERT ADVANCED.cer | Bin 0 -> 1751 bytes
 .../conf/certs/certStore/A-CERT GLOBALTRUST.cer    | Bin 0 -> 1561 bytes
 .../conf/certs/certStore/A-Trust-Qual-01a.cer      | Bin 0 -> 1111 bytes
 .../conf/certs/certStore/A-Trust-Qual-02a.cer      | Bin 0 -> 975 bytes
 .../conf/certs/certStore/A-Trust-Qual-03a.cer      | Bin 0 -> 975 bytes
 .../conf/certs/certStore/A-Trust-nQual-01a.cer     | Bin 0 -> 865 bytes
 .../conf/certs/certStore/A-Trust-nQual-03.cer      | Bin 0 -> 979 bytes
 BKUOnline/pom.xml                                  |   1 +
 .../egiz/bku/online/webapp/BKURequestHandler.java  |  60 ++++--
 .../webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar     | Bin 182140 -> 0 bytes
 BKUOnline/src/main/webapp/appletPage.jsp           |   2 +-
 .../accesscontroller/AuthenticationClassifier.java |   3 +-
 .../test/java/at/gv/egiz/smcc/SMCCApplication.java |  49 -----
 .../test/java/at/gv/egiz/smcc/STARCOSCardTest.java | 121 -----------
 smcc/src/test/java/at/gv/egiz/smcc/SWCardTest.java |  66 ------
 18 files changed, 197 insertions(+), 399 deletions(-)
 create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/CACerts/A-CERT GLOBALTRUST.cer
 create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-CERT ADVANCED.cer
 create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-CERT GLOBALTRUST.cer
 create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-01a.cer
 create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-02a.cer
 create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-03a.cer
 create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-nQual-01a.cer
 create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-nQual-03.cer
 delete mode 100644 BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar
 delete mode 100644 smcc/src/test/java/at/gv/egiz/smcc/SMCCApplication.java
 delete mode 100644 smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java
 delete mode 100644 smcc/src/test/java/at/gv/egiz/smcc/SWCardTest.java

(limited to 'BKUOnline/src/main/java')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
index 03e4b7c9..9fc21df8 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
@@ -38,7 +38,7 @@ import java.util.List;
 import javax.xml.namespace.QName;
 
 /**
- *
+ * 
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
@@ -48,7 +48,8 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
   protected String sessionId;
   protected STALPortType stalPort;
 
-  public AppletBKUWorker(BKUGUIFacade gui, AppletContext ctx, AppletParameterProvider paramProvider) {
+  public AppletBKUWorker(BKUGUIFacade gui, AppletContext ctx,
+      AppletParameterProvider paramProvider) {
     super(gui);
     if (ctx == null) {
       throw new NullPointerException("Applet context not provided");
@@ -76,7 +77,7 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
       actionCommandList.clear();
       actionCommandList.add("ok");
       gui.showErrorDialog(BKUGUIFacade.ERR_SERVICE_UNREACHABLE,
-              new Object[]{e.getMessage()});
+          new Object[] { e.getMessage() });
       try {
         waitForAction();
       } catch (InterruptedException e1) {
@@ -92,8 +93,10 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
 
       GetNextRequestResponseType nextRequestResp = stalPort.connect(sessionId);
       do {
-        List<RequestType> requests = nextRequestResp.getInfoboxReadRequestOrSignRequestOrQuitRequest();
-        List<STALRequest> stalRequests = STALTranslator.translateRequests(requests);
+        List<RequestType> requests = nextRequestResp
+            .getInfoboxReadRequestOrSignRequestOrQuitRequest();
+        List<STALRequest> stalRequests = STALTranslator
+            .translateRequests(requests);
 
         if (log.isInfoEnabled()) {
           StringBuilder sb = new StringBuilder("Received ");
@@ -142,64 +145,76 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
         }
 
         if (!finished) {
-          log.info("Not finished yet (BKUWorker: " + this + "), sending responses");
+          log.info("Not finished yet (BKUWorker: " + this
+              + "), sending responses");
           GetNextRequestType nextRequest = of.createGetNextRequestType();
           nextRequest.setSessionId(sessionId);
-          nextRequest.getInfoboxReadResponseOrSignResponseOrErrorResponse().addAll(responses);
+          nextRequest.getInfoboxReadResponseOrSignResponseOrErrorResponse()
+              .addAll(responses);
           nextRequestResp = stalPort.getNextRequest(nextRequest);
         }
       } while (!finished);
       log.info("Done " + Thread.currentThread().getName());
     } catch (Exception ex) {
       log.error(ex.getMessage(), ex);
-      gui.showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, new Object[]{ex.getMessage()});
+      gui.showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, new Object[] { ex
+          .getMessage() });
       try {
         waitForAction();
       } catch (InterruptedException e) {
         log.error(e);
       }
-    }
-    if (signatureCard != null) {
-      signatureCard.disconnect(false);
+      if (signatureCard != null) {
+        signatureCard.disconnect(false);
+      }
     }
     sendRedirect();
   }
 
   protected void sendRedirect() {
     try {
-      URL redirectURL = params.getURLParameter(BKUApplet.REDIRECT_URL, sessionId);
-      String redirectTarget = params.getAppletParameter(BKUApplet.REDIRECT_TARGET);
+      URL redirectURL = params.getURLParameter(BKUApplet.REDIRECT_URL,
+          sessionId);
+      String redirectTarget = params
+          .getAppletParameter(BKUApplet.REDIRECT_TARGET);
       if (redirectTarget == null) {
         log.info("Done. Redirecting to " + redirectURL + " ...");
         ctx.showDocument(redirectURL);
       } else {
-        log.info("Done. Redirecting to " + redirectURL + " (target=" + redirectTarget + ") ...");
+        log.info("Done. Redirecting to " + redirectURL + " (target="
+            + redirectTarget + ") ...");
         ctx.showDocument(redirectURL, redirectTarget);
       }
     } catch (MalformedURLException ex) {
       log.warn("Failed to redirect: " + ex.getMessage(), ex);
-    // gui.showErrorDialog(errorMsg, okListener, actionCommand)
+      // gui.showErrorDialog(errorMsg, okListener, actionCommand)
     }
   }
 
   private STALPortType getSTALPort() throws MalformedURLException {
     URL wsdlURL = params.getURLParameter(BKUApplet.WSDL_URL);
     log.debug("STAL WSDL at " + wsdlURL);
-    QName endpointName = new QName(BKUApplet.STAL_WSDL_NS, BKUApplet.STAL_SERVICE);
+    QName endpointName = new QName(BKUApplet.STAL_WSDL_NS,
+        BKUApplet.STAL_SERVICE);
     STALService stal = new STALService(wsdlURL, endpointName);
     return stal.getSTALPort();
   }
 
   private void registerSignRequestHandler() throws MalformedURLException {
-    String hashDataDisplayStyle = params.getAppletParameter(BKUApplet.HASHDATA_DISPLAY);
+    String hashDataDisplayStyle = params
+        .getAppletParameter(BKUApplet.HASHDATA_DISPLAY);
     if (BKUApplet.HASHDATA_DISPLAY_BROWSER.equals(hashDataDisplayStyle)) {
-      URL hashDataURL = params.getURLParameter(BKUApplet.HASHDATA_URL, sessionId);
+      URL hashDataURL = params.getURLParameter(BKUApplet.HASHDATA_URL,
+          sessionId);
       log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
-      addRequestHandler(SignRequest.class, new BrowserHashDataDisplay(ctx, hashDataURL));
+      addRequestHandler(SignRequest.class, new BrowserHashDataDisplay(ctx,
+          hashDataURL));
     } else {
-      //BKUApplet.HASHDATA_DISPLAY_FRAME
-      log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
-      AppletHashDataDisplay handler = new AppletHashDataDisplay(stalPort, sessionId);
+      // BKUApplet.HASHDATA_DISPLAY_FRAME
+      log.debug("register SignRequestHandler for STAL port "
+          + BKUApplet.WSDL_URL);
+      AppletHashDataDisplay handler = new AppletHashDataDisplay(stalPort,
+          sessionId);
       addRequestHandler(SignRequest.class, handler);
     }
   }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java
index c3417d63..a02e56eb 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java
@@ -36,121 +36,122 @@ import org.apache.commons.logging.LogFactory;
 
 public class InternalSSLSocketFactory extends SSLSocketFactory {
 
-	private final static String GOV_DOMAIN = ".gv.at";
-
-	private static InternalSSLSocketFactory instance = new InternalSSLSocketFactory();
-
-	private final static Log log = LogFactory
-			.getLog(InternalSSLSocketFactory.class);
-
-	private SSLSocket sslSocket;
-
-	private SSLSocketFactory proxy;
-
-	private InternalSSLSocketFactory() {
-		proxy = HttpsURLConnection.getDefaultSSLSocketFactory();
-	}
-
-	public static InternalSSLSocketFactory getInstance() {
-		return instance;
-	}
-
-	@Override
-	public Socket createSocket() throws IOException {
-		sslSocket = (SSLSocket) proxy.createSocket();
-		return sslSocket;
-	}
-
-	@Override
-	public Socket createSocket(String arg0, int arg1) throws IOException,
-			UnknownHostException {
-		sslSocket = (SSLSocket) proxy.createSocket(arg0, arg1);
-
-		return sslSocket;
-	}
-
-	@Override
-	public Socket createSocket(InetAddress arg0, int arg1) throws IOException {
-		sslSocket = (SSLSocket) proxy.createSocket(arg0, arg1);
-		return sslSocket;
-	}
-
-	@Override
-	public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3)
-			throws IOException, UnknownHostException {
-		sslSocket = (SSLSocket) proxy.createSocket(arg0, arg1, arg2, arg3);
-		return sslSocket;
-	}
-
-	@Override
-	public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2,
-			int arg3) throws IOException {
-		sslSocket = (SSLSocket) proxy.createSocket(arg0, arg1, arg2, arg3);
-		return sslSocket;
-	}
-
-	@Override
-	public Socket createSocket(Socket arg0, String arg1, int arg2, boolean arg3)
-			throws IOException {
-		sslSocket = (SSLSocket) proxy.createSocket(arg0, arg1, arg2, arg3);
-		return sslSocket;
-	}
-
-	@Override
-	public String[] getDefaultCipherSuites() {
-		return proxy.getDefaultCipherSuites();
-	}
-
-	@Override
-	public String[] getSupportedCipherSuites() {
-		return proxy.getSupportedCipherSuites();
-	}
-
-	public boolean isEgovAgency() {
-		log.info("Checking if server is egov agency");
-		if (sslSocket != null) {
-			try {
-				X509Certificate cert = (X509Certificate) sslSocket.getSession()
-						.getPeerCertificates()[0];
-				log.info("Server cert: " + cert);
-				return isGovAgency(cert);
-			} catch (SSLPeerUnverifiedException e) {
-				log.error(e);
-				return false;
-			}
-		}
-		log.info("Not a SSL connection");
-		return false;
-	}
-
-	public static boolean isGovAgency(X509Certificate cert) {
-		String[] rdns = (cert.getSubjectX500Principal().getName()).split(",");
-		for (String rdn : rdns) {
-			if (rdn.startsWith("CN=")) {
-				String dns = rdn.split("=")[1];
-				if (dns.endsWith(GOV_DOMAIN)) {
-					return true;
-				}
-			}
-		}
-		try {
-			Collection<List<?>> sanList = cert.getSubjectAlternativeNames();
-			if (sanList != null) {
-				for (List<?> san : sanList) {
-					if ((Integer) san.get(0) == 2) {
-						String dns = (String) san.get(1);
-						if (dns.endsWith(GOV_DOMAIN)) {
-							return true;
-						}
-					}
-				}
-			}
-		} catch (CertificateParsingException e) {
-			log.error(e);
-		}
-		if (cert.getExtensionValue("1.2.40.0.10.1.1.1") != null) {
-			return true;
-		}
-		return false;
-	}
+  private final static String GOV_DOMAIN = ".gv.at";
+
+  private static InternalSSLSocketFactory instance = new InternalSSLSocketFactory();
+
+  private final static Log log = LogFactory
+      .getLog(InternalSSLSocketFactory.class);
+
+  private SSLSocket sslSocket;
+
+  private SSLSocketFactory proxy;
+
+  private InternalSSLSocketFactory() {
+    proxy = HttpsURLConnection.getDefaultSSLSocketFactory();
+  }
+
+  public static InternalSSLSocketFactory getInstance() {
+    return instance;
+  }
+
+  @Override
+  public Socket createSocket() throws IOException {
+    sslSocket = (SSLSocket) proxy.createSocket();
+    return sslSocket;
+  }
+
+  @Override
+  public Socket createSocket(String arg0, int arg1) throws IOException,
+      UnknownHostException {
+    sslSocket = (SSLSocket) proxy.createSocket(arg0, arg1);
+
+    return sslSocket;
+  }
+
+  @Override
+  public Socket createSocket(InetAddress arg0, int arg1) throws IOException {
+    sslSocket = (SSLSocket) proxy.createSocket(arg0, arg1);
+    return sslSocket;
+  }
+
+  @Override
+  public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3)
+      throws IOException, UnknownHostException {
+    sslSocket = (SSLSocket) proxy.createSocket(arg0, arg1, arg2, arg3);
+    return sslSocket;
+  }
+
+  @Override
+  public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2,
+      int arg3) throws IOException {
+    sslSocket = (SSLSocket) proxy.createSocket(arg0, arg1, arg2, arg3);
+    return sslSocket;
+  }
+
+  @Override
+  public Socket createSocket(Socket arg0, String arg1, int arg2, boolean arg3)
+      throws IOException {
+    sslSocket = (SSLSocket) proxy.createSocket(arg0, arg1, arg2, arg3);
+    return sslSocket;
+  }
+
+  @Override
+  public String[] getDefaultCipherSuites() {
+    return proxy.getDefaultCipherSuites();
+  }
+
+  @Override
+  public String[] getSupportedCipherSuites() {
+    return proxy.getSupportedCipherSuites();
+  }
+
+  public boolean isEgovAgency() {
+    log.info("Checking if server is egov agency");
+    if (sslSocket != null) {
+      try {
+        X509Certificate cert = (X509Certificate) sslSocket.getSession()
+            .getPeerCertificates()[0];
+        log.info("Server cert: " + cert);
+        return isGovAgency(cert);
+      } catch (SSLPeerUnverifiedException e) {
+        log.error(e);
+        return false;
+      }
+    }
+    log.info("Not a SSL connection");
+    return false;
+  }
+
+  public static boolean isGovAgency(X509Certificate cert) {
+    String[] rdns = (cert.getSubjectX500Principal().getName()).split(",");
+    for (String rdn : rdns) {
+      if (rdn.startsWith("CN=")) {
+        String dns = rdn.split("=")[1];
+        if (dns.endsWith(GOV_DOMAIN)) {
+          return true;
+        }
+      }
+    }
+    try {
+      Collection<List<?>> sanList = cert.getSubjectAlternativeNames();
+      if (sanList != null) {
+        for (List<?> san : sanList) {
+          if ((Integer) san.get(0) == 2) {
+            String dns = (String) san.get(1);
+            if (dns.endsWith(GOV_DOMAIN)) {
+              return true;
+            }
+          }
+        }
+      }
+    } catch (CertificateParsingException e) {
+      log.error(e);
+    }
+    if ((cert.getExtensionValue("1.2.40.0.10.1.1.1") != null)
+        || (cert.getExtensionValue("1.2.40.0.10.1.1.2") != null)) {
+      return true;
+    }
+    return false;
+  }
 }
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/CACerts/A-CERT GLOBALTRUST.cer b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/CACerts/A-CERT GLOBALTRUST.cer
new file mode 100644
index 00000000..9a25e57d
Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/CACerts/A-CERT GLOBALTRUST.cer differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-CERT ADVANCED.cer b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-CERT ADVANCED.cer
new file mode 100644
index 00000000..66ff251b
Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-CERT ADVANCED.cer differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-CERT GLOBALTRUST.cer b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-CERT GLOBALTRUST.cer
new file mode 100644
index 00000000..9a25e57d
Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-CERT GLOBALTRUST.cer differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-01a.cer b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-01a.cer
new file mode 100644
index 00000000..f9fef65f
Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-01a.cer differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-02a.cer b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-02a.cer
new file mode 100644
index 00000000..36a442b8
Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-02a.cer differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-03a.cer b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-03a.cer
new file mode 100644
index 00000000..ab9e0cd7
Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-Qual-03a.cer differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-nQual-01a.cer b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-nQual-01a.cer
new file mode 100644
index 00000000..efa28178
Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-nQual-01a.cer differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-nQual-03.cer b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-nQual-03.cer
new file mode 100644
index 00000000..33e77636
Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/A-Trust-nQual-03.cer differ
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 1ea2c1a1..5e6ac8ad 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -121,6 +121,7 @@
 							</artifactItems>-->
 							<includeGroupIds>at.gv.egiz</includeGroupIds>
 							<includeArtifactIds>BKUApplet</includeArtifactIds>
+							<stripVersion>true</stripVersion>
               <excludeTransitive>true</excludeTransitive>
 						</configuration>
 					</execution>
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 3aa6bc19..12166a5a 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
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -32,12 +33,12 @@ import javax.servlet.http.HttpSession;
 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.HTTPBindingProcessor;
 import at.gv.egiz.bku.binding.HttpUtil;
 import at.gv.egiz.bku.binding.IdFactory;
 import at.gv.egiz.bku.utils.StreamUtil;
 import at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage;
-import javax.servlet.RequestDispatcher;
 
 /**
  * Handles SL requests and instantiates BindingProcessors
@@ -52,7 +53,8 @@ public class BKURequestHandler extends SpringBKUServlet {
 
   protected Log log = LogFactory.getLog(BKURequestHandler.class);
 
-  private static String getStringFromStream(InputStream is, String encoding) throws IOException {
+  private static String getStringFromStream(InputStream is, String encoding)
+      throws IOException {
     if (is == null) {
       return null;
     }
@@ -63,8 +65,7 @@ public class BKURequestHandler extends SpringBKUServlet {
     StreamUtil.copyStream(is, os);
     return new String(os.toByteArray(), encoding);
   }
-  
-  
+
   protected void doPost(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, java.io.IOException {
     log.debug("Got new request");
@@ -75,21 +76,28 @@ public class BKURequestHandler extends SpringBKUServlet {
     HttpSession session = req.getSession(false);
     if (session != null) {
       log.warn("Already a session with id: " + session.getId()
-          + " active, continuing");
-      RequestDispatcher dispatcher = getServletContext().getNamedDispatcher(BKU_APPLET_JSP);
-      log.debug("forward to applet");
-      dispatcher.forward(req, resp);
-      return;
+          + " active, trying to get Bindingprocessor");
+      BindingProcessor bp = getBindingProcessorManager().getBindingProcessor(
+          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");
+        dispatcher.forward(req, resp);
+        return;
+      }
+      log.debug("Did not find a binding processor, creating new ...");
     }
     session = req.getSession(true);
     if (log.isDebugEnabled()) {
       log.debug("Using session id: " + session.getId());
     }
-    
-    HTTPBindingProcessor bindingProcessor;
 
+    HTTPBindingProcessor bindingProcessor;
     bindingProcessor = (HTTPBindingProcessor) getBindingProcessorManager()
-        .createBindingProcessor(req.getRequestURL().toString(), session.getId(), locale);
+        .createBindingProcessor(req.getRequestURL().toString(),
+            session.getId(), locale);
 
     Map<String, String> headerMap = new HashMap<String, String>();
     for (Enumeration<String> headerName = req.getHeaderNames(); headerName
@@ -109,14 +117,20 @@ public class BKURequestHandler extends SpringBKUServlet {
     bindingProcessor.consumeRequestStream(req.getInputStream());
     req.getInputStream().close();
     getBindingProcessorManager().process(bindingProcessor);
-    
+
     log.trace("Trying to find applet parameters in request");
-    String width = getStringFromStream(bindingProcessor.getFormData("appletWidth"), charset);
-    String height = getStringFromStream(bindingProcessor.getFormData("appletHeight"), charset);
-    String background = getStringFromStream(bindingProcessor.getFormData("appletBackground"), charset);
-    String guiStyle = getStringFromStream(bindingProcessor.getFormData("appletGuiStyle"), charset);
-    String hashDataDisplay = getStringFromStream(bindingProcessor.getFormData("appletHashDataDisplay"), charset);
-    String localeFormParam = getStringFromStream(bindingProcessor.getFormData("locale"), charset);
+    String width = getStringFromStream(bindingProcessor
+        .getFormData("appletWidth"), charset);
+    String height = getStringFromStream(bindingProcessor
+        .getFormData("appletHeight"), charset);
+    String background = getStringFromStream(bindingProcessor
+        .getFormData("appletBackground"), charset);
+    String guiStyle = getStringFromStream(bindingProcessor
+        .getFormData("appletGuiStyle"), charset);
+    String hashDataDisplay = getStringFromStream(bindingProcessor
+        .getFormData("appletHashDataDisplay"), charset);
+    String localeFormParam = getStringFromStream(bindingProcessor
+        .getFormData("locale"), charset);
     if (width != null) {
       try {
         log.trace("Found applet width parameter: " + width);
@@ -148,7 +162,8 @@ public class BKURequestHandler extends SpringBKUServlet {
       session.setAttribute("appletHashDataDisplay", hashDataDisplay);
     }
     if (localeFormParam != null) {
-      log.debug("overrule accept-language locale " + locale + " with form param " + localeFormParam);
+      log.debug("overrule accept-language locale " + locale
+          + " with form param " + localeFormParam);
       locale = new Locale(localeFormParam);
     }
     if (locale != null) {
@@ -156,8 +171,9 @@ public class BKURequestHandler extends SpringBKUServlet {
       session.setAttribute("locale", locale.toString());
     }
 
-    //TODO error if no dispatcher found
-    RequestDispatcher dispatcher = getServletContext().getNamedDispatcher(BKU_APPLET_JSP);
+    // TODO error if no dispatcher found
+    RequestDispatcher dispatcher = getServletContext().getNamedDispatcher(
+        BKU_APPLET_JSP);
     log.debug("forward to applet");
     dispatcher.forward(req, resp);
   }
diff --git a/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar b/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar
deleted file mode 100644
index 74f00509..00000000
Binary files a/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar and /dev/null differ
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index ee5f429c..b73ed2f4 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -47,7 +47,7 @@
                 var attributes = {
                     codebase :'applet',
                     code :'at.gv.egiz.bku.online.applet.BKUApplet.class',
-                    archive :'BKUApplet-1.0.2-SNAPSHOT.jar, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar',
+                    archive :'BKUApplet.jar, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar',
                     width : <%=width%>,
                     height :<%=height%>
                 };
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/AuthenticationClassifier.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/AuthenticationClassifier.java
index ed4b9bda..61d3d7a5 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/AuthenticationClassifier.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/AuthenticationClassifier.java
@@ -65,7 +65,8 @@ public class AuthenticationClassifier {
 		} catch (CertificateParsingException e) {
 			log.error(e);
 		}
-		if (cert.getExtensionValue("1.2.40.0.10.1.1.1") != null) {
+		if ((cert.getExtensionValue("1.2.40.0.10.1.1.1") != null)
+        || (cert.getExtensionValue("1.2.40.0.10.1.1.2") != null)) {
 			return true;
 		}
 		return false;
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/SMCCApplication.java b/smcc/src/test/java/at/gv/egiz/smcc/SMCCApplication.java
deleted file mode 100644
index 4835865f..00000000
--- a/smcc/src/test/java/at/gv/egiz/smcc/SMCCApplication.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* 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.smcc;
-
-import java.util.Locale;
-
-import org.junit.Ignore;
-
-import at.gv.egiz.smcc.util.SMCCHelper;
-
-@Ignore
-public class SMCCApplication {
-
-  /**
-   * @param args
-   */
-  public static void main(String[] args) {
-    
-    SignatureCard sc = null;
-    SMCCHelper smccHelper = new SMCCHelper();
-    while (smccHelper.getResultCode() != SMCCHelper.CARD_FOUND) {
-      System.out.println("Did not get a signature card ... "+smccHelper.getResultCode());
-      smccHelper.update();
-      try {
-        Thread.sleep(1000);
-      } catch (InterruptedException e) {
-        // TODO Auto-generated catch block
-        e.printStackTrace();
-      }
-    }
-    sc = smccHelper.getSignatureCard(Locale.getDefault());
-    System.out.println("Found supported siganture card: "+sc);
-  }
-
-}
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java
deleted file mode 100644
index 7f421474..00000000
--- a/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-* 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.smcc;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Locale;
-
-import javax.smartcardio.CardException;
-import javax.smartcardio.CommandAPDU;
-import javax.smartcardio.ResponseAPDU;
-
-import org.junit.Ignore;
-
-import sun.misc.HexDumpEncoder;
-
-import at.gv.egiz.smcc.SignatureCard.KeyboxName;
-import at.gv.egiz.smcc.util.SMCCHelper;
-
-@Ignore
-public class STARCOSCardTest {
-
-  /**
-   * @param args
-   * @throws Exception 
-   */
-  public static void main(String[] args) throws Exception {
-    
-    SMCCHelper helper = new SMCCHelper();
-    while (helper.getResultCode() != SMCCHelper.CARD_FOUND) {
-      System.out.println("Did not get a signature card ... " + helper.getResultCode());
-      helper.update();
-      try {
-        Thread.sleep(1000);
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
-    }
-    
-    SignatureCard signatureCard = helper.getSignatureCard(Locale.getDefault());
-    
-    System.out.println("Found '" + signatureCard + "'.");
-    
-    try {
-//      printJavaByteArray(
-//          signatureCard.getCertificate(KeyboxName.SECURE_SIGNATURE_KEYPAIR), System.out);
-//      printJavaByteArray(
-//          signatureCard.getCertificate(KeyboxName.CERITIFIED_KEYPAIR), System.out);
-//      System.out. println(new String(signatureCard.getInfobox("IdentityLink", new CommandLinePINProvider(), null)));
-//        byte[] infobox = signatureCard.getInfobox("Status", new CommandLinePINProvider(), null);
-//        printJavaByteArray(infobox, System.out);
-      MessageDigest messageDigest = MessageDigest.getInstance("SHA-1");
-      byte[] digest = messageDigest.digest("test".getBytes());
-      byte[] signature = signatureCard.createSignature(digest, KeyboxName.SECURE_SIGNATURE_KEYPAIR, new CommandLinePINProvider());
-      printJavaByteArray(signature, System.out);
-    } catch (SignatureCardException e) {
-      e.printStackTrace();
-    }
-
-  }
-  
-  public static void printJavaByteArray(byte[] bytes, OutputStream os) {
-    
-    PrintWriter w = new PrintWriter(os);
-    
-    w.write("new byte[] {");
-    for (int i = 0; i < bytes.length;) {
-      if (i % 8 == 0) { 
-        w.write("\n  ");
-      }
-      w.write("(byte) 0x" + Integer.toHexString(0x0F & (bytes[i] >> 4)) + Integer.toHexString(0x0F & bytes[i]));
-      if (++i < bytes.length) {
-        w.write(", ");
-      }
-    }
-    w.write("\n};");
-    w.flush();
-  }
-  
-  private static class CommandLinePINProvider implements PINProvider {
-
-    @Override
-    public String providePIN(PINSpec spec, int retries) {
-      
-      InputStreamReader inputStreamReader = new InputStreamReader(System.in);
-      BufferedReader in = new BufferedReader(inputStreamReader);
-      
-      System.out.print("Enter " + spec.getLocalizedName() + " ["
-          + spec.getMinLength() + "-" + spec.getMaxLength() + "] (" + retries
-          + " retries):");
-      
-      try {
-        return in.readLine();
-      } catch (IOException e) {
-        return null;
-      }
-      
-    }
-    
-  }
-
-}
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/SWCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/SWCardTest.java
deleted file mode 100644
index 115edc16..00000000
--- a/smcc/src/test/java/at/gv/egiz/smcc/SWCardTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* 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.smcc;
-
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import org.junit.Ignore;
-
-import at.gv.egiz.smcc.SignatureCard.KeyboxName;
-
-@Ignore
-public class SWCardTest implements PINProvider {
-
-  SWCard swCard = new SWCard();
-  
-  public static void main(String[] args) throws Exception {
-    
-    SWCardTest swCardTest = new SWCardTest();
-    swCardTest.test();
-    
-  }
-  
-  public void test() throws SignatureCardException, NoSuchAlgorithmException, InterruptedException {
-    
-    swCard.getCertificate(KeyboxName.CERITIFIED_KEYPAIR);
-    swCard.getCertificate(KeyboxName.SECURE_SIGNATURE_KEYPAIR);
-    
-    BigInteger t = BigInteger.valueOf(System.currentTimeMillis());
-
-    MessageDigest messageDigest = MessageDigest.getInstance("SHA-1");
-    byte[] hash = messageDigest.digest(t.toByteArray());
-    
-    byte[] signature; 
-    signature = swCard.createSignature(hash, KeyboxName.CERITIFIED_KEYPAIR, this);
-    System.out.println(SignatureCardFactory.toString(signature));
-
-    signature = swCard.createSignature(hash, KeyboxName.SECURE_SIGNATURE_KEYPAIR, this);
-    System.out.println(SignatureCardFactory.toString(signature));
-    
-    byte[] infobox = swCard.getInfobox("IdentityLink", this, null);
-    System.out.println(SignatureCardFactory.toString(infobox));
-
-  }
-
-  @Override
-  public String providePIN(PINSpec spec, int retries) {
-    return "buerger";
-  }
-  
-}
-- 
cgit v1.2.3


From cd8bc974aacc45f1f8ee4aa51f03e2f647dc8bc4 Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 18 Dec 2008 10:34:26 +0000
Subject: fixed bug #368

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@254 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java     | 9 ++++++++-
 .../main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java    | 9 +++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'BKUOnline/src/main/java')

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 12166a5a..781e0832 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
@@ -50,6 +50,7 @@ public class BKURequestHandler extends SpringBKUServlet {
   private static final long serialVersionUID = 1L;
 
   public final static String REDIRECT_URL = "appletPage.jsp";
+  public final static String REDIRECT_URL_SESSION_ATTRIBUTE="redirectUrl";
 
   protected Log log = LogFactory.getLog(BKURequestHandler.class);
 
@@ -170,7 +171,13 @@ public class BKURequestHandler extends SpringBKUServlet {
       log.debug("Using locale " + locale);
       session.setAttribute("locale", locale.toString());
     }
-
+    
+    // handle server side redirect url after processing
+    String redirectUrl = bindingProcessor.getRedirectURL(); 
+    if ( redirectUrl != null) {
+      log.debug("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);
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 9e69099d..36d41629 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
@@ -100,8 +100,17 @@ public class ResultServlet extends SpringBKUServlet {
       return;
     }
 
+    String redirectUrl = (String) session.getAttribute(BKURequestHandler.REDIRECT_URL_SESSION_ATTRIBUTE);
+    if (redirectUrl != null) {
+      log.debug("Executing deferred browser redirect to: "+redirectUrl);
+      resp.sendRedirect(redirectUrl);
+      session.invalidate();
+      return;
+    }
+    
     if (bp.getRedirectURL() != null) {
       resp.sendRedirect(bp.getRedirectURL());
+      session.invalidate();
       return;
     }
     resp.setStatus(bp.getResponseCode());
-- 
cgit v1.2.3


From 6872541d0e5535327530592aeadad7b6275ade1c Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 18 Dec 2008 10:48:48 +0000
Subject: now reading result from bindingprocessor when redirecting

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@255 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/webapp/ResultServlet.java   | 30 ++++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'BKUOnline/src/main/java')

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 36d41629..f271dfc9 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
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory;
 import at.gv.egiz.bku.binding.HTTPBindingProcessor;
 import at.gv.egiz.bku.binding.HttpUtil;
 import at.gv.egiz.bku.binding.IdFactory;
-import at.gv.egiz.bku.conf.Configurator;
+import at.gv.egiz.bku.utils.NullOutputStream;
 
 /**
  * Delivers the result to the browser
@@ -99,18 +99,20 @@ public class ResultServlet extends SpringBKUServlet {
       resp.sendRedirect(expiredPage);
       return;
     }
-
-    String redirectUrl = (String) session.getAttribute(BKURequestHandler.REDIRECT_URL_SESSION_ATTRIBUTE);
-    if (redirectUrl != null) {
-      log.debug("Executing deferred browser redirect to: "+redirectUrl);
-      resp.sendRedirect(redirectUrl);
-      session.invalidate();
-      return;
+    String redirectUrl = (String) session
+        .getAttribute(BKURequestHandler.REDIRECT_URL_SESSION_ATTRIBUTE);
+    if (redirectUrl == null) {
+      redirectUrl = bp.getRedirectURL();
     }
-    
-    if (bp.getRedirectURL() != null) {
-      resp.sendRedirect(bp.getRedirectURL());
-      session.invalidate();
+    if (redirectUrl != null) {
+      try {
+        bp.writeResultTo(new NullOutputStream(), encoding);
+        getBindingProcessorManager().removeBindingProcessor(bp.getId());
+      } finally {
+        log.debug("Executing deferred browser redirect to: " + redirectUrl);
+        resp.sendRedirect(redirectUrl);
+        session.invalidate();
+      }
       return;
     }
     resp.setStatus(bp.getResponseCode());
@@ -118,8 +120,8 @@ public class ResultServlet extends SpringBKUServlet {
     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.getProperty(
-          USER_AGENT_PROPERTY_KEY));
+      resp.setHeader(HttpUtil.HTTP_HEADER_USER_AGENT, configurator
+          .getProperty(USER_AGENT_PROPERTY_KEY));
     } else {
       resp.setHeader(HttpUtil.HTTP_HEADER_USER_AGENT,
           "citizen-card-environment/1.2 MOCCA Unknown");
-- 
cgit v1.2.3


From 23f82c4d63290cb41dc0fc6ebb86d6cae9a560fe Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 20 Jan 2009 14:09:21 +0000
Subject: prepare for stal service extension

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@262 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUOnline/pom.xml                                  |  33 +++-
 .../src/main/custom-binding/cardchannel-custom.xml |  40 +++++
 .../src/main/custom-binding/staltypes-custom.xml   |   2 +-
 .../egiz/bku/online/webapp/BKURequestHandler.java  |  13 +-
 .../egiz/stal/service/impl/STALRequestBroker.java  |   5 +-
 .../stal/service/impl/STALRequestBrokerImpl.java   | 195 +++++----------------
 .../gv/egiz/stal/service/impl/STALServiceImpl.java | 127 ++++++++------
 .../stal/service/impl/STALXJAXBContextFactory.java |  61 +++++++
 .../src/main/webapp/WEB-INF/wsdl/CardChannel.xsd   | 148 ++++++++++++++++
 BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl   |  24 ++-
 BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd    |   1 -
 .../src/main/webapp/helpfiles/de/error.pcsc.html   |  14 +-
 .../egiz/stal/service/STALRequestBrokerTest.java   |  51 ++++--
 13 files changed, 468 insertions(+), 246 deletions(-)
 create mode 100644 BKUOnline/src/main/custom-binding/cardchannel-custom.xml
 create mode 100644 BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java
 create mode 100644 BKUOnline/src/main/webapp/WEB-INF/wsdl/CardChannel.xsd

(limited to 'BKUOnline/src/main/java')

diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 5e6ac8ad..5fe0d52d 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -55,7 +55,7 @@
 			<version>1.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
-        <!-- build BKUApplet prior to BKUOnline -->
+		<!-- build BKUApplet prior to BKUOnline -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
@@ -67,15 +67,27 @@
           <artifactId>STALService</artifactId> 
           <version>1.0.2-SNAPSHOT</version>
         </dependency>
-        
+        <!-- TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
+         |   so that BKUOnline does not have to depend on STALXService
+        <dependency>
+          <groupId>at.gv.egiz</groupId>
+          <artifactId>STALXService</artifactId>
+          <version>1.0.2-SNAPSHOT</version>
+        </dependency-->
 		<!--
-			| see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
+         | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
 		-->
 		<dependency>
 			<groupId>com.sun.xml.ws</groupId>
 			<artifactId>jaxws-rt</artifactId>
-			<version>2.1.4</version>
-            <!--scope>provided</scope-->
+			<version>2.1.5</version>
+            <!-- use JAX-WS RI with SJSXP instead of Woodstox -->
+            <exclusions>
+                <exclusion>
+                    <groupId>woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+            </exclusions>
 			<!--
 				conflict with SAAJ from java 6 ? <exclusions> <exclusion>
 				<groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId>
@@ -83,6 +95,12 @@
 				<groupId>com.sun.xml.messaging.saaj</groupId>
 				<artifactId>saaj-impl</artifactId> </exclusion> </exclusions -->
 		</dependency>
+        <!-- use JAX-WS RI with SJSXP instead of Woodstox -->
+        <dependency>
+            <artifactId>sjsxp</artifactId>
+            <groupId>com.sun.xml.stream</groupId>
+             <version>1.0.1</version>
+        </dependency>
 	</dependencies>
 	<properties>
 		<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
@@ -164,15 +182,16 @@
                 </execution> 
               </executions> 
               <configuration>
-                <target>2.0</target>
                 <verbose>true</verbose>
                 <bindingDirectory>${basedir}/src/main/custom-binding</bindingDirectory>
                 <bindingFiles> 
                   <bindingFile>stalservice-custom.xml</bindingFile>
-                  <bindingFile>staltypes-custom.xml</bindingFile> 
+                  <bindingFile>staltypes-custom.xml</bindingFile>
+                  <bindingFile>cardchannel-custom.xml</bindingFile>
                 </bindingFiles>
                 <wsdlDirectory>${basedir}/src/main/webapp/WEB-INF/wsdl</wsdlDirectory>
                 <wsdlFiles> 
+                  <wsdlFile>stal-service.wsdl</wsdlFile>
                   <wsdlFile>stal.wsdl</wsdlFile>
                 </wsdlFiles>
                 <sourceDestDir>${project.build.directory}/generated-sources/wsimport</sourceDestDir>
diff --git a/BKUOnline/src/main/custom-binding/cardchannel-custom.xml b/BKUOnline/src/main/custom-binding/cardchannel-custom.xml
new file mode 100644
index 00000000..049a334f
--- /dev/null
+++ b/BKUOnline/src/main/custom-binding/cardchannel-custom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<!--
+    Binding customization for STAL schema (stal.xsd)
+    Use JAXB version 2.1 which supports "schema component designator" (SCD, http://www.w3.org/TR/xmlschema-ref/)
+    
+    All request/response types are generated to at.gv.egiz.stal
+    and renamed (...Type suffix removed), 
+    except for the base types of the modified implClasses ErrorResponse and SignRequest
+    
+    IMPORTANT: WHEN REGENERATING CLASSES MAKE SURE TO BACKUP MODIFIED IMPLCLASSES (ErrorResponse and SignRequest)
+-->
+<bindings xmlns='http://java.sun.com/xml/ns/jaxb' version='2.1'
+          xmlns:xs='http://www.w3.org/2001/XMLSchema'
+          xmlns:xjc='http://java.sun.com/xml/ns/jaxb/xjc'
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+          schemaLocation='../webapp/WEB-INF/wsdl/CardChannel.xsd'
+          xsi:schemaLocation='http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
+                              http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd'>
+
+    <!-- cannot use scd, CardChannel.xsd has no namespace?! -->
+    <schemaBindings>
+        <package name="at.buergerkarte.namespaces.cardchannel.service"/>
+    </schemaBindings>
+</bindings>
diff --git a/BKUOnline/src/main/custom-binding/staltypes-custom.xml b/BKUOnline/src/main/custom-binding/staltypes-custom.xml
index 3e150363..2925fb91 100644
--- a/BKUOnline/src/main/custom-binding/staltypes-custom.xml
+++ b/BKUOnline/src/main/custom-binding/staltypes-custom.xml
@@ -27,7 +27,7 @@
 -->
 <bindings xmlns='http://java.sun.com/xml/ns/jaxb' version='2.1'
           xmlns:xs='http://www.w3.org/2001/XMLSchema'
-           xmlns:stal="http://www.egiz.gv.at/stal"
+          xmlns:stal="http://www.egiz.gv.at/stal"
           xmlns:xjc='http://java.sun.com/xml/ns/jaxb/xjc'
           xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
           xsi:schemaLocation='http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
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 781e0832..7930c53a 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
@@ -67,13 +67,11 @@ public class BKURequestHandler extends SpringBKUServlet {
     return new String(os.toByteArray(), encoding);
   }
 
+  @Override
   protected void doPost(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, java.io.IOException {
-    log.debug("Got new request");
-    String acceptLanguage = req.getHeader("Accept-Language");
-    Locale locale = AcceptLanguage.getLocale(acceptLanguage);
-    log.debug("Accept-Language locale: " + locale);
-
+    log.debug("Received new request");
+    
     HttpSession session = req.getSession(false);
     if (session != null) {
       log.warn("Already a session with id: " + session.getId()
@@ -95,6 +93,10 @@ public class BKURequestHandler extends SpringBKUServlet {
       log.debug("Using session id: " + session.getId());
     }
 
+    String acceptLanguage = req.getHeader("Accept-Language");
+    Locale locale = AcceptLanguage.getLocale(acceptLanguage);
+    log.debug("Accept-Language locale: " + locale);
+
     HTTPBindingProcessor bindingProcessor;
     bindingProcessor = (HTTPBindingProcessor) getBindingProcessorManager()
         .createBindingProcessor(req.getRequestURL().toString(),
@@ -185,6 +187,7 @@ public class BKURequestHandler extends SpringBKUServlet {
     dispatcher.forward(req, resp);
   }
 
+  @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, java.io.IOException {
     doPost(req, resp);
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 d1fe045a..b77f7660 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
@@ -22,6 +22,7 @@ import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
 import java.util.List;
+import javax.xml.bind.JAXBElement;
 
 /**
  *
@@ -32,9 +33,9 @@ public interface STALRequestBroker extends STAL {
     public static final int ERR_4500 = 4500;
     public static final long DEFAULT_TIMEOUT_MS = 1000*60*5; //5mn
 
-    public List<RequestType> connect();
+    public List<JAXBElement<? extends RequestType>> connect();
     
-    public List<RequestType> nextRequest(List<ResponseType> response);
+    public List<JAXBElement<? extends RequestType>> nextRequest(List<JAXBElement<? extends ResponseType>> responses);
 
     public List<HashDataInput> getHashDataInput();
 }
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 5e3a1a99..252327d3 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
@@ -25,6 +25,7 @@ import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
 import at.gv.egiz.stal.service.types.InfoboxReadRequestType;
+import at.gv.egiz.stal.service.types.ObjectFactory;
 import at.gv.egiz.stal.service.types.QuitRequestType;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
@@ -34,6 +35,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import javax.xml.bind.JAXBElement;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -52,14 +54,12 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
 
     private static final Log log = LogFactory.getLog(STALRequestBrokerImpl.class);
 
-//    private boolean expectingResponse = false;
+    private ObjectFactory stalObjFactory = new ObjectFactory();
+    
     private boolean interrupted = false;
     
-//    private final RequestsMonitor reqMon = new RequestsMonitor();
-//    private final ResponsesMonitor respMon = new ResponsesMonitor();
-
-    protected ArrayList<RequestType> requests;
-    protected ArrayList<ResponseType> responses;
+    protected final ArrayList<JAXBElement<? extends RequestType>> requests;
+    protected final ArrayList<JAXBElement<? extends ResponseType>> responses;
 
     protected ArrayList<HashDataInput> hashDataInputs;
     
@@ -69,8 +69,8 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
       if (timeoutMillisec <= 0) 
         timeoutMillisec = DEFAULT_TIMEOUT_MS;
       timeout = timeoutMillisec;
-      requests = new ArrayList<RequestType>();
-      responses = new ArrayList<ResponseType>();
+      requests = new ArrayList<JAXBElement<? extends RequestType>>();
+      responses = new ArrayList<JAXBElement<? extends ResponseType>>();
       hashDataInputs = new ArrayList<HashDataInput>();
     }
     
@@ -95,36 +95,39 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
 
             requests.clear();
             hashDataInputs.clear();
-//            reqMon.produce(requests);
-//            reqMon.setHashDataInput(null);
             
             for (STALRequest stalRequest : stalRequests) {
                 if (stalRequest instanceof SignRequest) {
                   log.trace("Received SignRequest, keep HashDataInput.");
-                  SignRequestType req = new SignRequestType();
-                  req.setKeyIdentifier(((SignRequest) stalRequest).getKeyIdentifier());
-                  req.setSignedInfo(((SignRequest) stalRequest).getSignedInfo());
+                  SignRequestType reqT = stalObjFactory.createSignRequestType();
+                  reqT.setKeyIdentifier(((SignRequest) stalRequest).getKeyIdentifier());
+                  reqT.setSignedInfo(((SignRequest) stalRequest).getSignedInfo());
+                  JAXBElement<SignRequestType> req = stalObjFactory.createGetNextRequestResponseTypeSignRequest(reqT);
                   requests.add(req);
                   //DataObjectHashDataInput with reference caching enabled DataObject 
                   hashDataInputs.addAll(((SignRequest) stalRequest).getHashDataInput());
                   break;
                 } else if (stalRequest instanceof InfoboxReadRequest) {
                   log.trace("Received InfoboxReadRequest");
-                  InfoboxReadRequestType req = new InfoboxReadRequestType();
-                  req.setInfoboxIdentifier(((InfoboxReadRequest) stalRequest).getInfoboxIdentifier());
-                  req.setDomainIdentifier(((InfoboxReadRequest) stalRequest).getDomainIdentifier());
+                  InfoboxReadRequestType reqT = new InfoboxReadRequestType();
+                  reqT.setInfoboxIdentifier(((InfoboxReadRequest) stalRequest).getInfoboxIdentifier());
+                  reqT.setDomainIdentifier(((InfoboxReadRequest) stalRequest).getDomainIdentifier());
+                  JAXBElement<InfoboxReadRequestType> req = stalObjFactory.createGetNextRequestResponseTypeInfoboxReadRequest(reqT);
                   requests.add(req);
                 } else if (stalRequest instanceof QuitRequest) {
                   log.trace("Received QuitRequest, do not wait for responses.");
-                  requests.add(new QuitRequestType());
+                  QuitRequestType reqT = stalObjFactory.createQuitRequestType();
+                  JAXBElement<QuitRequestType> req = stalObjFactory.createGetNextRequestResponseTypeQuitRequest(reqT);
+                  requests.add(req);
                   log.trace("notifying request consumers");
                   requests.notify();
-//                    reqMon.notify();
                   return new ArrayList<STALResponse>();
                 } else {
                   log.error("Received unsupported STAL request: " + stalRequest.getClass().getName() + ", send QUIT");
                   requests.clear();
-                  requests.add(new QuitRequestType());
+                  QuitRequestType reqT = stalObjFactory.createQuitRequestType();
+                  JAXBElement<QuitRequestType> req = stalObjFactory.createGetNextRequestResponseTypeQuitRequest(reqT);
+                  requests.add(req);
                   log.trace("notifying request consumers");
                   requests.notify();
                   return new ArrayList<STALResponse>();
@@ -132,32 +135,25 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
             }
             log.trace("notifying request consumers");
             requests.notify();
-//            reqMon.notify();
           }
           
-          synchronized (responses) { //respMon) {
+          synchronized (responses) { 
             long beforeWait = System.currentTimeMillis();
-//            while (respMon.responses == null) {
             while (responses.isEmpty()) {
                 log.trace("waiting to consume response");
-//                respMon.wait(timeout);
                 responses.wait(timeout);
                 if (System.currentTimeMillis() - beforeWait >= timeout) {
                     log.warn("timeout while waiting to consume response, cleanup requests");
-//                    reqMon.consume(); //TODO check deadlock?
-//                    reqMon.setHashDataInput(null);
-                    requests.clear(); //TODO sync on requests?
+                    requests.clear(); 
                     hashDataInputs.clear();
                     return Collections.singletonList((STALResponse) new ErrorResponse(ERR_4500));
                 }
             }
             log.trace("consuming responses");
-//            List<STALResponse> responses = respMon.consume();
             List<STALResponse> resps = STALTranslator.toSTAL(responses);
             responses.clear();
             log.trace("notifying response producers");
             responses.notify();
-//            respMon.notify();
 
             return resps;
           }
@@ -169,7 +165,7 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
     }
 
     @Override
-    public List<RequestType> connect() {
+    public List<JAXBElement<? extends RequestType>> connect() {
       if (interrupted) {
         return null;
       }
@@ -181,15 +177,9 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
                 requests.wait(timeout);
                 if (System.currentTimeMillis() - beforeWait >= timeout) {
                     log.warn("timeout while waiting to consume request");
-                    return Collections.singletonList((RequestType) new QuitRequestType());
+                    return createSingleQuitRequest();
                 }
             }
-            
-//            log.trace("consume request");
-//            List<RequestType> reqs = new ArrayList<RequestType>(); 
-//            reqs.addAll(requests);
-//            requests.clear();
-//            return reqs;
             log.trace("don't consume request now, leave for further connect calls");
             return requests;
           }
@@ -212,7 +202,7 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
      * @return QUIT if expected responses are not provided
      */
     @Override
-    public List<RequestType> nextRequest(List<ResponseType> resps) {
+    public List<JAXBElement<? extends RequestType>> nextRequest(List<JAXBElement<? extends ResponseType>> resps) {
       if (interrupted) {
         return null;
       }
@@ -227,69 +217,43 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
             }
           }
           
-          synchronized (responses) { //respMon) {
+          synchronized (responses) { 
             if (resps != null && resps.size() > 0) {
-//                if (!expectingResponse) {
-//                    log.warn("Received unexpected response in nextRequest(), return QUIT");
-//                    return Collections.singletonList((RequestType) new QuitRequestType());
-//                }
                 long beforeWait = System.currentTimeMillis();
-//                while (respMon.responses != null) {
                 while (!responses.isEmpty()) {
                     log.trace("waiting to produce response");
-//                    respMon.wait(timeout);
                     responses.wait(timeout);
                     if (System.currentTimeMillis() - beforeWait >= timeout) {
                         log.warn("timeout while waiting to produce response");
-                        return Collections.singletonList((RequestType) new QuitRequestType());
+                        return createSingleQuitRequest();
                     }
                 }
                 log.trace("produce response");
-//                respMon.produce(resps);
                 responses.addAll(resps);
                 //reset HashDataInputCallback iff SignResponse
                 if (log.isTraceEnabled()) {
-                    for (ResponseType response : resps) {
-                        log.trace("Received STAL response: " + response.getClass().getName());
+                    for (JAXBElement<? extends ResponseType> response : resps) {
+                        log.trace("Received STAL response: " + response.getValue().getClass().getName());
                     }
                 }
                 log.trace("notifying response consumers");
-//                respMon.notify();
                 responses.notify();
             } else {
-//                if (expectingResponse) {
-//                    log.warn("Did not receive expected response(s) in nextRequest(), return QUIT");
-//                    return Collections.singletonList((RequestType) new QuitRequestType());
-//                }
-//                log.trace("expecting non-null response in next nextRequest(response)");
-//                expectingResponse = true;
               log.error("Received NextRequest without responses, return QUIT");
-              return Collections.singletonList((RequestType) new QuitRequestType());
+              return createSingleQuitRequest();
             }
           }
           
-          synchronized (requests) { //reqMon) {
+          synchronized (requests) { 
             long beforeWait = System.currentTimeMillis();
-//            while (reqMon.requests == null) {
             while (requests.isEmpty()) {
                 log.trace("waiting to consume request");
-//                reqMon.wait(timeout);
                 requests.wait(timeout);
                 if (System.currentTimeMillis() - beforeWait >= timeout) {
                     log.warn("timeout while waiting to consume request");
-                    return Collections.singletonList((RequestType) new QuitRequestType());
+                    return createSingleQuitRequest();
                 }
             }
-//            log.trace("consume request");
-//            List<RequestType> reqs = new ArrayList<RequestType>(); // reqMon.consume();
-//            reqs.addAll(requests);
-//            
-////            if (requests.size() > 0 && requests.get(0) instanceof QuitRequestType) {
-////                log.trace("expecting no response in next nextRequest()");
-////                expectingResponse = false;
-////            }
-//            requests.clear();
-//            return reqs;
             log.trace("don't consume request now, but on next response delivery");
             return requests;
           }
@@ -304,92 +268,19 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
     public List<HashDataInput> getHashDataInput() {
       synchronized (requests) {
         log.trace("return " + hashDataInputs.size() + " current HashDataInput(s) ");
-        return hashDataInputs; //reqMon.getHashDataInput();
+        return hashDataInputs;
       }
     }
     
     @Override
     public void setLocale(Locale locale) {
     }
-    
-//    class RequestsMonitor {
-//      List<STALRequest> requests;
-//      List<HashDataInput> hashDataInput;
-//      
-//      void produce(List<STALRequest> req) {
-//        requests = req;
-//      }
-//      
-//      synchronized List<at.gv.egiz.stal.service.types.STALRequest> consume() {
-//        List<at.gv.egiz.stal.service.types.STALRequest> reqs = new ArrayList<at.gv.egiz.stal.service.types.STALRequest>();
-//        for (STALRequest request : requests) {
-//          if (request instanceof SignRequest) {
-//            at.gv.egiz.stal.service.types.SignRequest r = new at.gv.egiz.stal.service.types.SignRequest();
-//            r.setKeyIdentifier(((SignRequest) request).getKeyIdentifier());
-//            r.setSignedInfo(((SignRequest) request).getSignedInfo());
-//            reqs.add(r);
-//          } else if (request instanceof InfoboxReadRequest) {
-//            at.gv.egiz.stal.service.types.InfoboxReadRequest r = new at.gv.egiz.stal.service.types.InfoboxReadRequest();
-//            r.setDomainIdentifier(((InfoboxReadRequest) request).getDomainIdentifier());
-//            r.setInfoboxIdentifier(((InfoboxReadRequest) request).getInfoboxIdentifier());
-//            reqs.add(r);
-//          } else if (request instanceof QuitRequest) {
-//            at.gv.egiz.stal.service.types.QuitRequest r = new at.gv.egiz.stal.service.types.QuitRequest();
-//            reqs.add(r);
-//          } else {
-//            log.error("unknown STAL request type: " + request.getClass());
-//            requests = null;
-//            return Collections.singletonList((at.gv.egiz.stal.service.types.STALRequest) new at.gv.egiz.stal.service.types.QuitRequest());
-//          }
-//        }
-//        requests = null;
-//        return reqs;
-//      }
-//      
-//      void setHashDataInput(List<HashDataInput> hdi) {
-//        hashDataInput = hdi;
-//      }
-//      
-//      List<HashDataInput> getHashDataInput() {
-//        return hashDataInput;
-//      }
-//    }
-//    
-//    /** TODO: now, that responses are not nulled, synchronize directly on responses? */
-//    class ResponsesMonitor {
-//      List<at.gv.egiz.stal.service.types.STALResponse> responses;
-//      
-//      void produce(List<at.gv.egiz.stal.service.types.STALResponse> resp) {
-//        responses = resp;
-//      }
-//      
-//      synchronized List<STALResponse> consume() {
-//        List<STALResponse> resps = new ArrayList<STALResponse>();
-//        
-//        for (at.gv.egiz.stal.service.types.STALResponse response : responses) {
-//          if (response instanceof at.gv.egiz.stal.service.types.InfoboxReadResponse) {
-//            InfoboxReadResponse r = new InfoboxReadResponse();
-//            r.setInfoboxValue(((at.gv.egiz.stal.service.types.InfoboxReadResponse) response).getInfoboxValue());
-//            resps.add(r);
-//          } else if (response instanceof at.gv.egiz.stal.service.types.SignResponse) {
-//            SignResponse r = new SignResponse();
-//            r.setSignatureValue(((at.gv.egiz.stal.service.types.SignResponse) response).getSignatureValue());
-//            resps.add(r);
-//          } else if (response instanceof at.gv.egiz.stal.service.types.ErrorResponse) {
-//            ErrorResponse r = new ErrorResponse();
-//            r.setErrorCode(((at.gv.egiz.stal.service.types.ErrorResponse) response).getErrorCode());
-//            r.setErrorMessage(((at.gv.egiz.stal.service.types.ErrorResponse) response).getErrorMessage());
-//            resps.add(r);
-//          } else {
-//            log.error("unknown STAL response type: " + response.getClass());
-//            ErrorResponse r = new ErrorResponse(4000);
-//            r.setErrorMessage("unknown STAL response type: " + response.getClass());
-//            responses = null;
-//            return Collections.singletonList((STALResponse) r);
-//          }
-//        }
-//        responses = null;
-//        return resps;
-//      }
-//    }
+
+    private List<JAXBElement<? extends RequestType>> createSingleQuitRequest() {
+      QuitRequestType quitT = stalObjFactory.createQuitRequestType();
+      JAXBElement<QuitRequestType> quit = stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT);
+      ArrayList<JAXBElement<? extends RequestType>> l = new ArrayList<JAXBElement<? extends RequestType>>();
+      l.add(quit);
+      return l;
+    }
 }
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 05a3f5e5..45629869 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,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package at.gv.egiz.stal.service.impl;
 
+//import at.buergerkarte.namespaces.cardchannel.service.CommandAPDUType;
+//import at.buergerkarte.namespaces.cardchannel.service.ScriptType;
 import at.gv.egiz.bku.binding.BindingProcessor;
 import at.gv.egiz.bku.binding.BindingProcessorManager;
 import at.gv.egiz.bku.binding.Id;
@@ -36,6 +37,7 @@ import at.gv.egiz.stal.service.types.QuitRequestType;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
 import at.gv.egiz.stal.service.types.SignRequestType;
+import com.sun.xml.ws.developer.UsesJAXBContext;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,6 +48,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.jws.WebService;
 import javax.servlet.ServletContext;
+import javax.xml.bind.JAXBElement;
 import javax.xml.ws.WebServiceContext;
 import javax.xml.ws.handler.MessageContext;
 import org.apache.commons.logging.Log;
@@ -56,46 +59,45 @@ import org.apache.commons.logging.LogFactory;
  * @author clemens
  */
 @WebService(endpointInterface = "at.gv.egiz.stal.service.STALPortType")
+@UsesJAXBContext(STALXJAXBContextFactory.class)
 public class STALServiceImpl implements STALPortType {
 
   public static final String BINDING_PROCESSOR_MANAGER = "bindingProcessorManager";
   public static final Id TEST_SESSION_ID = IdFactory.getInstance().createId("TestSession");
-  
   protected static final Log log = LogFactory.getLog(STALServiceImpl.class);
-  
+
+
   static {
-    
     if (log.isTraceEnabled()) {
       log.trace("enabling webservice communication dump");
       System.setProperty("com.sun.xml.ws.transport.http.HttpAdapter.dump", "true");
     } else {
       System.setProperty("com.sun.xml.ws.fault.SOAPFaultBuilder.disableCaptureStackTrace", "false");
     }
-    
   }
-  
   @Resource
-  WebServiceContext wsContext;
+  protected WebServiceContext wsContext;
   protected IdFactory idF = IdFactory.getInstance();
+  private at.gv.egiz.stal.service.types.ObjectFactory stalObjFactory = new at.gv.egiz.stal.service.types.ObjectFactory();
+//  private at.buergerkarte.namespaces.cardchannel.service.ObjectFactory ccObjFactory = new at.buergerkarte.namespaces.cardchannel.service.ObjectFactory();
 
-   
   @Override
   public GetNextRequestResponseType connect(String sessId) {
-    
+
     if (sessId == null) {
       throw new NullPointerException("No session id provided");
     }
-    
+
     Id sessionId = idF.createId(sessId);
 
     if (log.isDebugEnabled()) {
       log.debug("Received Connect [" + sessionId + "]");
     }
-    
+
     if (TEST_SESSION_ID.equals(sessionId)) {
       return getTestSessionNextRequestResponse(null);
     }
-    
+
     GetNextRequestResponseType response = new GetNextRequestResponseType();
     response.setSessionId(sessionId.toString());
 
@@ -103,7 +105,7 @@ public class STALServiceImpl implements STALPortType {
 
     if (stal != null) {
 
-      List<RequestType> requestsOut = ((STALRequestBroker) stal).connect();
+      List<JAXBElement<? extends RequestType>> requestsOut = ((STALRequestBroker) stal).connect();
       response.getInfoboxReadRequestOrSignRequestOrQuitRequest().addAll(requestsOut);
 
       if (log.isDebugEnabled()) {
@@ -112,29 +114,32 @@ public class STALServiceImpl implements STALPortType {
         sb.append("] containing ");
         sb.append(requestsOut.size());
         sb.append(" requests: ");
-        for (RequestType reqOut : requestsOut) {
-          sb.append(reqOut.getClass());
+        for (JAXBElement<? extends RequestType> reqOut : requestsOut) {
+          sb.append(reqOut.getValue().getClass());
           sb.append(' ');
         }
         log.debug(sb.toString());
       }
     } else {
       log.error("Failed to get STAL for session " + sessionId + ", returning QuitRequest");
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(new QuitRequestType());
+      QuitRequestType quitT = stalObjFactory.createQuitRequestType();
+      JAXBElement<QuitRequestType> quit = stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT);
+      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(quit);
     }
     return response;
   }
-  
+
   @Override
   public GetNextRequestResponseType getNextRequest(GetNextRequestType request) {
 
     if (request.getSessionId() == null) {
       throw new NullPointerException("No session id provided");
     }
-    
+
     Id sessionId = idF.createId(request.getSessionId());
 
-    List<ResponseType> responsesIn = request.getInfoboxReadResponseOrSignResponseOrErrorResponse();//getResponse();
+    List<JAXBElement<? extends ResponseType>> responsesIn = request.getInfoboxReadResponseOrSignResponseOrErrorResponse();
+//    List<ResponseType> responsesIn = request.getInfoboxReadResponseOrSignResponseOrErrorResponse();//getResponse();
 
     if (log.isDebugEnabled()) {
       StringBuilder sb = new StringBuilder("Received GetNextRequest [");
@@ -142,25 +147,25 @@ public class STALServiceImpl implements STALPortType {
       sb.append("] containing ");
       sb.append(responsesIn.size());
       sb.append(" responses: ");
-      for (ResponseType respIn : responsesIn) {
+      for (Object respIn : responsesIn) {
         sb.append(respIn.getClass());
         sb.append(' ');
       }
       log.debug(sb.toString());
     }
-    
+
     if (TEST_SESSION_ID.equals(sessionId)) {
       return getTestSessionNextRequestResponse(responsesIn);
     }
 
     GetNextRequestResponseType response = new GetNextRequestResponseType();
     response.setSessionId(sessionId.toString());
-    
+
     STALRequestBroker stal = getStal(sessionId);
 
     if (stal != null) {
 
-      List<RequestType> requestsOut = ((STALRequestBroker) stal).nextRequest(responsesIn);
+      List<JAXBElement<? extends RequestType>> requestsOut = ((STALRequestBroker) stal).nextRequest(responsesIn);
       response.getInfoboxReadRequestOrSignRequestOrQuitRequest().addAll(requestsOut);
 
       if (log.isDebugEnabled()) {
@@ -169,15 +174,17 @@ public class STALServiceImpl implements STALPortType {
         sb.append("] containing ");
         sb.append(requestsOut.size());
         sb.append(" requests: ");
-        for (RequestType reqOut : requestsOut) {
-          sb.append(reqOut.getClass());
+        for (JAXBElement<? extends RequestType> reqOut : requestsOut) {
+          sb.append(reqOut.getValue().getClass());
           sb.append(' ');
         }
         log.debug(sb.toString());
       }
     } else {
       log.error("Failed to get STAL for session " + sessionId + ", returning QuitRequest");
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(new QuitRequestType());
+      QuitRequestType quitT = stalObjFactory.createQuitRequestType();
+      JAXBElement<QuitRequestType> quit = stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT);
+      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(quit);
     }
     return response;
   }
@@ -188,7 +195,7 @@ public class STALServiceImpl implements STALPortType {
     if (request.getSessionId() == null) {
       throw new NullPointerException("No session id provided");
     }
-    
+
     Id sessionId = idF.createId(request.getSessionId());
 
     if (log.isDebugEnabled()) {
@@ -197,13 +204,13 @@ public class STALServiceImpl implements STALPortType {
 
     GetHashDataInputResponseType response = new GetHashDataInputResponseType();
     response.setSessionId(sessionId.toString());
-      
+
     if (TEST_SESSION_ID.equals(sessionId)) {
       log.debug("Received GetHashDataInput for session " + TEST_SESSION_ID + ", return DummyHashDataInput");
       GetHashDataInputResponseType.Reference ref = new GetHashDataInputResponseType.Reference();
       ref.setID("signed-data-reference-0-1214921968-27971781-24309"); //Reference-" + TEST_SESSION_ID + "-001");
       ref.setMimeType("text/plain");
-      
+
       Charset charset;
       try {
         charset = Charset.forName("iso-8859-15");
@@ -316,30 +323,52 @@ public class STALServiceImpl implements STALPortType {
     return (bp == null) ? null : (bp.isFinished() ? null : (STALRequestBroker) bp.getSTAL());
   }
 
-  private GetNextRequestResponseType getTestSessionNextRequestResponse(List<ResponseType> responsesIn) {
+  private GetNextRequestResponseType getTestSessionNextRequestResponse(List<JAXBElement<? extends ResponseType>> responsesIn) {
     GetNextRequestResponseType response = new GetNextRequestResponseType();
     response.setSessionId(TEST_SESSION_ID.toString());
-    
-    if (responsesIn != null && responsesIn.size() > 0 && responsesIn.get(0) instanceof ErrorResponseType) {
-      log.info("Received TestSession GetNextRequest(ErrorResponse), returning QuitRequest");
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(new QuitRequestType());
+
+    List<JAXBElement<? extends RequestType>> reqs = response.getInfoboxReadRequestOrSignRequestOrQuitRequest();
+
+    if (responsesIn == null) {
+      log.info("[TestSession] received CONNECT, return dummy requests ");
+//      ScriptType scriptT = ccObjFactory.createScriptType();
+//      CommandAPDUType cmd = ccObjFactory.createCommandAPDUType();
+//      cmd.setValue("TestSession CardChannelCMD 1234".getBytes());
+//      scriptT.getResetOrCommandAPDUOrVerifyAPDU().add(cmd);
+//      reqs.add(ccObjFactory.createScript(scriptT));
+      addDummyRequests(reqs);
+    } else if (responsesIn != null && responsesIn.size() > 0 && responsesIn.get(0).getValue() instanceof ErrorResponseType) {
+      log.info("[TestSession] received ErrorResponse, return QUIT request");
+      QuitRequestType quitT = stalObjFactory.createQuitRequestType();
+      reqs.add(stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT));
     } else {
-      log.info("Received TestSession GetNextRequest, returning SignRequest and 3 InfoboxReadRequests ");
-      InfoboxReadRequestType req = new InfoboxReadRequestType();
-      req.setInfoboxIdentifier("IdentityLink");
-      req.setDomainIdentifier("hansiwurzel");
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(req);
-      SignRequestType sig = new SignRequestType();
-      sig.setKeyIdentifier("SecureSignatureKeypair");
-      sig.setSignedInfo("<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><dsig:CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\" /> <dsig:SignatureMethod Algorithm=\"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1\" /> <dsig:Reference Id=\"signed-data-reference-0-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" Type=\"http://uri.etsi.org/01903/v1.1.1#SignedProperties\" URI=\"#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes());
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(sig);
-      req = new InfoboxReadRequestType();
-      req.setInfoboxIdentifier("CertifiedKeypair");
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(req);
-      req = new InfoboxReadRequestType();
-      req.setInfoboxIdentifier("SecureSignatureKeypair");
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(req);
+      log.info("[TestSession] received " + responsesIn.size() + " response(s), return dummy requests" );
+      addDummyRequests(reqs);
     }
     return response;
   }
+
+  private void addDummyRequests(List<JAXBElement<? extends RequestType>> reqs) {
+//    log.info("[TestSession] add READ request for Infobox IdentityLink");
+//    InfoboxReadRequestType ibrT1 = stalObjFactory.createInfoboxReadRequestType();
+//    ibrT1.setInfoboxIdentifier("IdentityLink");
+//    reqs.add(stalObjFactory.createGetNextRequestResponseTypeInfoboxReadRequest(ibrT1));
+
+    log.info("[TestSession] add READ request for Infobox CertifiedKeypair");
+    InfoboxReadRequestType ibrT2 = stalObjFactory.createInfoboxReadRequestType();
+    ibrT2.setInfoboxIdentifier("CertifiedKeypair");
+    reqs.add(stalObjFactory.createGetNextRequestResponseTypeInfoboxReadRequest(ibrT2));
+
+    log.info("[TestSession] add READ request for Infobox SecureSignatureKeypair");
+    InfoboxReadRequestType ibrT3 = stalObjFactory.createInfoboxReadRequestType();
+    ibrT3.setInfoboxIdentifier("SecureSignatureKeypair");
+    reqs.add(stalObjFactory.createGetNextRequestResponseTypeInfoboxReadRequest(ibrT3));
+
+    log.info("[TestSession] add SIGN request");
+    SignRequestType sigT1 = stalObjFactory.createSignRequestType();
+    sigT1.setKeyIdentifier("SecureSignatureKeypair");
+    sigT1.setSignedInfo("<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><dsig:CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\" /> <dsig:SignatureMethod Algorithm=\"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1\" /> <dsig:Reference Id=\"signed-data-reference-0-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" Type=\"http://uri.etsi.org/01903/v1.1.1#SignedProperties\" URI=\"#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes());
+    reqs.add(stalObjFactory.createGetNextRequestResponseTypeSignRequest(sigT1));
+  }
+
 }
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java
new file mode 100644
index 00000000..92559254
--- /dev/null
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java
@@ -0,0 +1,61 @@
+/*
+ * 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.stal.service.impl;
+
+import com.sun.xml.bind.api.JAXBRIContext;
+import com.sun.xml.bind.api.TypeReference;
+import com.sun.xml.ws.api.model.SEIModel;
+import com.sun.xml.ws.developer.JAXBContextFactory;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.JAXBException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class STALXJAXBContextFactory implements JAXBContextFactory {
+
+  private static final Log log = LogFactory.getLog(STALXJAXBContextFactory.class);
+
+  @Override
+  public JAXBRIContext createJAXBContext(SEIModel sei, List<Class> classesToBind, List<TypeReference> typeReferences) throws JAXBException {
+    if (log.isTraceEnabled()) {
+      log.trace("JAXBContext seed for SEI " + sei.getTargetNamespace() + ":");
+      for (Class class1 : classesToBind) {
+        log.trace(" " + class1);
+      }
+      for (TypeReference typeReference : typeReferences) {
+        log.trace(" typeRef " + typeReference.tagName + " -> " + typeReference.type);
+      }
+    }
+    List<Class> classes = new ArrayList<Class>();
+    classes.addAll(classesToBind);
+//    Class ccOF = at.buergerkarte.namespaces.cardchannel.service.ObjectFactory.class;
+//    if (!classes.contains(ccOF)) {
+//      log.debug("adding " + ccOF + " to JAXBContext seed");
+//      classes.add(ccOF);
+//    }
+
+    //TODO add typeReference?
+
+    return JAXBRIContext.newInstance(classes.toArray(new Class[classes.size()]),
+            typeReferences, null, sei.getTargetNamespace(), false, null);
+  }
+}
diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/CardChannel.xsd b/BKUOnline/src/main/webapp/WEB-INF/wsdl/CardChannel.xsd
new file mode 100644
index 00000000..4aff264b
--- /dev/null
+++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/CardChannel.xsd
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://www.buergerkarte.at/cardchannel"
+    xmlns:tns="http://www.buergerkarte.at/cardchannel"
+    elementFormDefault="qualified"
+    xmlns:stal="http://www.egiz.gv.at/stal">
+
+    <xs:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal-extended.xsd"/>
+
+    <xs:annotation>
+        <xs:documentation>Schema for transparent access to cards using a BKU and the CardChannel
+            infobox</xs:documentation>
+    </xs:annotation>
+    
+    <xs:element name="Script" type="tns:ScriptType" substitutionGroup="stal:OtherRequest"/>
+    <xs:element name="Response" type="tns:ResponseType" substitutionGroup="stal:OtherResponse"/>
+    <xs:element name="Grunddaten" type="tns:AttributeList"/>
+    <xs:element name="EHIC" type="tns:AttributeList"/>
+    <xs:element name="Status" type="tns:AttributeList"/>
+    <xs:element name="SV-Personenbindung" type="xs:hexBinary"/>
+    
+    <xs:complexType name="ScriptType">
+        <xs:annotation>
+            <xs:documentation>extends abstract stal:RequestType</xs:documentation>
+        </xs:annotation>
+        <xs:complexContent>
+            <xs:extension base="stal:RequestType">
+                <xs:annotation>
+                    <xs:documentation>Contains the script to be executed by the BKU</xs:documentation>
+                </xs:annotation>
+                <xs:choice maxOccurs="unbounded" minOccurs="1">
+                    <xs:element name="Reset" type="tns:ResetType"/>
+                    <xs:element name="CommandAPDU" type="tns:CommandAPDUType"/>
+                    <xs:element name="VerifyAPDU" type="tns:VerifyAPDUType"/>
+                </xs:choice>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    
+    <xs:complexType name="ResponseType">
+        <xs:annotation>
+            <xs:documentation>extends abstract stal:ResponseType</xs:documentation>
+        </xs:annotation>
+        <xs:complexContent>
+            <xs:extension base="stal:ResponseType">
+                <xs:annotation>
+                    <xs:documentation>Contains the result of the script executed by the
+                        BKU</xs:documentation>
+                </xs:annotation>
+                <xs:choice maxOccurs="unbounded" minOccurs="1">
+                    <xs:element name="ATR" type="tns:ATRType"/>
+                    <xs:element name="ResponseAPDU" type="tns:ResponseAPDUType"/>
+                </xs:choice>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    
+    <xs:complexType name="ResetType">
+        <xs:annotation>
+            <xs:documentation>Reset the icc and sequence counter</xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="cold" type="xs:boolean" default="true"/>
+    </xs:complexType>
+    
+    <xs:complexType name="CommandAPDUType">
+        <xs:annotation>
+            <xs:documentation>Contains a sequence of bytes send as command APDU to the
+                icc</xs:documentation>
+        </xs:annotation>
+        <xs:simpleContent>
+            <xs:extension base="xs:hexBinary">
+                <xs:attribute name="sequence" type="xs:positiveInteger" use="required"/>
+                <xs:attribute name="of" type="xs:positiveInteger" use="required"/>
+                <xs:attribute name="expectedSW" type="xs:hexBinary"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    
+    <xs:complexType name="VerifyAPDUType">
+        <xs:annotation>
+            <xs:documentation>Contains a sequence of bytes send as command APDU to the icc after a
+                PIN entered by the user has been incorporated into the APDU</xs:documentation>
+        </xs:annotation>
+        <xs:simpleContent>
+            <xs:extension base="xs:hexBinary">
+                <xs:attribute name="sequence" type="xs:positiveInteger" use="required"/>
+                <xs:attribute name="of" type="xs:positiveInteger" use="required"/>
+                <xs:attribute name="expectedSW" type="xs:hexBinary"/>
+                <xs:attribute name="message" type="xs:string" use="required"/>
+                <xs:attribute name="format" type="xs:hexBinary" use="required"/>
+                <xs:attribute name="offset" type="xs:nonNegativeInteger" use="required"/>
+                <xs:attribute name="timeout" type="xs:nonNegativeInteger" use="required"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    
+    <xs:complexType name="ATRType">
+        <xs:annotation>
+            <xs:documentation>Contains the ATR received as reponse to a Reset
+                command</xs:documentation>
+        </xs:annotation>
+        <xs:simpleContent>
+            <xs:extension base="xs:hexBinary">
+                <xs:attribute name="rc" type="xs:integer" default="0"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    
+    <xs:complexType name="ResponseAPDUType">
+        <xs:annotation>
+            <xs:documentation>Contains a sequence of bytes received from the card as response
+                APDU</xs:documentation>
+        </xs:annotation>
+        <xs:simpleContent>
+            <xs:extension base="xs:hexBinary">
+                <xs:attribute name="sequence" type="xs:positiveInteger" use="required"/>
+                <xs:attribute name="rc" type="xs:integer" default="0"/>
+                <xs:attribute name="SW" type="xs:hexBinary" default="9000"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    
+    <xs:complexType name="AttributeList">
+        <xs:annotation>
+            <xs:documentation>Contains a list of attributes</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Attribute" type="tns:AttributeType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="AttributeType">
+        <xs:annotation>
+            <xs:documentation>Contains an attribute converted from ASN.1</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Integer" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="Latin1String" type="xs:string" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="UTF8String" type="xs:string" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="NumericString" type="xs:string" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="PrintableString" type="xs:string" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="GeneralizedTime" type="xs:dateTime" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="Date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        </xs:sequence>
+        <xs:attribute name="oid" type="xs:string" use="required"/>
+    </xs:complexType>
+    
+</xs:schema>
diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
index 344e5ce2..9ef43f39 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
+++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
@@ -18,29 +18,37 @@
 <definitions name="stal" targetNamespace="http://www.egiz.gv.at/wsdl/stal"
     xmlns="http://schemas.xmlsoap.org/wsdl/"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.egiz.gv.at/wsdl/stal" xmlns:ns="http://www.egiz.gv.at/stal" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:tns="http://www.egiz.gv.at/wsdl/stal"
+    xmlns:stal="http://www.egiz.gv.at/stal"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
     <types>
         <xsd:schema targetNamespace="http://www.egiz.gv.at/wsdl/stal">
-            <xsd:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal.xsd"/>
+            <xsd:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal-service.xsd"/>
+            <!--xsd:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal-extended.xsd"/-->
         </xsd:schema>
+        <!-- test 
+        <xsd:schema targetNamespace="http://www.egiz.gv.at/wsdl/stal-extended">
+            <xsd:import namespace="http://www.buergerkarte.at/cardchannel" schemaLocation="CardChannel.xsd"/>
+        </xsd:schema-->
     </types>
     <message name="ConnectRequest">
-        <part name="part1" element="ns:SessionId"/>
+        <part name="part1" element="stal:SessionId"/>
     </message>
     <message name="NextRequestRequest">
-        <part name="part1" element="ns:GetNextRequest"/>
+        <part name="part1" element="stal:GetNextRequest"/>
     </message>
     <message name="NextRequestResponse">
-        <part name="part1" element="ns:GetNextRequestResponse"/>
+        <part name="part1" element="stal:GetNextRequestResponse"/>
     </message>
     <message name="GetHashDataInputRequest">
-        <part name="part1" element="ns:GetHashDataInput"/>
+        <part name="part1" element="stal:GetHashDataInput"/>
     </message>
     <message name="GetHashDataInputResponse">
-        <part name="part1" element="ns:GetHashDataInputResponse"/>
+        <part name="part1" element="stal:GetHashDataInputResponse"/>
     </message>
     <message name="GetHashDataInputFault">
-        <part name="part1" element="ns:GetHashDataInputFault"/>
+        <part name="part1" element="stal:GetHashDataInputFault"/>
     </message>
     <portType name="STALPortType">
         <operation name="connect">
diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
index 761b5556..6f3946dc 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
+++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
@@ -74,7 +74,6 @@
       <element name="InfoboxReadRequest" type="tns:InfoboxReadRequestType"/>
       <element name="SignRequest" type="tns:SignRequestType"/>
       <element name="QuitRequest" type="tns:QuitRequestType"/>
-      <!--any namespace="##other" /-->
     </choice>
     <attribute name="SessionId" type="string"/>
   </complexType>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/error.pcsc.html b/BKUOnline/src/main/webapp/helpfiles/de/error.pcsc.html
index 209ae6fa..d38e77ca 100644
--- a/BKUOnline/src/main/webapp/helpfiles/de/error.pcsc.html
+++ b/BKUOnline/src/main/webapp/helpfiles/de/error.pcsc.html
@@ -26,8 +26,18 @@
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Fehler: Es konnte keine PC/SC-Schnittstelle gefunden werden</h1>
-    <p>Die Software für den Zugriff auf die Bürgerkarte konnte keine PC/SC-Schnittstelle für den Zugriff auf Kartenleser erkennen. Das Betriebssystem scheint keine PC/SC-Schnittstelle zur Verfügung zu stellen.</p>
-    <p>Unter Betriebssystemen die PCSC-Lite verwenden (Linux u.a.) tritt dieses Problem auch auf, wenn kein Kartenleser angeschlossen ist und daher der entsprechende Dienst nicht gestartet wurde oder wenn die entsprechende Bibliothek nicht zur Verfügung steht (<a href="http://java.sun.com/javase/6/docs/technotes/guides/security/SunProviders.html#SunPCSCProvider">weitere Informationen</a>).<br class="clearfloat" />
+    <p>Die Software für den Zugriff auf die Bürgerkarte konnte keine PC/SC-Schnittstelle für den Zugriff auf Kartenleser erkennen. 
+       Das Betriebssystem scheint keine PC/SC-Schnittstelle zur Verfügung zu stellen.</p>
+    <p>Häufige Ursachen für dieses Problem sind
+    <ul>
+        <li>Der PC/SC Dienst läuft nicht</li>
+        <li>Die entsprechende PC/SC Bibliothek kann von Java nicht gefunden werden
+        (<a href="http://java.sun.com/javase/6/docs/technotes/guides/security/SunProviders.html#SunPCSCProvider">weitere Informationen</a>).</li>
+    </ul>
+    </p>
+    <p>Unter Betriebssystemen die PCSC-Lite verwenden (Linux u.a.) tritt dieses Problem auch auf, 
+       wenn kein Kartenleser angeschlossen ist und daher der entsprechende Dienst nicht gestartet wurde.
+       <br class="clearfloat" />
     </p>
     <p><br class="clearfloat" /></p>    
   </div>
diff --git a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
index 8830a81c..9d77e53e 100644
--- a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
+++ b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
@@ -34,6 +34,7 @@ import at.gv.egiz.stal.SignResponse;
 import at.gv.egiz.stal.SignRequest;
 import at.gv.egiz.stal.service.types.InfoboxReadRequestType;
 import at.gv.egiz.stal.service.types.InfoboxReadResponseType;
+import at.gv.egiz.stal.service.types.ObjectFactory;
 import at.gv.egiz.stal.service.types.QuitRequestType;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
@@ -45,6 +46,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import javax.xml.bind.JAXBElement;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.BeforeClass;
@@ -283,19 +285,25 @@ public class STALRequestBrokerTest {
         @Override
         public void run() {
             try {
+              ObjectFactory of= new ObjectFactory();
+
                 log.debug("calling stal.nextRequest(oldResponse)");
-                ResponseType oldResp = new InfoboxReadResponseType();
-                List<RequestType> requests = stal.nextRequest(Collections.singletonList(oldResp));
+                InfoboxReadResponseType oldResp = of.createInfoboxReadResponseType();
+                ArrayList<JAXBElement<? extends ResponseType>> oldResponses = new ArrayList<JAXBElement<? extends ResponseType>>();
+                oldResponses.add(of.createGetNextRequestTypeInfoboxReadResponse(oldResp));
+
+                List<JAXBElement<? extends RequestType>> requests = stal.nextRequest(oldResponses);
                 log.debug("got " + requests.size() + " requests. processing...");
                 Thread.sleep(1);
-                List<ResponseType> responses = new ArrayList<ResponseType>();
-                for (RequestType request : requests) {
+                List<JAXBElement<? extends ResponseType>> responses = new ArrayList<JAXBElement<? extends ResponseType>>();
+                for (JAXBElement<? extends RequestType> requestElt : requests) {
+                  RequestType request = requestElt.getValue();
                     if (request instanceof InfoboxReadRequestType) {
                       log.debug("received UNEXPECTED READINFOBOX request");
                       
-                        InfoboxReadResponseType r = new InfoboxReadResponseType();
+                        InfoboxReadResponseType r = of.createInfoboxReadResponseType();
                         r.setInfoboxValue("dummyInfobox".getBytes());
-                        responses.add(r);
+                        responses.add(of.createGetNextRequestTypeInfoboxReadResponse(r));
                     } else if (request instanceof SignRequestType) {
 
                       log.debug("received UNEXPECTED SIGN request");
@@ -311,9 +319,9 @@ public class STALRequestBrokerTest {
                         log.debug("got HashDataInput " + new String(data));
 
 
-                        SignResponseType r = new SignResponseType();
+                        SignResponseType r = of.createSignResponseType();
                         r.setSignatureValue("dummySignature".getBytes());
-                        responses.add(r);
+                        responses.add(of.createGetNextRequestTypeSignResponse(r));
                     } else if (request instanceof QuitRequestType) {
                         log.debug("received EXPECTED QUIT request");
                         return;
@@ -326,7 +334,8 @@ public class STALRequestBrokerTest {
 //                }
                 log.debug("calling stal.nextRequest with " + responses.size() + " responses");
                 requests = stal.nextRequest(responses);
-                for (RequestType request : requests) {
+                for (JAXBElement<? extends RequestType> requestElt : requests) {
+                  RequestType request = requestElt.getValue();
                     if (request instanceof QuitRequestType) {
                         log.debug("got QUIT request");
                     } else {
@@ -347,17 +356,19 @@ public class STALRequestBrokerTest {
         @Override
         public void run() {
             try {
+              ObjectFactory of = new ObjectFactory();
                 // first call w/ empty response list
                 log.debug("calling stal.nextRequest");
-                List<RequestType> requests = stal.nextRequest(null); //new ArrayList<ResponseType>());
+                List<JAXBElement<? extends RequestType>> requests = stal.nextRequest(null); //new ArrayList<ResponseType>());
                 log.debug("got " + requests.size() + " requests. processing...");
                 Thread.sleep(1);
-                List<ResponseType> responses = new ArrayList<ResponseType>();
-                for (RequestType request : requests) {
+                List<JAXBElement<? extends ResponseType>> responses = new ArrayList<JAXBElement<? extends ResponseType>>();
+                for (JAXBElement<? extends RequestType> requestElt : requests) {
+                  RequestType request = requestElt.getValue();
                     if (request instanceof InfoboxReadRequestType) {
-                        InfoboxReadResponseType r = new InfoboxReadResponseType();
+                        InfoboxReadResponseType r = of.createInfoboxReadResponseType();
                         r.setInfoboxValue("dummyInfobox".getBytes());
-                        responses.add(r);
+                        responses.add(of.createGetNextRequestTypeInfoboxReadResponse(r));
                     } else if (request instanceof SignRequestType) {
 
                         log.debug("calling stal.getCurrentHashDataInputCallback");
@@ -371,9 +382,9 @@ public class STALRequestBrokerTest {
                         log.debug("got HashDataInput " + new String(data));
 
 
-                        SignResponseType r = new SignResponseType();
+                        SignResponseType r = of.createSignResponseType();
                         r.setSignatureValue("dummySignature".getBytes());
-                        responses.add(r);
+                        responses.add(of.createGetNextRequestTypeSignResponse(r));
                     } else if (request instanceof QuitRequestType) {
                         log.debug("received UNEXPECTED QUIT request");
                         return;
@@ -386,7 +397,8 @@ public class STALRequestBrokerTest {
 //                }
                 log.debug("calling stal.nextRequest with " + responses.size() + " responses");
                 requests = stal.nextRequest(responses);
-                for (RequestType request : requests) {
+                for (JAXBElement<? extends RequestType> requestElt : requests) {
+                  RequestType request = requestElt.getValue();
                     if (request instanceof QuitRequestType) {
                         log.debug("got QUIT request");
                     } else {
@@ -408,10 +420,11 @@ public class STALRequestBrokerTest {
             try {
                 // first call w/ empty response list
                 log.debug("calling stal.nextRequest");
-                List<RequestType> requests = stal.nextRequest(null); //new ArrayList<ResponseType>());
+                List<JAXBElement<? extends RequestType>> requests = stal.nextRequest(null); //new ArrayList<ResponseType>());
                 log.debug("got " + requests.size() + " requests. processing...");
                 Thread.sleep(1);
-                for (RequestType request : requests) {
+                for (JAXBElement<? extends RequestType> requestElt : requests) {
+                  RequestType request = requestElt.getValue();
 //                    if (request instanceof InfoboxReadRequest) {
                     if (request instanceof SignRequestType) {
                         log.debug("calling stal.getCurrentHashDataInputCallback");
-- 
cgit v1.2.3


From 351eba07a9ba4e98e182c6210839c209dcbb82a6 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 20 Jan 2009 14:52:40 +0000
Subject: cleanup (removed hashdatadisplay config; rename HTTP-ohne.html,
 appletPage.jsp)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@270 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../egiz/bku/online/webapp/BKURequestHandler.java  |   1 -
 BKUOnline/src/main/webapp/HTTP-ohne.html           | 121 ---------------------
 BKUOnline/src/main/webapp/WEB-INF/web.xml          |   2 +-
 BKUOnline/src/main/webapp/appletPage.jsp           |  73 -------------
 BKUOnline/src/main/webapp/css/applet.css           |  16 ---
 BKUOnline/src/main/webapp/css/login.css            |  16 +++
 .../webapp/helpfiles/de/help.hashdataviewer.html   |   1 +
 BKUOnline/src/main/webapp/ieView.html              |  31 ------
 BKUOnline/src/main/webapp/index.html               |   2 +-
 BKUOnline/src/main/webapp/login.jsp                |  70 ++++++++++++
 BKUOnline/src/main/webapp/multiHashDataInput.html  |  37 -------
 BKUOnline/src/main/webapp/slRequestForm.html       | 115 ++++++++++++++++++++
 12 files changed, 204 insertions(+), 281 deletions(-)
 delete mode 100644 BKUOnline/src/main/webapp/HTTP-ohne.html
 delete mode 100644 BKUOnline/src/main/webapp/appletPage.jsp
 delete mode 100644 BKUOnline/src/main/webapp/css/applet.css
 create mode 100644 BKUOnline/src/main/webapp/css/login.css
 delete mode 100644 BKUOnline/src/main/webapp/ieView.html
 create mode 100644 BKUOnline/src/main/webapp/login.jsp
 delete mode 100644 BKUOnline/src/main/webapp/multiHashDataInput.html
 create mode 100644 BKUOnline/src/main/webapp/slRequestForm.html

(limited to 'BKUOnline/src/main/java')

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 7930c53a..d9be0981 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
@@ -49,7 +49,6 @@ public class BKURequestHandler extends SpringBKUServlet {
 
   private static final long serialVersionUID = 1L;
 
-  public final static String REDIRECT_URL = "appletPage.jsp";
   public final static String REDIRECT_URL_SESSION_ATTRIBUTE="redirectUrl";
 
   protected Log log = LogFactory.getLog(BKURequestHandler.class);
diff --git a/BKUOnline/src/main/webapp/HTTP-ohne.html b/BKUOnline/src/main/webapp/HTTP-ohne.html
deleted file mode 100644
index e5a35cf0..00000000
--- a/BKUOnline/src/main/webapp/HTTP-ohne.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!--
-  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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Infobox Requests</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-</head>
-<body>
-<h1>Securitykapsel - HTTP-Bindung</h1>
-<style type="text/css">
-fieldset {
-	padding: 1em;
-	font: 80%/ 1 sans-serif;
-	background-color: #F2EFE9;
-	padding-left: 5em;
-}
-
-fieldset.submit {
-	float: none;
-	width: auto;
-	border: 0 none #FFF;
-	padding-left: 14em;
-	border-style: none;
-	background-color: transparent;
-}
-
-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;
-}
-
-legend {
-	border: 1px solid;
-	padding: 2px 6px
-}
-</style>
-
-<p>
-<form action="./http-security-layer-request" method="Post"
-	enctype="application/x-www-form-urlencoded">
-        <!--input name="locale" value="es_MX" type="hidden" /-->
-<fieldset><legend>Enter XML Request</legend>
-<p><label for="XMLRequest">XML Request</label> <textarea
-	name="XMLRequest" rows=15 cols="60" id="XMLRequest">
-<?xml version="1.0" encoding="UTF-8"?>
-<sl:CreateXMLSignatureRequest 
-   xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
-<sl:KeyboxIdentifier>SecureSignatureKeypair</sl:KeyboxIdentifier>
-   <sl:DataObjectInfo Structure="enveloping">
-     <sl:DataObject>
-       <sl:XMLContent>Ich bin ein einfacher Text.</sl:XMLContent>
-     </sl:DataObject>
-    <sl:TransformsInfo>
-      <sl:FinalDataMetaInfo>
-       <sl:MimeType>text/plain</sl:MimeType>
-       </sl:FinalDataMetaInfo>
-    </sl:TransformsInfo>
-  </sl:DataObjectInfo>
-</sl:CreateXMLSignatureRequest> 
-</textarea></p>
-<!--
-<?xml version="1.0" encoding="UTF-8" ?>
-<sl:InfoboxReadRequest
-	xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
-<sl:InfoboxIdentifier>IdentityLink</sl:InfoboxIdentifier>
-<sl:BinaryFileParameters ContentIsXMLEntity="true" />
-</sl:InfoboxReadRequest>
--->
-<p><label for="appletWidth">Applet Width</label> <input
-  name="appletWidth" value="190" id="appletWidth">
-<p><label for="appletHeight">Applet Height</label> <input
-  name="appletHeight" value="130" id="appletHeight">
-<p><label for="appletBackground">Applet Background</label> <input
-  name="appletBackground" value="" id="appletBackground">
-<p>
-	<label for="appletGuiStyle">GUI Style</label> 
-	<input type="radio" name="appletGuiStyle" value="simple" checked="checked">simple
-	<input type="radio" name="appletGuiStyle" value="advanced">advanced
-</p>
-<p>
-	<label for="appletHashDataDisplay">HashData Display</label> 
-    <input type="radio" name="appletHashDataDisplay" value="frame" checked="checked">Frame
-    <input type="radio" name="appletHashDataDisplay" value="browser">Browser
-	<!--input type="radio" name="appletHashDataDisplay" value="internal">Applet-->
-</p>
-
-<!-- 
-<p><label for="RedirectURL">RedirectURL</label> <input
-	name="RedirectURL" value="" id="RedirectURL"></p>
-<p><label for="DataURL">DataURL</label> <input name="DataURL"
-	value="" id="DataURL"></p>
-<p><label for="StyleSheetURL">StyleSheetURL</label> <input
-	name="StyleSheetURL" value="" id="StyleSheetURL"></p>
-<p>
- --></fieldset>
-<fieldset class="submit"><input type="submit" class="submit"></fieldset>
-</form>
-
-</body>
-</html>
diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml
index a9cdce13..e7a4e058 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/web.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml
@@ -50,7 +50,7 @@
 	</servlet>
     <servlet>
         <servlet-name>BKUApplet</servlet-name>
-        <jsp-file>/appletPage.jsp</jsp-file>
+        <jsp-file>/login.jsp</jsp-file>
     </servlet>
     <servlet>
       <servlet-name>help</servlet-name>
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
deleted file mode 100644
index 8a21e4ec..00000000
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-  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.
--->
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-         pageEncoding="UTF-8"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>MOCCA Applet</title>
-        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
-        <script type="text/javascript" src="js/deployJava.js"></script>
-        <style type="text/css" media="all">@import "css/applet.css";</style>
-
-        <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
-        <META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
-        <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
-    </head>
-    <%
-        int width = session.getAttribute("appletWidth") == null ? 190
-                : (Integer) session.getAttribute("appletWidth"); //230 for workshop demo integration
-        int height = session.getAttribute("appletHeight") == null ? 130
-                : (Integer) session.getAttribute("appletHeight");
-        String backgroundImg = (String) session.getAttribute("appletBackground");
-        String guiStyle = (String) session.getAttribute("appletGuiStyle");
-        String hashDataDisplay = (String) session.getAttribute("appletHashDataDisplay");
-        String locale = (String) session.getAttribute("locale");
-    %>
-    <body id="appletpage" style="width:<%=width%>">
-            <script>
-                if (!deployJava.versionCheck('1.6.0_04+')) {
-                    document
-                    .write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0_04 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">');
-                } else {
-                    var attributes = {
-                        codebase :'applet',
-                        code :'at.gv.egiz.bku.online.applet.BKUApplet.class',
-                        archive :'BKUApplet.jar, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar',
-                        width : <%=width%>,
-                        height :<%=height%>
-                    };
-                    var parameters = {
-                        GuiStyle : '<%=guiStyle%>',
-                        Locale : '<%=locale%>',
-                        Background : '<%=backgroundImg%>',
-                        WSDL_URL :'../stal;jsessionid=<%=session.getId()%>?wsdl',
-                        HelpURL : '../help/',
-                        HashDataDisplay : '<%=hashDataDisplay%>',
-                        HashDataURL : '../hashDataInput',
-                        SessionID : '<%=session.getId()%>',
-                        RedirectURL : '../bkuResult',
-                        RedirectTarget: '_parent'
-                    };
-                    var version = '1.6.0_04';
-                    deployJava.runApplet(attributes, parameters, version);
-                }
-            </script>
-    </body>
-</html>
diff --git a/BKUOnline/src/main/webapp/css/applet.css b/BKUOnline/src/main/webapp/css/applet.css
deleted file mode 100644
index 4bfbd77d..00000000
--- a/BKUOnline/src/main/webapp/css/applet.css
+++ /dev/null
@@ -1,16 +0,0 @@
-
-root { 
-    display: block;
-}
-
-body {
-    background: #ffffff;
-    /*background-image: url(../img/mocca-t_s.png);*/
-    padding: 0;
-    margin: 0;
-    border-style: none;
-    /*
-    width:<%=width%>
-    */
-}
-
diff --git a/BKUOnline/src/main/webapp/css/login.css b/BKUOnline/src/main/webapp/css/login.css
new file mode 100644
index 00000000..4bfbd77d
--- /dev/null
+++ b/BKUOnline/src/main/webapp/css/login.css
@@ -0,0 +1,16 @@
+
+root { 
+    display: block;
+}
+
+body {
+    background: #ffffff;
+    /*background-image: url(../img/mocca-t_s.png);*/
+    padding: 0;
+    margin: 0;
+    border-style: none;
+    /*
+    width:<%=width%>
+    */
+}
+
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html b/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
index f7cf15df..eb1a35d6 100644
--- a/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
+++ b/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
@@ -28,6 +28,7 @@
     <h1> Anzeige der Signaturdaten </h1>
     <p>Dieses Fenster zeigt die zu signierenden Daten an. Dies k&ouml;nnen entweder reine Textdaten oder XHTML sein. Im Falle von XHML erhalten Sie den Hinweis, dass es sich bei den dargestellten Daten nur um eine Voransicht handelt. Um die Daten standardkonform darzustellen, m&uuml;ssen diese abgespeichert und mit einem geeigneten XHTML Betrachter ge&ouml;ffnen werden.</p>
     <p>In jedem Fall k&ouml;nnen die zu signierenden abgespeichert werden.</p>
+     <p><br class="clearfloat" /></p>
   </div>
   <div id="footer">
   	<p>
diff --git a/BKUOnline/src/main/webapp/ieView.html b/BKUOnline/src/main/webapp/ieView.html
deleted file mode 100644
index 71f76eec..00000000
--- a/BKUOnline/src/main/webapp/ieView.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Anzeige</title>
-<style type="text/css">
-body {
-	font-size: 15px;
-	font-weight: 500;
-	font-family: Helvetica, Arial, sans-serif;
-	background-color: DarkOrange;
-	padding:1em 2em 0em 2em;
-}
-
-h1 {
-	font-size: 20px;
-}
-</style>
-</head>
-<body>
-<h1>Achtung: Ihr Browser unterstützt dieses Anzeigeformat (XHTML) nicht.</h1> Die unten
-dargestellten Daten können von den tatsächlichen Signaturdaten abweichen.
-<a href="hashDataInput?ieCType=application%2Fxhtml%2Bxml">Hier</a>
-können Sie die Signaturdaten herunterladen.
-<br>
-<div style="height:700px; margin: 2em 0em 1em 0em">
-<iframe src="hashDataInput?ieCType=text/html" width="100%" height="100%" marginwidth="0"
-marginheight="0" frameborder="1" scrolling="auto">Ihr Browser unterstütz leider keine Iframes</iframe>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index 8f1a338e..94e2890f 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -48,7 +48,7 @@
 <div id="animDiv" class="box">
 <p>
 <h1>TestRequest</h1>
-<a href="HTTP-ohne.html">Security Layer Request</a>
+<a href="slRequestForm.html">Security Layer Request</a>
 <h1>STAL Service</h1>
 <a href="stal">STAL Service Endpoint Information</a>
 </p>
diff --git a/BKUOnline/src/main/webapp/login.jsp b/BKUOnline/src/main/webapp/login.jsp
new file mode 100644
index 00000000..44d9347c
--- /dev/null
+++ b/BKUOnline/src/main/webapp/login.jsp
@@ -0,0 +1,70 @@
+<!--
+  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.
+-->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>MOCCA Applet</title>
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+        <script type="text/javascript" src="js/deployJava.js"></script>
+        <style type="text/css" media="all">@import "css/login.css";</style>
+
+        <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
+        <META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
+        <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
+    </head>
+    <%
+        int width = session.getAttribute("appletWidth") == null ? 190
+                : (Integer) session.getAttribute("appletWidth"); //230 for workshop demo integration
+        int height = session.getAttribute("appletHeight") == null ? 130
+                : (Integer) session.getAttribute("appletHeight");
+        String backgroundImg = (String) session.getAttribute("appletBackground");
+        String guiStyle = (String) session.getAttribute("appletGuiStyle");
+        String locale = (String) session.getAttribute("locale");
+    %>
+    <body id="appletpage" style="width:<%=width%>">
+            <script>
+                if (!deployJava.versionCheck('1.6.0_04+')) {
+                    document
+                    .write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0_04 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">');
+                } else {
+                    var attributes = {
+                        codebase :'applet',
+                        code :'at.gv.egiz.bku.online.applet.BKUApplet.class',
+                        archive :'BKUApplet.jar, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar',
+                        width : <%=width%>,
+                        height :<%=height%>
+                    };
+                    var parameters = {
+                        GuiStyle : '<%=guiStyle%>',
+                        Locale : '<%=locale%>',
+                        Background : '<%=backgroundImg%>',
+                        WSDL_URL :'../stal;jsessionid=<%=session.getId()%>?wsdl',
+                        HelpURL : '../help/',
+                        SessionID : '<%=session.getId()%>',
+                        RedirectURL : '../bkuResult',
+                        RedirectTarget: '_parent'
+                    };
+                    var version = '1.6.0_04';
+                    deployJava.runApplet(attributes, parameters, version);
+                }
+            </script>
+    </body>
+</html>
diff --git a/BKUOnline/src/main/webapp/multiHashDataInput.html b/BKUOnline/src/main/webapp/multiHashDataInput.html
deleted file mode 100644
index bb03f8ce..00000000
--- a/BKUOnline/src/main/webapp/multiHashDataInput.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-  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.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Mehrere Signaturedaten</title>
-<style type="text/css">
-h1 {
-	color: red;
-	font-size: 15px;
-	font-weight: 500;
-	font-family: Helvetica, Arial, sans-serif;
-}
-</style>
-</head>
-<body>
-<div style="width:300px; padding:20px; border:5px solid #ff0000;text-align: center">
-<h1>Diese Signatur enthält mehrere Datenobjekte. <br>
-Die Anzeige dieser wird derzeit nicht unterstützt !</h1>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/slRequestForm.html b/BKUOnline/src/main/webapp/slRequestForm.html
new file mode 100644
index 00000000..95eb1947
--- /dev/null
+++ b/BKUOnline/src/main/webapp/slRequestForm.html
@@ -0,0 +1,115 @@
+<!--
+  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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>Infobox Requests</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+<h1>Securitykapsel - HTTP-Bindung</h1>
+<style type="text/css">
+fieldset {
+	padding: 1em;
+	font: 80%/ 1 sans-serif;
+	background-color: #F2EFE9;
+	padding-left: 5em;
+}
+
+fieldset.submit {
+	float: none;
+	width: auto;
+	border: 0 none #FFF;
+	padding-left: 14em;
+	border-style: none;
+	background-color: transparent;
+}
+
+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;
+}
+
+legend {
+	border: 1px solid;
+	padding: 2px 6px
+}
+</style>
+
+<p>
+<form action="./http-security-layer-request" method="Post"
+	enctype="application/x-www-form-urlencoded">
+        <!--input name="locale" value="es_MX" type="hidden" /-->
+<fieldset><legend>Enter XML Request</legend>
+<p><label for="XMLRequest">XML Request</label> <textarea
+	name="XMLRequest" rows=15 cols="60" id="XMLRequest">
+<?xml version="1.0" encoding="UTF-8"?>
+<sl:CreateXMLSignatureRequest 
+   xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
+<sl:KeyboxIdentifier>SecureSignatureKeypair</sl:KeyboxIdentifier>
+   <sl:DataObjectInfo Structure="enveloping">
+     <sl:DataObject>
+       <sl:XMLContent>Ich bin ein einfacher Text.</sl:XMLContent>
+     </sl:DataObject>
+    <sl:TransformsInfo>
+      <sl:FinalDataMetaInfo>
+       <sl:MimeType>text/plain</sl:MimeType>
+       </sl:FinalDataMetaInfo>
+    </sl:TransformsInfo>
+  </sl:DataObjectInfo>
+</sl:CreateXMLSignatureRequest> 
+</textarea></p>
+<!--
+<?xml version="1.0" encoding="UTF-8" ?>
+<sl:InfoboxReadRequest
+	xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
+<sl:InfoboxIdentifier>IdentityLink</sl:InfoboxIdentifier>
+<sl:BinaryFileParameters ContentIsXMLEntity="true" />
+</sl:InfoboxReadRequest>
+-->
+<p><label for="appletWidth">Applet Width</label> <input
+  name="appletWidth" value="190" id="appletWidth">
+<p><label for="appletHeight">Applet Height</label> <input
+  name="appletHeight" value="130" id="appletHeight">
+<p><label for="appletBackground">Applet Background</label> <input
+  name="appletBackground" value="" id="appletBackground">
+<p>
+	<label for="appletGuiStyle">GUI Style</label> 
+	<input type="radio" name="appletGuiStyle" value="simple" checked="checked">simple
+	<input type="radio" name="appletGuiStyle" value="advanced">advanced
+</p>
+
+<!-- 
+<p><label for="RedirectURL">RedirectURL</label> <input
+	name="RedirectURL" value="" id="RedirectURL"></p>
+<p><label for="DataURL">DataURL</label> <input name="DataURL"
+	value="" id="DataURL"></p>
+<p><label for="StyleSheetURL">StyleSheetURL</label> <input
+	name="StyleSheetURL" value="" id="StyleSheetURL"></p>
+<p>
+ --></fieldset>
+<fieldset class="submit"><input type="submit" class="submit"></fieldset>
+</form>
+
+</body>
+</html>
-- 
cgit v1.2.3