From 32d17447a258188b2d534bcb0bf65a659ba7b7d0 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 29 Aug 2008 12:11:34 +0000
Subject: Initial import.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../impl/CreateXMLSignatureCommandImpl.java        | 229 +++++++++++++++++++++
 1 file changed, 229 insertions(+)
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java

(limited to 'bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java')

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
new file mode 100644
index 00000000..136fa6f3
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
@@ -0,0 +1,229 @@
+/*
+* 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.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.Date;
+
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.URIReferenceException;
+import javax.xml.crypto.dsig.XMLSignatureException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSSerializer;
+
+import at.buergerkarte.namespaces.securitylayer._1.CreateXMLSignatureRequestType;
+import at.buergerkarte.namespaces.securitylayer._1.DataObjectInfoType;
+import at.gv.egiz.bku.slcommands.CreateXMLSignatureCommand;
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slcommands.SLResult;
+import at.gv.egiz.bku.slcommands.impl.xsect.AlgorithmMethodFactory;
+import at.gv.egiz.bku.slcommands.impl.xsect.AlgorithmMethodFactoryImpl;
+import at.gv.egiz.bku.slcommands.impl.xsect.IdValueFactory;
+import at.gv.egiz.bku.slcommands.impl.xsect.IdValueFactoryImpl;
+import at.gv.egiz.bku.slcommands.impl.xsect.Signature;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+import at.gv.egiz.bku.slexceptions.SLRequestException;
+import at.gv.egiz.dom.DOMUtils;
+import at.gv.egiz.stal.InfoboxReadRequest;
+import at.gv.egiz.stal.InfoboxReadResponse;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+
+/**
+ * This class implements the security layer command <code>CreateXMLSignatureRequest</code>.
+ * 
+ * @author mcentner
+ */
+public class CreateXMLSignatureCommandImpl extends SLCommandImpl<CreateXMLSignatureRequestType> implements
+    CreateXMLSignatureCommand {
+  
+  /**
+   * Logging facility.
+   */
+  protected static Log log = LogFactory.getLog(CreateXMLSignatureCommandImpl.class);
+  
+  /**
+   * The signing certificate.
+   */
+  protected X509Certificate signingCertificate;
+  
+  /**
+   * The keybox identifier of the key used for signing.
+   */
+  protected String keyboxIdentifier;
+  
+  /**
+   * The to-be signed signature.
+   */
+  protected Signature signature;
+
+  @Override
+  public void init(SLCommandContext ctx, Object unmarshalledRequest)
+      throws SLCommandException {
+    super.init(ctx, unmarshalledRequest);
+  }
+
+  @Override
+  public void prepareXMLSignature() throws SLCommandException, SLRequestException {
+
+   CreateXMLSignatureRequestType request = getRequestValue();
+    
+    // TODO: make configurable?
+    IdValueFactory idValueFactory = new IdValueFactoryImpl();
+    
+    // TODO: make configurable?
+    AlgorithmMethodFactory algorithmMethodFactory;
+    try {
+      algorithmMethodFactory = new AlgorithmMethodFactoryImpl(signingCertificate);
+    } catch (NoSuchAlgorithmException e) {
+      log.error("Failed to get DigestMethod.", e);
+      throw new SLCommandException(4006);
+    }
+    
+    signature = new Signature(getCmdCtx().getURLDereferencerContext(), idValueFactory, algorithmMethodFactory);
+
+    // SigningTime
+    signature.setSigningTime(new Date());
+    
+    // SigningCertificate
+    signature.setSignerCeritifcate(signingCertificate);
+    
+    // SignatureInfo
+    if (request.getSignatureInfo() != null) {
+      signature.setSignatureInfo(request.getSignatureInfo());
+    }
+    
+    // DataObjects
+    for (DataObjectInfoType dataObjectInfo : request.getDataObjectInfo()) {
+      signature.addDataObject(dataObjectInfo);
+    }
+    
+    signature.buildXMLSignature();
+    
+  }
+
+  /**
+   * Gets the signing certificate from STAL.
+   * 
+   * @throws SLCommandException
+   *           if getting the singing certificate fails
+   */
+  private void getSigningCertificate() throws SLCommandException {
+    
+    CreateXMLSignatureRequestType request = getRequestValue();
+    keyboxIdentifier = request.getKeyboxIdentifier();
+    
+    InfoboxReadRequest stalRequest = new InfoboxReadRequest();
+    stalRequest.setInfoboxIdentifier(keyboxIdentifier);
+    
+    requestSTAL(Collections.singletonList((STALRequest) stalRequest));
+    
+    STALResponse stalResponse = stalResponses.next();
+    
+    if (stalResponse instanceof InfoboxReadResponse) {
+      byte[] infobox = ((InfoboxReadResponse) stalResponse).getInfoboxValue();
+      
+      try {
+        CertificateFactory certFactory = CertificateFactory.getInstance("X509");
+        signingCertificate = (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(infobox));
+      } catch (CertificateException e) {
+        log.info("Failed to decode signing certificate.", e);
+        // TODO: issue appropriate error
+        throw new SLCommandException(4000);
+      }
+      
+    } else {
+      log.info("Failed to get signing certificate.");
+      // TODO: issue appropriate error
+      throw new SLCommandException(4000);
+    }
+    
+  }
+
+  /**
+   * Signs the signature.
+   * 
+   * @throws SLCommandException
+   *           if signing the signature fails
+   */
+  private void signXMLSignature() throws SLCommandException {
+    
+    try {
+      signature.sign(getCmdCtx().getSTAL(), keyboxIdentifier);
+    } catch (MarshalException e) {
+      log.error("Failed to marshall XMLSignature.", e);
+      throw new SLCommandException(4000);
+    } catch (XMLSignatureException e) {
+      if (e.getCause() instanceof URIReferenceException) {
+        URIReferenceException uriReferenceException = (URIReferenceException) e.getCause();
+        if (uriReferenceException.getCause() instanceof SLCommandException) {
+          throw (SLCommandException) uriReferenceException.getCause();
+        }
+      }
+      log.error("Failed to sign XMLSignature.", e);
+      throw new SLCommandException(4000);
+    }
+    
+  }
+  
+  @Override
+  public SLResult execute() {
+    try {
+      
+      // get certificate in order to select appropriate algorithms for hashing and signing
+      getSigningCertificate();
+      
+      // prepare the XMLSignature for signing
+      prepareXMLSignature();
+      
+      // sign the XMLSignature
+      signXMLSignature();
+      
+      if (log.isTraceEnabled()) {
+        
+        DOMImplementationLS domImplLS = DOMUtils.getDOMImplementationLS();
+        LSSerializer serializer = domImplLS.createLSSerializer();
+        String debugString = serializer.writeToString(signature.getDocument());
+
+        log.trace(debugString);
+        
+      }
+      
+      return new CreateXMLSignatureResultImpl(signature.getDocument());
+      
+    } catch (SLCommandException e) {
+      return new ErrorResultImpl(e);
+    } catch (SLRequestException e) {
+      return new ErrorResultImpl(e);
+    }
+  }
+
+  @Override
+  public String getName() {
+    return "CreateXMLSignatureRequest";
+  }
+  
+  
+}
-- 
cgit v1.2.3


From 66cfb865fbfa7af514e803003f928d77f1156e46 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 11 Sep 2008 12:16:35 +0000
Subject: Added to be signed data validation.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@32 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUViewer/.classpath                               |  10 +
 BKUViewer/.project                                 |  23 +
 BKUViewer/.settings/org.eclipse.jdt.core.prefs     |   5 +
 BKUViewer/.settings/org.maven.ide.eclipse.prefs    |   8 +
 BKUViewer/pom.xml                                  |  44 ++
 .../at/gv/egiz/bku/slxhtml/SLXHTMLValidator.java   | 251 ++++++++
 .../egiz/bku/slxhtml/css/CSSValidatorSLXHTML.java  |  95 +++
 .../bku/slxhtml/css/CssBackgroundColorSLXHTML.java |  57 ++
 .../egiz/bku/slxhtml/css/CssBackgroundSLXHTML.java |  93 +++
 .../slxhtml/css/CssBorderBottomColorSLXHTML.java   |  57 ++
 .../bku/slxhtml/css/CssBorderColorSLXHTML.java     |  81 +++
 .../bku/slxhtml/css/CssBorderLeftColorSLXHTML.java |  57 ++
 .../slxhtml/css/CssBorderRightColorSLXHTML.java    |  57 ++
 .../gv/egiz/bku/slxhtml/css/CssBorderSLXHTML.java  |  85 +++
 .../bku/slxhtml/css/CssBorderTopColorSLXHTML.java  |  57 ++
 .../gv/egiz/bku/slxhtml/css/CssColorSLXHTML.java   |  99 ++++
 .../at/gv/egiz/bku/slxhtml/css/CssFontSLXHTML.java |  59 ++
 .../bku/slxhtml/css/CssLetterSpacingSLXHTML.java   |  54 ++
 .../bku/slxhtml/css/CssMarginBottomSLXHTML.java    |  60 ++
 .../egiz/bku/slxhtml/css/CssMarginLeftSLXHTML.java |  61 ++
 .../bku/slxhtml/css/CssMarginRightSLXHTML.java     |  60 ++
 .../gv/egiz/bku/slxhtml/css/CssMarginSLXHTML.java  | 101 ++++
 .../egiz/bku/slxhtml/css/CssMarginTopSLXHTML.java  |  61 ++
 .../bku/slxhtml/css/CssPaddingBottomSLXHTML.java   |  60 ++
 .../bku/slxhtml/css/CssPaddingLeftSLXHTML.java     |  60 ++
 .../bku/slxhtml/css/CssPaddingRightSLXHTML.java    |  60 ++
 .../gv/egiz/bku/slxhtml/css/CssPaddingSLXHTML.java | 102 ++++
 .../egiz/bku/slxhtml/css/CssPaddingTopSLXHTML.java |  61 ++
 .../bku/slxhtml/css/CssTextDecorationSLXHTML.java  |  51 ++
 .../bku/slxhtml/css/CssWordSpacingSLXHTML.java     |  54 ++
 .../slxhtml/css/SLXHTMLInvalidParamException.java  |  71 +++
 .../at/gv/egiz/bku/slxhtml/css/SLXHTMLStyle.java   |  22 +
 .../egiz/bku/slxhtml/css/TableLayoutSLXHTML.java   |  45 ++
 .../java/at/gv/egiz/bku/text/TextValidator.java    |  32 +
 .../services/at.gv.egiz.bku.viewer.Validator       |   2 +
 .../at/gv/egiz/bku/slxhtml/slxhtml-model-1.xsd     | 469 +++++++++++++++
 .../at/gv/egiz/bku/slxhtml/slxhtml-modules-1.xsd   | 248 ++++++++
 .../resources/at/gv/egiz/bku/slxhtml/slxhtml.xsd   |  70 +++
 .../at/gv/egiz/bku/slxhtml/xhtml-attribs-1.xsd     |  72 +++
 .../at/gv/egiz/bku/slxhtml/xhtml-blkphras-1.xsd    | 161 ++++++
 .../at/gv/egiz/bku/slxhtml/xhtml-blkpres-1.xsd     |  37 ++
 .../at/gv/egiz/bku/slxhtml/xhtml-blkstruct-1.xsd   |  49 ++
 .../at/gv/egiz/bku/slxhtml/xhtml-datatypes-1.xsd   | 175 ++++++
 .../at/gv/egiz/bku/slxhtml/xhtml-framework-1.xsd   |  66 +++
 .../at/gv/egiz/bku/slxhtml/xhtml-image-1.xsd       |  45 ++
 .../at/gv/egiz/bku/slxhtml/xhtml-inlphras-1.xsd    | 163 ++++++
 .../at/gv/egiz/bku/slxhtml/xhtml-inlpres-1.xsd     |  39 ++
 .../at/gv/egiz/bku/slxhtml/xhtml-inlstruct-1.xsd   |  50 ++
 .../at/gv/egiz/bku/slxhtml/xhtml-list-1.xsd        |  99 ++++
 .../at/gv/egiz/bku/slxhtml/xhtml-pres-1.xsd        |  51 ++
 .../at/gv/egiz/bku/slxhtml/xhtml-struct-1.xsd      | 116 ++++
 .../at/gv/egiz/bku/slxhtml/xhtml-style-1.xsd       |  53 ++
 .../at/gv/egiz/bku/slxhtml/xhtml-table-1.xsd       | 272 +++++++++
 .../at/gv/egiz/bku/slxhtml/xhtml-text-1.xsd        |  67 +++
 .../main/resources/at/gv/egiz/bku/slxhtml/xml.xsd  | 145 +++++
 .../org/w3c/css/properties/Config.properties       |  32 +
 .../css/properties/ProfilesProperties.properties   |  30 +
 .../css/properties/SLXHTMLProperties.properties    | 641 +++++++++++++++++++++
 .../java/at/gv/egiz/bku/slxhtml/ValidatorTest.java |  66 +++
 .../gv/egiz/bku/slxhtml/css/CssValidatorTest.java  |  75 +++
 .../resources/at/gv/egiz/bku/slxhtml/test.xhtml    |  10 +
 .../src/test/resources/commons-logging.properties  |   1 +
 BKUViewer/src/test/resources/log4j.properties      |  19 +
 bkucommon/pom.xml                                  |   9 +-
 .../binding/multipart/InputStreamPartSource.java   |   5 -
 .../egiz/bku/binding/multipart/SLResultPart.java   |   5 -
 .../impl/CreateXMLSignatureCommandImpl.java        |  13 +-
 .../egiz/bku/slcommands/impl/xsect/DataObject.java | 119 +++-
 .../bku/slcommands/impl/xsect/STALSignature.java   |  11 +-
 .../egiz/bku/slcommands/impl/xsect/Signature.java  |  10 +-
 .../egiz/bku/slexceptions/SLViewerException.java   |   7 +-
 .../at/gv/egiz/bku/viewer/ValidationException.java |  38 ++
 .../main/java/at/gv/egiz/bku/viewer/Validator.java |  25 +
 .../at/gv/egiz/bku/viewer/ValidatorFactory.java    | 165 ++++++
 .../bku/slcommands/impl/xsect/SignatureTest.java   |  21 +-
 pom.xml                                            |  33 +-
 76 files changed, 5885 insertions(+), 52 deletions(-)
 create mode 100644 BKUViewer/.classpath
 create mode 100644 BKUViewer/.project
 create mode 100644 BKUViewer/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 BKUViewer/.settings/org.maven.ide.eclipse.prefs
 create mode 100644 BKUViewer/pom.xml
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/SLXHTMLValidator.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CSSValidatorSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBackgroundColorSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBackgroundSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderBottomColorSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderColorSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderLeftColorSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderRightColorSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderTopColorSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssColorSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssFontSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssLetterSpacingSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginBottomSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginLeftSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginRightSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginTopSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingBottomSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingLeftSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingRightSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingTopSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssTextDecorationSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssWordSpacingSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/SLXHTMLInvalidParamException.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/SLXHTMLStyle.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/TableLayoutSLXHTML.java
 create mode 100644 BKUViewer/src/main/java/at/gv/egiz/bku/text/TextValidator.java
 create mode 100644 BKUViewer/src/main/resources/META-INF/services/at.gv.egiz.bku.viewer.Validator
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-model-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-modules-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-attribs-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkphras-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkpres-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkstruct-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-datatypes-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-framework-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-image-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlphras-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlpres-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlstruct-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-list-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-pres-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-struct-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-style-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-table-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-text-1.xsd
 create mode 100644 BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xml.xsd
 create mode 100644 BKUViewer/src/main/resources/org/w3c/css/properties/Config.properties
 create mode 100644 BKUViewer/src/main/resources/org/w3c/css/properties/ProfilesProperties.properties
 create mode 100644 BKUViewer/src/main/resources/org/w3c/css/properties/SLXHTMLProperties.properties
 create mode 100644 BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/ValidatorTest.java
 create mode 100644 BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/css/CssValidatorTest.java
 create mode 100644 BKUViewer/src/test/resources/at/gv/egiz/bku/slxhtml/test.xhtml
 create mode 100644 BKUViewer/src/test/resources/commons-logging.properties
 create mode 100644 BKUViewer/src/test/resources/log4j.properties
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidationException.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/viewer/Validator.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidatorFactory.java

(limited to 'bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java')

diff --git a/BKUViewer/.classpath b/BKUViewer/.classpath
new file mode 100644
index 00000000..1041acfa
--- /dev/null
+++ b/BKUViewer/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/BKUViewer/.project b/BKUViewer/.project
new file mode 100644
index 00000000..c18f3f10
--- /dev/null
+++ b/BKUViewer/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>BKUViewer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/BKUViewer/.settings/org.eclipse.jdt.core.prefs b/BKUViewer/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..59690d7b
--- /dev/null
+++ b/BKUViewer/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Tue Sep 09 16:54:39 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/BKUViewer/.settings/org.maven.ide.eclipse.prefs b/BKUViewer/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 00000000..feb34e97
--- /dev/null
+++ b/BKUViewer/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Tue Sep 09 16:54:38 CEST 2008
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
new file mode 100644
index 00000000..d7dbe0aa
--- /dev/null
+++ b/BKUViewer/pom.xml
@@ -0,0 +1,44 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<artifactId>bku</artifactId>
+		<groupId>at.gv.egiz</groupId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>at.gv.egiz</groupId>
+	<artifactId>BKUViewer</artifactId>
+	<name>BKU viewer components</name>
+	<version>1.0-SNAPSHOT</version>
+	<description />
+	<dependencies>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>bkucommon</artifactId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.w3c</groupId>
+			<artifactId>css-validator</artifactId>
+			<version>2.1-mocca</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.w3c</groupId>
+					<artifactId>jigsaw</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>tagsoup</groupId>
+					<artifactId>tagsoup</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/SLXHTMLValidator.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/SLXHTMLValidator.java
new file mode 100644
index 00000000..7ce5fdbe
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/SLXHTMLValidator.java
@@ -0,0 +1,251 @@
+/*
+* 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.slxhtml;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.UnsupportedCharsetException;
+import java.util.Locale;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.ValidatorHandler;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import at.gv.egiz.bku.slxhtml.css.CSSValidatorSLXHTML;
+import at.gv.egiz.bku.viewer.ValidationException;
+
+public class SLXHTMLValidator implements at.gv.egiz.bku.viewer.Validator {
+
+  /**
+   * The schema file for the SLXHTML schema.
+   */
+  private static final String SLXHTML_SCHEMA_FILE = "at/gv/egiz/bku/slxhtml/slxhtml.xsd";
+  
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(SLXHTMLValidator.class);
+
+  private static Schema slSchema;
+  
+  /**
+   * Initialize the security layer schema.
+   */
+  private synchronized static void ensureSchema() {
+      if (slSchema == null) {
+          try {
+              SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+              ClassLoader cl = SLXHTMLValidator.class.getClassLoader();
+              URL schemaURL = cl.getResource(SLXHTML_SCHEMA_FILE);
+              log.debug("Trying to create SLXHTML schema from URL '" + schemaURL + "'.");
+              long t0 = System.currentTimeMillis();
+              slSchema = schemaFactory.newSchema(schemaURL);
+              long t1 = System.currentTimeMillis();
+              log.debug("SLXHTML schema successfully created in " + (t1 - t0) + "ms.");
+          } catch (SAXException e) {
+              log.error("Failed to load security layer XHTML schema.", e);
+              throw new RuntimeException("Failed to load security layer XHTML schema.", e);
+          }
+
+      }
+  }
+  
+  public SLXHTMLValidator() {
+    ensureSchema();
+  }
+  
+  public void validate(InputStream is, String charset)
+      throws ValidationException {
+    if (charset == null) {
+      validate(is, (Charset) null);
+    } else {
+      try {
+        validate(is, Charset.forName(charset));
+      } catch (IllegalCharsetNameException e) {
+        throw new ValidationException(e);
+      } catch (UnsupportedCharsetException e) {
+        throw new ValidationException(e);
+      }
+    }
+  }
+  
+  public void validate(InputStream is, Charset charset) throws ValidationException {
+    
+    SAXParserFactory spf = SAXParserFactory.newInstance();
+    spf.setNamespaceAware(true);
+    spf.setSchema(slSchema);
+    spf.setValidating(true);
+    spf.setXIncludeAware(false);
+    
+    SAXParser parser;
+    try {
+      parser = spf.newSAXParser();
+    } catch (ParserConfigurationException e) {
+      log.error("Failed to create SLXHTML parser.", e);
+      throw new RuntimeException("Failed to create SLXHTML parser.", e);
+    } catch (SAXException e) {
+      log.error("Failed to create SLXHTML parser.", e);
+      throw new RuntimeException("Failed to create SLXHTML parser.", e);
+    }
+    
+    InputSource source;
+    if (charset != null) {
+      source = new InputSource(new InputStreamReader(is, charset));
+    } else {
+      source = new InputSource(is);
+    }
+    
+
+    ValidatorHandler validatorHandler = slSchema.newValidatorHandler();
+
+    DefaultHandler defaultHandler = new ValidationHandler(validatorHandler);
+    try {
+      parser.parse(source, defaultHandler);
+    } catch (SAXException e) {
+      if (e.getException() instanceof ValidationException) {
+        throw (ValidationException) e.getException();
+      } else {
+        throw new ValidationException(e);
+      }
+    } catch (IOException e) {
+      throw new ValidationException(e);
+    }
+       
+  }
+  
+  private void validateCss(InputStream is) throws ValidationException {
+    CSSValidatorSLXHTML cssValidator = new CSSValidatorSLXHTML();
+    // TODO: use the right locale
+    cssValidator.validate(is, Locale.getDefault(), "SLXHTML", 0);
+  }
+  
+  private class ValidationHandler extends DefaultHandler implements ContentHandler {
+    
+    private ValidatorHandler validatorHandler;
+    
+    private boolean insideStyle = false;
+    
+    private StringBuffer style = new StringBuffer();
+    
+    private ValidationHandler(ValidatorHandler contentHandler) {
+      this.validatorHandler = contentHandler;
+    }
+    
+    @Override
+    public void endDocument() throws SAXException {
+      validatorHandler.endDocument();
+    }
+
+    @Override
+    public void endPrefixMapping(String prefix) throws SAXException {
+      validatorHandler.endPrefixMapping(prefix);
+    }
+
+    @Override
+    public void ignorableWhitespace(char[] ch, int start, int length)
+        throws SAXException {
+      validatorHandler.ignorableWhitespace(ch, start, length);
+    }
+
+    @Override
+    public void processingInstruction(String target, String data)
+        throws SAXException {
+      validatorHandler.processingInstruction(target, data);
+    }
+
+    @Override
+    public void setDocumentLocator(Locator locator) {
+      validatorHandler.setDocumentLocator(locator);
+    }
+
+    @Override
+    public void skippedEntity(String name) throws SAXException {
+      validatorHandler.skippedEntity(name);
+    }
+
+    @Override
+    public void startDocument() throws SAXException {
+      validatorHandler.startDocument();
+    }
+
+    @Override
+    public void startPrefixMapping(String prefix, String uri)
+        throws SAXException {
+      validatorHandler.startPrefixMapping(prefix, uri);
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String name,
+        Attributes attributes) throws SAXException {
+      validatorHandler.startElement(uri, localName, name, attributes);
+      
+      System.out.println(uri + ":" + localName);
+      
+      if ("http://www.w3.org/1999/xhtml".equals(uri) &&
+          "style".equals(localName)) {
+        insideStyle = true;
+      }
+    }
+
+    @Override
+    public void characters(char[] ch, int start, int length)
+        throws SAXException {
+      validatorHandler.characters(ch, start, length);
+      
+      if (insideStyle) {
+        style.append(ch, start, length);
+      }
+      
+    }
+
+    @Override
+    public void endElement(String uri, String localName, String name)
+        throws SAXException {
+      validatorHandler.endElement(uri, localName, name);
+      
+      if (insideStyle) {
+        insideStyle = false;
+        try {
+          validateCss(new ByteArrayInputStream(style.toString().getBytes(Charset.forName("UTF-8"))));
+        } catch (ValidationException e) {
+          throw new SAXException(e);
+        }
+      }
+    }
+
+  }
+  
+  
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CSSValidatorSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CSSValidatorSLXHTML.java
new file mode 100644
index 00000000..7abe4741
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CSSValidatorSLXHTML.java
@@ -0,0 +1,95 @@
+/*
+* 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.slxhtml.css;
+
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Locale;
+
+import org.w3c.css.css.CssParser;
+import org.w3c.css.css.StyleSheet;
+import org.w3c.css.css.StyleSheetParser;
+import org.w3c.css.parser.CssError;
+import org.w3c.css.parser.Errors;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.Util;
+import org.w3c.css.util.Warning;
+import org.w3c.css.util.Warnings;
+
+import at.gv.egiz.bku.viewer.ValidationException;
+
+public class CSSValidatorSLXHTML {
+  
+  public void validate(InputStream input, Locale locale, String title, int lineno) throws ValidationException {
+    
+    // disable imports
+    Util.importSecurity = true;
+    
+    CssParser cssParser = new StyleSheetParser();
+    
+    ApplContext ac = new ApplContext(locale.getLanguage());
+    ac.setCssVersion("slxhtml");
+    ac.setMedium("all");
+    
+    URL url;
+    try {
+      url = new URL("http://test.xyz");
+    } catch (MalformedURLException e) {
+      throw new RuntimeException(e);
+    }
+    
+    cssParser.parseStyleElement(ac, input, title, "all", url, lineno);
+    
+    StyleSheet styleSheet = cssParser.getStyleSheet();
+
+    // find conflicts
+    styleSheet.findConflicts(ac);
+
+    boolean valid = true;
+    StringBuilder sb = new StringBuilder().append("CSS:");
+
+    // look for errors
+    Errors errors = styleSheet.getErrors();
+    if (errors.getErrorCount() != 0) {
+      valid = false;
+      CssError[] cssErrors = errors.getErrors();
+      for (CssError cssError : cssErrors) {
+        Exception exception = cssError.getException();
+        sb.append(" ");
+        sb.append(exception.getMessage());
+      }
+    }
+
+    // look for warnings
+    Warnings warnings = styleSheet.getWarnings();
+    if (warnings.getWarningCount() != 0) {
+      valid = false;
+      Warning[] cssWarnings = warnings.getWarnings();
+      for (Warning warning : cssWarnings) {
+        sb.append(" ");
+        sb.append(warning.getWarningMessage());
+      }
+    }
+    
+    if (!valid) {
+      throw new ValidationException(sb.toString());
+    }
+    
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBackgroundColorSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBackgroundColorSLXHTML.java
new file mode 100644
index 00000000..53191d17
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBackgroundColorSLXHTML.java
@@ -0,0 +1,57 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssBackgroundColorCSS2;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
+
+public class CssBackgroundColorSLXHTML extends CssBackgroundColorCSS2 {
+
+  public CssBackgroundColorSLXHTML() {
+  }
+
+  public CssBackgroundColorSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    // A Citizen Card Environment must support all the options for specifying a
+    // colour listed in [CSS 2], section 4.3.6 for a CSS property, if such an
+    // option is available for this property according to [CSS 2].
+
+    // The exceptions are the system colours (cf. [CSS 2], section 18.2); these
+    // must not be used in an instance document so as to prevent dependencies on
+    // the system environment. Otherwise the instance document must be rejected
+    // by the Citizen Card Environment.
+    
+    CssValue color = getColor();
+    if (!isSoftlyInherited() && color != null) {
+      if (CssColorSLXHTML.isDisallowedColor(color)) {
+        throw new SLXHTMLInvalidParamException("color", color, getPropertyName(), ac);
+      }
+    }
+
+  }
+
+  public CssBackgroundColorSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    super(ac, expression);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBackgroundSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBackgroundSLXHTML.java
new file mode 100644
index 00000000..724c8c6a
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBackgroundSLXHTML.java
@@ -0,0 +1,93 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssBackgroundCSS2;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
+
+/**
+ * @author mcentner
+ *
+ */
+public class CssBackgroundSLXHTML extends CssBackgroundCSS2 {
+
+  public CssBackgroundSLXHTML() {
+  }
+
+  public CssBackgroundSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+    
+    // A Citizen Card Environment must support all the options for specifying a
+    // colour listed in [CSS 2], section 4.3.6 for a CSS property, if such an
+    // option is available for this property according to [CSS 2].
+
+    // The exceptions are the system colours (cf. [CSS 2], section 18.2); these
+    // must not be used in an instance document so as to prevent dependencies on
+    // the system environment. Otherwise the instance document must be rejected
+    // by the Citizen Card Environment.
+    
+    CssValue color = getColor();
+    if (!isSoftlyInherited() && color != null) {
+      if (CssColorSLXHTML.isDisallowedColor(color)) {
+        throw new SLXHTMLInvalidParamException("color", color, getPropertyName(), ac);
+      }
+    }
+
+    // The properties for selecting and controlling an image as background
+    // (background-image, background-repeat, background-position,
+    // background-attachment; cf. [CSS 2], section 14.2.1) must not be contained
+    // in an instance document to prevent content from overlapping. Otherwise
+    // the instance document must be rejected by the Citizen Card Environment.
+    //
+    // The property for the shorthand version of the background properties
+    // (background) should be supported by a Citizen Card Environment. The
+    // recommended values result from the explanations for the background-color
+    // property above (cf. [CSS 2], section 14.2.1). If the property contains
+    // values for selecting and controlling an image as background, the instance
+    // document must be rejected by the Citizen Card Environment.
+    
+    if (getImage() != null) {
+      throw new SLXHTMLInvalidParamException("background", "background-image", ac);
+    }
+    
+    if (getRepeat() != null) {
+      throw new SLXHTMLInvalidParamException("background", "background-repeat", ac);
+    }
+    
+    if (getPosition() != null) {
+      throw new SLXHTMLInvalidParamException("background", "background-position", ac);
+    }
+
+    if (getAttachment() != null) {
+      throw new SLXHTMLInvalidParamException("background", "background-attachment", ac);
+    }
+    
+  }
+
+  public CssBackgroundSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderBottomColorSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderBottomColorSLXHTML.java
new file mode 100644
index 00000000..4f5798b0
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderBottomColorSLXHTML.java
@@ -0,0 +1,57 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssBorderBottomColorCSS2;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
+
+public class CssBorderBottomColorSLXHTML extends CssBorderBottomColorCSS2 {
+
+  public CssBorderBottomColorSLXHTML() {
+  }
+  
+  public CssBorderBottomColorSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+    
+    // A Citizen Card Environment must support all the options for specifying a
+    // colour listed in [CSS 2], section 4.3.6 for a CSS property, if such an
+    // option is available for this property according to [CSS 2].
+
+    // The exceptions are the system colours (cf. [CSS 2], section 18.2); these
+    // must not be used in an instance document so as to prevent dependencies on
+    // the system environment. Otherwise the instance document must be rejected
+    // by the Citizen Card Environment.
+    
+    CssValue color = getColor();
+    if (!isSoftlyInherited() && color != null) {
+      if (CssColorSLXHTML.isDisallowedColor(color)) {
+        throw new SLXHTMLInvalidParamException("color", color, getPropertyName(), ac);
+      }
+    }
+
+  }
+
+  public CssBorderBottomColorSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderColorSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderColorSLXHTML.java
new file mode 100644
index 00000000..3f5a7319
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderColorSLXHTML.java
@@ -0,0 +1,81 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssBorderBottomColorCSS2;
+import org.w3c.css.properties.css1.CssBorderColorCSS2;
+import org.w3c.css.properties.css1.CssBorderLeftColorCSS2;
+import org.w3c.css.properties.css1.CssBorderRightColorCSS2;
+import org.w3c.css.properties.css1.CssBorderTopColorCSS2;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+public class CssBorderColorSLXHTML extends CssBorderColorCSS2 {
+
+  public CssBorderColorSLXHTML() {
+  }
+
+  public CssBorderColorSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+    
+    // A Citizen Card Environment must support all the options for specifying a
+    // colour listed in [CSS 2], section 4.3.6 for a CSS property, if such an
+    // option is available for this property according to [CSS 2].
+
+    // The exceptions are the system colours (cf. [CSS 2], section 18.2); these
+    // must not be used in an instance document so as to prevent dependencies on
+    // the system environment. Otherwise the instance document must be rejected
+    // by the Citizen Card Environment.
+    
+    CssBorderTopColorCSS2 top = getTop();
+    if (!isSoftlyInherited() && top != null) {
+      if (CssColorSLXHTML.isDisallowedColor(top.getColor())) {
+        throw new SLXHTMLInvalidParamException("color", top.getColor(), getPropertyName(), ac);
+      }
+    }
+
+    CssBorderLeftColorCSS2 left = getLeft();
+    if (!isSoftlyInherited() && left != null) {
+      if (CssColorSLXHTML.isDisallowedColor(left.getColor())) {
+        throw new SLXHTMLInvalidParamException("color", left.getColor(), getPropertyName(), ac);
+      }
+    }
+
+    CssBorderRightColorCSS2 right = getRight();
+    if (!isSoftlyInherited() && right != null) {
+      if (CssColorSLXHTML.isDisallowedColor(right.getColor())) {
+        throw new SLXHTMLInvalidParamException("color", right.getColor(), getPropertyName(), ac);
+      }
+    }
+
+    CssBorderBottomColorCSS2 bottom = getBottom();
+    if (!isSoftlyInherited() && bottom != null) {
+      if (CssColorSLXHTML.isDisallowedColor(bottom.getColor())) {
+        throw new SLXHTMLInvalidParamException("color", bottom.getColor(), getPropertyName(), ac);
+      }
+    }
+    
+  }
+
+  public CssBorderColorSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderLeftColorSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderLeftColorSLXHTML.java
new file mode 100644
index 00000000..e2378e99
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderLeftColorSLXHTML.java
@@ -0,0 +1,57 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssBorderLeftColorCSS2;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
+
+public class CssBorderLeftColorSLXHTML extends CssBorderLeftColorCSS2 {
+
+  public CssBorderLeftColorSLXHTML() {
+  }
+  
+  public CssBorderLeftColorSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    // A Citizen Card Environment must support all the options for specifying a
+    // colour listed in [CSS 2], section 4.3.6 for a CSS property, if such an
+    // option is available for this property according to [CSS 2].
+
+    // The exceptions are the system colours (cf. [CSS 2], section 18.2); these
+    // must not be used in an instance document so as to prevent dependencies on
+    // the system environment. Otherwise the instance document must be rejected
+    // by the Citizen Card Environment.
+    
+    CssValue color = getColor();
+    if (!isSoftlyInherited() && color != null) {
+      if (CssColorSLXHTML.isDisallowedColor(color)) {
+        throw new SLXHTMLInvalidParamException("color", color, getPropertyName(), ac);
+      }
+    }
+
+  }
+
+  public CssBorderLeftColorSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderRightColorSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderRightColorSLXHTML.java
new file mode 100644
index 00000000..99d6bae5
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderRightColorSLXHTML.java
@@ -0,0 +1,57 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssBorderRightColorCSS2;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
+
+public class CssBorderRightColorSLXHTML extends CssBorderRightColorCSS2 {
+
+  public CssBorderRightColorSLXHTML() {
+  }
+
+  public CssBorderRightColorSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+    
+    // A Citizen Card Environment must support all the options for specifying a
+    // colour listed in [CSS 2], section 4.3.6 for a CSS property, if such an
+    // option is available for this property according to [CSS 2].
+
+    // The exceptions are the system colours (cf. [CSS 2], section 18.2); these
+    // must not be used in an instance document so as to prevent dependencies on
+    // the system environment. Otherwise the instance document must be rejected
+    // by the Citizen Card Environment.
+    
+    CssValue color = getColor();
+    if (!isSoftlyInherited() && color != null) {
+      if (CssColorSLXHTML.isDisallowedColor(color)) {
+        throw new SLXHTMLInvalidParamException("color", color, getPropertyName(), ac);
+      }
+    }
+
+  }
+
+  public CssBorderRightColorSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderSLXHTML.java
new file mode 100644
index 00000000..ac32670e
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderSLXHTML.java
@@ -0,0 +1,85 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssBorderCSS2;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
+
+public class CssBorderSLXHTML extends CssBorderCSS2 {
+
+  public CssBorderSLXHTML() {
+  }
+
+  public CssBorderSLXHTML(ApplContext ac, CssExpression value, boolean check)
+      throws InvalidParamException {
+    super(ac, value, check);
+    
+    // A Citizen Card Environment must support all the options for specifying a
+    // colour listed in [CSS 2], section 4.3.6 for a CSS property, if such an
+    // option is available for this property according to [CSS 2].
+
+    // The exceptions are the system colours (cf. [CSS 2], section 18.2); these
+    // must not be used in an instance document so as to prevent dependencies on
+    // the system environment. Otherwise the instance document must be rejected
+    // by the Citizen Card Environment.
+
+    if (getTop() != null) {
+      CssValue top = getTop().getColor();
+      if (!isSoftlyInherited() && top != null) {
+        if (CssColorSLXHTML.isDisallowedColor(top)) {
+          throw new SLXHTMLInvalidParamException("color", top, getPropertyName(), ac);
+        }
+      }
+    }
+
+    if (getLeft() != null) {
+      CssValue left = getLeft().getColor();
+      if (!isSoftlyInherited() && left != null) {
+        if (CssColorSLXHTML.isDisallowedColor(left)) {
+          throw new SLXHTMLInvalidParamException("color", left, getPropertyName(), ac);
+        }
+      }
+    }
+     
+    if (getRight() != null) {
+      CssValue right = getRight().getColor();
+      if (!isSoftlyInherited() && right != null) {
+        if (CssColorSLXHTML.isDisallowedColor(right)) {
+          throw new SLXHTMLInvalidParamException("color", right, getPropertyName(), ac);
+        }
+      }
+    }
+
+    if (getBottom() != null) {
+      CssValue bottom = getBottom().getColor();
+      if (!isSoftlyInherited() && bottom != null) {
+        if (CssColorSLXHTML.isDisallowedColor(bottom)) {
+          throw new SLXHTMLInvalidParamException("color", bottom, getPropertyName(), ac);
+        }
+      }
+    }
+  }
+
+  public CssBorderSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderTopColorSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderTopColorSLXHTML.java
new file mode 100644
index 00000000..42926479
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssBorderTopColorSLXHTML.java
@@ -0,0 +1,57 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssBorderTopColorCSS2;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
+
+public class CssBorderTopColorSLXHTML extends CssBorderTopColorCSS2 {
+
+  public CssBorderTopColorSLXHTML() {
+  }
+
+  public CssBorderTopColorSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    // A Citizen Card Environment must support all the options for specifying a
+    // colour listed in [CSS 2], section 4.3.6 for a CSS property, if such an
+    // option is available for this property according to [CSS 2].
+
+    // The exceptions are the system colours (cf. [CSS 2], section 18.2); these
+    // must not be used in an instance document so as to prevent dependencies on
+    // the system environment. Otherwise the instance document must be rejected
+    // by the Citizen Card Environment.
+    
+    CssValue color = getColor();
+    if (!isSoftlyInherited() && color != null) {
+      if (CssColorSLXHTML.isDisallowedColor(color)) {
+        throw new SLXHTMLInvalidParamException("color", color, getPropertyName(), ac);
+      }
+    }
+
+  }
+
+  public CssBorderTopColorSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssColorSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssColorSLXHTML.java
new file mode 100644
index 00000000..a640eb3a
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssColorSLXHTML.java
@@ -0,0 +1,99 @@
+/*
+* 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.slxhtml.css;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
+
+public class CssColorSLXHTML extends org.w3c.css.properties.css1.CssColorCSS2 {
+
+  private static Set<String> SLXHTML_DISSALLOWED_COLORS = new HashSet<String>();
+  
+  static {
+    
+    SLXHTML_DISSALLOWED_COLORS.add("activeborder");
+    SLXHTML_DISSALLOWED_COLORS.add("activecaption");
+    SLXHTML_DISSALLOWED_COLORS.add("appworkspace");
+    SLXHTML_DISSALLOWED_COLORS.add("background");
+    SLXHTML_DISSALLOWED_COLORS.add("buttonface");
+    SLXHTML_DISSALLOWED_COLORS.add("buttonhighlight");
+    SLXHTML_DISSALLOWED_COLORS.add("buttonshadow");
+    SLXHTML_DISSALLOWED_COLORS.add("buttontext");
+    SLXHTML_DISSALLOWED_COLORS.add("captiontext");
+    SLXHTML_DISSALLOWED_COLORS.add("graytext");
+    SLXHTML_DISSALLOWED_COLORS.add("highlight");
+    SLXHTML_DISSALLOWED_COLORS.add("highlighttext");
+    SLXHTML_DISSALLOWED_COLORS.add("inactiveborder");
+    SLXHTML_DISSALLOWED_COLORS.add("inactivecaption");
+    SLXHTML_DISSALLOWED_COLORS.add("inactivecaptiontext");
+    SLXHTML_DISSALLOWED_COLORS.add("infobackground");
+    SLXHTML_DISSALLOWED_COLORS.add("infotext");
+    SLXHTML_DISSALLOWED_COLORS.add("menu");
+    SLXHTML_DISSALLOWED_COLORS.add("menutext");
+    SLXHTML_DISSALLOWED_COLORS.add("scrollbar");
+    SLXHTML_DISSALLOWED_COLORS.add("threeddarkshadow");
+    SLXHTML_DISSALLOWED_COLORS.add("threedface");
+    SLXHTML_DISSALLOWED_COLORS.add("threedhighlight");
+    SLXHTML_DISSALLOWED_COLORS.add("threedlightshadow");
+    SLXHTML_DISSALLOWED_COLORS.add("threedshadow");
+    SLXHTML_DISSALLOWED_COLORS.add("window");
+    SLXHTML_DISSALLOWED_COLORS.add("windowframe");
+    SLXHTML_DISSALLOWED_COLORS.add("windowtext");
+    
+  }
+  
+  public static boolean isDisallowedColor(CssValue cssValue) {
+    return SLXHTML_DISSALLOWED_COLORS.contains(cssValue.toString().toLowerCase());
+  }
+  
+  public CssColorSLXHTML() {
+  }
+
+  public CssColorSLXHTML(ApplContext ac, CssExpression expression, boolean check)
+      throws InvalidParamException {
+    
+    super(ac, expression, check);
+
+    // A Citizen Card Environment must support all the options for specifying a
+    // colour listed in [CSS 2], section 4.3.6 for a CSS property, if such an
+    // option is available for this property according to [CSS 2].
+
+    // The exceptions are the system colours (cf. [CSS 2], section 18.2); these
+    // must not be used in an instance document so as to prevent dependencies on
+    // the system environment. Otherwise the instance document must be rejected
+    // by the Citizen Card Environment.
+
+    CssValue color = getColor();
+    if (!isSoftlyInherited() && color != null) {
+      if (CssColorSLXHTML.isDisallowedColor(color)) {
+        throw new SLXHTMLInvalidParamException("color", color, getPropertyName(), ac);
+      }
+    }
+    
+  }
+
+  public CssColorSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssFontSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssFontSLXHTML.java
new file mode 100644
index 00000000..8e5298ec
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssFontSLXHTML.java
@@ -0,0 +1,59 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssFontCSS2;
+import org.w3c.css.properties.css1.CssFontConstantCSS2;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
+
+public class CssFontSLXHTML extends CssFontCSS2 {
+
+  public CssFontSLXHTML() {
+  }
+
+  public CssFontSLXHTML(ApplContext ac, CssExpression expression, boolean check)
+      throws InvalidParamException {
+    super(ac, checkExpression(expression, ac), check);
+  }
+
+  public CssFontSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+  protected static CssExpression checkExpression(CssExpression expression,
+      ApplContext ac) throws InvalidParamException {
+    
+    CssValue value = expression.getValue();
+    
+    if (value instanceof CssIdent) {
+      for (String font : CssFontConstantCSS2.FONT) {
+        if (font.equalsIgnoreCase(value.toString())) {
+          throw new SLXHTMLInvalidParamException("font", value.toString(), ac);
+        }
+      }
+    }
+    
+    return expression;
+    
+  }
+  
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssLetterSpacingSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssLetterSpacingSLXHTML.java
new file mode 100644
index 00000000..326a731f
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssLetterSpacingSLXHTML.java
@@ -0,0 +1,54 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssLetterSpacing;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssLength;
+import org.w3c.css.values.CssNumber;
+
+public class CssLetterSpacingSLXHTML extends CssLetterSpacing {
+
+  public CssLetterSpacingSLXHTML() {
+  }
+
+  public CssLetterSpacingSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    Object value = get();
+    if (value instanceof CssLength) {
+      Object length = ((CssLength) value).get();
+      if (length instanceof Float && ((Float) length).floatValue() < 0) {
+        throw new SLXHTMLInvalidParamException("spacing", length, getPropertyName(), ac);
+      }
+    } else if (value instanceof CssNumber) {
+      if (((CssNumber) value).getValue() < 0) {
+        throw new SLXHTMLInvalidParamException("spacing", value, getPropertyName(), ac);
+      }
+    }
+  
+  }
+
+  public CssLetterSpacingSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginBottomSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginBottomSLXHTML.java
new file mode 100644
index 00000000..cac97d06
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginBottomSLXHTML.java
@@ -0,0 +1,60 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssMarginBottom;
+import org.w3c.css.properties.css1.CssMarginSide;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+public class CssMarginBottomSLXHTML extends CssMarginBottom {
+
+  public CssMarginBottomSLXHTML() {
+  }
+
+  public CssMarginBottomSLXHTML(CssMarginSide another) {
+    super(another);
+  }
+
+  public CssMarginBottomSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+  public CssMarginBottomSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    // The margin-top, margin-bottom, margin-left and margin-right properties
+    // must be supported by a Citizen Card Environment. Values specified as
+    // percentages (cf. section 3.5.1.2) should be supported.
+
+    // The margin property may be supported by a Citizen Card Environment.
+
+    // An instance document must not contain a negative value in the properties
+    // mentioned above. Otherwise it must be rejected by the Citizen Card
+    // Environment.
+
+    if (CssMarginSLXHTML.isDisallowedMargin(getValue())) {
+      throw new SLXHTMLInvalidParamException("margin", getValue(),
+          getPropertyName(), ac);
+    }
+
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginLeftSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginLeftSLXHTML.java
new file mode 100644
index 00000000..c456af43
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginLeftSLXHTML.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.bku.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssMarginLeft;
+import org.w3c.css.properties.css1.CssMarginSide;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+public class CssMarginLeftSLXHTML extends CssMarginLeft {
+
+  public CssMarginLeftSLXHTML() {
+  }
+
+  public CssMarginLeftSLXHTML(CssMarginSide another) {
+    super(another);
+  }
+
+  public CssMarginLeftSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+  public CssMarginLeftSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    // TODO Auto-generated constructor stub
+    // The margin-top, margin-bottom, margin-left and margin-right properties
+    // must be supported by a Citizen Card Environment. Values specified as
+    // percentages (cf. section 3.5.1.2) should be supported.
+
+    // The margin property may be supported by a Citizen Card Environment.
+
+    // An instance document must not contain a negative value in the properties
+    // mentioned above. Otherwise it must be rejected by the Citizen Card
+    // Environment.
+
+    if (CssMarginSLXHTML.isDisallowedMargin(getValue())) {
+      throw new SLXHTMLInvalidParamException("margin", getValue(),
+          getPropertyName(), ac);
+    }
+
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginRightSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginRightSLXHTML.java
new file mode 100644
index 00000000..7f16830d
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginRightSLXHTML.java
@@ -0,0 +1,60 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssMarginRight;
+import org.w3c.css.properties.css1.CssMarginSide;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+public class CssMarginRightSLXHTML extends CssMarginRight {
+
+  public CssMarginRightSLXHTML() {
+  }
+
+  public CssMarginRightSLXHTML(CssMarginSide another) {
+    super(another);
+  }
+
+  public CssMarginRightSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+  public CssMarginRightSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    // The margin-top, margin-bottom, margin-left and margin-right properties
+    // must be supported by a Citizen Card Environment. Values specified as
+    // percentages (cf. section 3.5.1.2) should be supported.
+
+    // The margin property may be supported by a Citizen Card Environment.
+
+    // An instance document must not contain a negative value in the properties
+    // mentioned above. Otherwise it must be rejected by the Citizen Card
+    // Environment.
+
+    if (CssMarginSLXHTML.isDisallowedMargin(getValue())) {
+      throw new SLXHTMLInvalidParamException("margin", getValue(),
+          getPropertyName(), ac);
+    }
+
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginSLXHTML.java
new file mode 100644
index 00000000..f478b96a
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginSLXHTML.java
@@ -0,0 +1,101 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssMargin;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssLength;
+import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssPercentage;
+import org.w3c.css.values.CssValue;
+
+public class CssMarginSLXHTML extends CssMargin {
+
+  public CssMarginSLXHTML() {
+  }
+
+  public CssMarginSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+    
+    if (getTop() != null) {
+      if (isDisallowedMargin(getTop().getValue())) {
+        throw new SLXHTMLInvalidParamException("margin", getTop().getValue(),
+            getPropertyName(), ac);
+      }
+    }
+    
+    if (getRight() != null) {
+      if (isDisallowedMargin(getRight().getValue())) {
+        throw new SLXHTMLInvalidParamException("margin", getRight().getValue(),
+            getPropertyName(), ac);
+      }
+    }
+
+    if (getLeft() != null) {
+      if (isDisallowedMargin(getLeft().getValue())) {
+        throw new SLXHTMLInvalidParamException("margin", getLeft().getValue(),
+            getPropertyName(), ac);
+      }
+    }
+
+    if (getBottom() != null) {
+      if (isDisallowedMargin(getBottom().getValue())) {
+        throw new SLXHTMLInvalidParamException("margin", getBottom().getValue(),
+            getPropertyName(), ac);
+      }
+    }
+
+  }
+
+  public CssMarginSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+  public static boolean isDisallowedMargin(CssValue margin) {
+    
+    // The margin-top, margin-bottom, margin-left and margin-right properties
+    // must be supported by a Citizen Card Environment. Values specified as
+    // percentages (cf. section 3.5.1.2) should be supported.
+
+    // The margin property may be supported by a Citizen Card Environment.
+
+    // An instance document must not contain a negative value in the properties
+    // mentioned above. Otherwise it must be rejected by the Citizen Card
+    // Environment.
+
+    if (margin instanceof CssLength) {
+      Object value = ((CssLength) margin).get();
+      if (value instanceof Float) {
+        return ((Float) value).floatValue() < 0;
+      }
+    } else if (margin instanceof CssPercentage) {
+      Object value = ((CssPercentage) margin).get();
+      if (value instanceof Float) {
+        return ((Float) value).floatValue() < 0;
+      }
+    } else if (margin instanceof CssNumber) {
+      return ((CssNumber) margin).getValue() < 0;
+    }
+    
+    return false;
+  }
+  
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginTopSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginTopSLXHTML.java
new file mode 100644
index 00000000..06b30c4f
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssMarginTopSLXHTML.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.bku.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssMarginSide;
+import org.w3c.css.properties.css1.CssMarginTop;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+public class CssMarginTopSLXHTML extends CssMarginTop {
+
+  public CssMarginTopSLXHTML() {
+  }
+
+  public CssMarginTopSLXHTML(CssMarginSide another) {
+    super(another);
+  }
+
+  public CssMarginTopSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  
+  }
+
+  public CssMarginTopSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    // The margin-top, margin-bottom, margin-left and margin-right properties
+    // must be supported by a Citizen Card Environment. Values specified as
+    // percentages (cf. section 3.5.1.2) should be supported.
+
+    // The margin property may be supported by a Citizen Card Environment.
+
+    // An instance document must not contain a negative value in the properties
+    // mentioned above. Otherwise it must be rejected by the Citizen Card
+    // Environment.
+
+    if (CssMarginSLXHTML.isDisallowedMargin(getValue())) {
+      throw new SLXHTMLInvalidParamException("margin", getValue(),
+          getPropertyName(), ac);
+    }
+
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingBottomSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingBottomSLXHTML.java
new file mode 100644
index 00000000..4bcb0065
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingBottomSLXHTML.java
@@ -0,0 +1,60 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssPaddingBottom;
+import org.w3c.css.properties.css1.CssPaddingSide;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+public class CssPaddingBottomSLXHTML extends CssPaddingBottom {
+
+  public CssPaddingBottomSLXHTML() {
+  }
+
+  public CssPaddingBottomSLXHTML(CssPaddingSide another) {
+    super(another);
+  }
+
+  public CssPaddingBottomSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    // The padding-top, padding-bottom, padding-left and padding-right
+    // properties must be supported by a Citizen Card Environment. Values
+    // specified as percentages (cf. section 3.5.1.2) should be supported.
+
+    // The padding property may be supported by a Citizen Card Environment.
+
+    // An instance document must not contain a negative value in the properties
+    // mentioned above. Otherwise it must be rejected by the Citizen Card
+    // Environment.
+
+    if (CssPaddingSLXHTML.isDisallowedValue(getValue())) {
+      throw new SLXHTMLInvalidParamException("padding", getValue(),
+          getPropertyName(), ac);
+    }
+
+  }
+
+  public CssPaddingBottomSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingLeftSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingLeftSLXHTML.java
new file mode 100644
index 00000000..350a5c15
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingLeftSLXHTML.java
@@ -0,0 +1,60 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssPaddingLeft;
+import org.w3c.css.properties.css1.CssPaddingSide;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+public class CssPaddingLeftSLXHTML extends CssPaddingLeft {
+
+  public CssPaddingLeftSLXHTML() {
+  }
+
+  public CssPaddingLeftSLXHTML(CssPaddingSide another) {
+    super(another);
+  }
+
+  public CssPaddingLeftSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    // The padding-top, padding-bottom, padding-left and padding-right
+    // properties must be supported by a Citizen Card Environment. Values
+    // specified as percentages (cf. section 3.5.1.2) should be supported.
+
+    // The padding property may be supported by a Citizen Card Environment.
+
+    // An instance document must not contain a negative value in the properties
+    // mentioned above. Otherwise it must be rejected by the Citizen Card
+    // Environment.
+
+    if (CssPaddingSLXHTML.isDisallowedValue(getValue())) {
+      throw new SLXHTMLInvalidParamException("padding", getValue(),
+          getPropertyName(), ac);
+    }
+
+  }
+
+  public CssPaddingLeftSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingRightSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingRightSLXHTML.java
new file mode 100644
index 00000000..d2d62748
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingRightSLXHTML.java
@@ -0,0 +1,60 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssPaddingRight;
+import org.w3c.css.properties.css1.CssPaddingSide;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+public class CssPaddingRightSLXHTML extends CssPaddingRight {
+
+  public CssPaddingRightSLXHTML() {
+  }
+
+  public CssPaddingRightSLXHTML(CssPaddingSide another) {
+    super(another);
+  }
+
+  public CssPaddingRightSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+
+    // The padding-top, padding-bottom, padding-left and padding-right
+    // properties must be supported by a Citizen Card Environment. Values
+    // specified as percentages (cf. section 3.5.1.2) should be supported.
+
+    // The padding property may be supported by a Citizen Card Environment.
+
+    // An instance document must not contain a negative value in the properties
+    // mentioned above. Otherwise it must be rejected by the Citizen Card
+    // Environment.
+
+    if (CssPaddingSLXHTML.isDisallowedValue(getValue())) {
+      throw new SLXHTMLInvalidParamException("padding", getValue(),
+          getPropertyName(), ac);
+    }
+
+  }
+
+  public CssPaddingRightSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingSLXHTML.java
new file mode 100644
index 00000000..57d7cf77
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingSLXHTML.java
@@ -0,0 +1,102 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssPadding;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssLength;
+import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssPercentage;
+import org.w3c.css.values.CssValue;
+
+public class CssPaddingSLXHTML extends CssPadding {
+
+  public CssPaddingSLXHTML() {
+  }
+
+  public CssPaddingSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+    
+    if (getTop() != null) {
+      if (isDisallowedValue(getTop().getValue())) {
+        throw new SLXHTMLInvalidParamException("padding", getTop().getValue(),
+            getPropertyName(), ac);
+      }
+    }
+    
+    if (getRight() != null) {
+      if (isDisallowedValue(getRight().getValue())) {
+        throw new SLXHTMLInvalidParamException("padding", getRight().getValue(),
+            getPropertyName(), ac);
+      }
+    }
+    
+    if (getLeft() != null) {
+      if (isDisallowedValue(getLeft().getValue())) {
+        throw new SLXHTMLInvalidParamException("padding", getLeft().getValue(),
+            getPropertyName(), ac);
+      }
+    }
+
+    if (getBottom() != null) {
+      if (isDisallowedValue(getBottom().getValue())) {
+        throw new SLXHTMLInvalidParamException("padding", getBottom().getValue(),
+            getPropertyName(), ac);
+      }
+    }
+
+  }
+
+  public CssPaddingSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+  public static boolean isDisallowedValue(CssValue padding) {
+
+    // The padding-top, padding-bottom, padding-left and padding-right
+    // properties must be supported by a Citizen Card Environment. Values
+    // specified as percentages (cf. section 3.5.1.2) should be supported.
+
+    // The padding property may be supported by a Citizen Card Environment.
+
+    // An instance document must not contain a negative value in the properties
+    // mentioned above. Otherwise it must be rejected by the Citizen Card
+    // Environment.
+    
+    if (padding instanceof CssLength) {
+      Object value = ((CssLength) padding).get();
+      if (value instanceof Float) {
+        return ((Float) value).floatValue() < 0;
+      }
+    } else if (padding instanceof CssPercentage) {
+      Object value = ((CssPercentage) padding).get();
+      if (value instanceof Float) {
+        return ((Float) value).floatValue() < 0;
+      }
+    } else if (padding instanceof CssNumber) {
+      return ((CssNumber) padding).getValue() < 0;
+    }
+    
+    return false;
+    
+  }
+  
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingTopSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingTopSLXHTML.java
new file mode 100644
index 00000000..bc113bfe
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssPaddingTopSLXHTML.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.bku.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssPaddingSide;
+import org.w3c.css.properties.css1.CssPaddingTop;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+public class CssPaddingTopSLXHTML extends CssPaddingTop {
+
+  public CssPaddingTopSLXHTML() {
+  }
+
+  public CssPaddingTopSLXHTML(CssPaddingSide another) {
+    super(another);
+  }
+
+  public CssPaddingTopSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+    
+    // The padding-top, padding-bottom, padding-left and padding-right
+    // properties must be supported by a Citizen Card Environment. Values
+    // specified as percentages (cf. section 3.5.1.2) should be supported.
+
+    // The padding property may be supported by a Citizen Card Environment.
+
+    // An instance document must not contain a negative value in the properties
+    // mentioned above. Otherwise it must be rejected by the Citizen Card
+    // Environment.
+
+    if (CssPaddingSLXHTML.isDisallowedValue(getValue())) {
+      throw new SLXHTMLInvalidParamException("padding", getValue(),
+          getPropertyName(), ac);
+    }
+    
+  }
+
+  public CssPaddingTopSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    super(ac, expression);
+    // TODO Auto-generated constructor stub
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssTextDecorationSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssTextDecorationSLXHTML.java
new file mode 100644
index 00000000..16b9780a
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssTextDecorationSLXHTML.java
@@ -0,0 +1,51 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssTextDecoration;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
+
+public class CssTextDecorationSLXHTML extends CssTextDecoration {
+
+  public CssTextDecorationSLXHTML() {
+  }
+
+  public CssTextDecorationSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+    
+    if (get() instanceof CssValue) {
+      if ("blink".equalsIgnoreCase(((CssValue) get()).toString())) {
+        throw new SLXHTMLInvalidParamException("text-decoration", "blink", ac);
+      }
+    } else if (get() instanceof String) {
+      if ("blink".equalsIgnoreCase((String) get())) {
+        throw new SLXHTMLInvalidParamException("text-decoration", "blink", ac);
+      }
+    }
+    
+  }
+
+  public CssTextDecorationSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssWordSpacingSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssWordSpacingSLXHTML.java
new file mode 100644
index 00000000..a497f4e3
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/CssWordSpacingSLXHTML.java
@@ -0,0 +1,54 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css1.CssWordSpacing;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssLength;
+import org.w3c.css.values.CssNumber;
+
+public class CssWordSpacingSLXHTML extends CssWordSpacing {
+
+  public CssWordSpacingSLXHTML() {
+  }
+
+  public CssWordSpacingSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+    
+    Object value = get();
+    if (value instanceof CssLength) {
+      Object length = ((CssLength) value).get();
+      if (length instanceof Float && ((Float) length).floatValue() < 0) {
+        throw new SLXHTMLInvalidParamException("spacing", length, getPropertyName(), ac);
+      }
+    } else if (value instanceof CssNumber) {
+      if (((CssNumber) value).getValue() < 0) {
+        throw new SLXHTMLInvalidParamException("spacing", value, getPropertyName(), ac);
+      }
+    }
+    
+  }
+
+  public CssWordSpacingSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/SLXHTMLInvalidParamException.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/SLXHTMLInvalidParamException.java
new file mode 100644
index 00000000..edac03f4
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/SLXHTMLInvalidParamException.java
@@ -0,0 +1,71 @@
+/*
+* 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.slxhtml.css;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.w3c.css.util.ApplContext;
+
+public class SLXHTMLInvalidParamException extends
+    org.w3c.css.util.InvalidParamException {
+
+  private static final long serialVersionUID = 1L;
+  
+  protected String message;
+  
+  public SLXHTMLInvalidParamException() {
+  }
+
+  public SLXHTMLInvalidParamException(String error, ApplContext ac) {
+    setMessage(error, null, ac);
+  }
+
+  public SLXHTMLInvalidParamException(String error, Object message, ApplContext ac) {
+    setMessage(error, new Object[] {message}, ac);
+  }
+
+  public SLXHTMLInvalidParamException(String error, Object message1, Object message2,
+      ApplContext ac) {
+    setMessage(error, new Object[] {message1, message2}, ac);
+  }
+
+  @Override
+  public String getMessage() {
+    return getLocalizedMessage();
+  }
+
+  @Override
+  public String getLocalizedMessage() {
+    return message;
+  }
+
+  protected void setMessage(String error, Object[] arguments, ApplContext ac) {
+    Locale locale = new Locale(ac.getContentLanguage());
+    ResourceBundle bundle = ResourceBundle.getBundle("at/gv/egiz/bku/slxhtml/css/Messages", locale);
+    String pattern;
+    try {
+      pattern = bundle.getString(error);
+    } catch (MissingResourceException e) {
+      pattern = "Can't find error message for : " + error;
+    }
+    message = MessageFormat.format(pattern, arguments);
+  }
+  
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/SLXHTMLStyle.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/SLXHTMLStyle.java
new file mode 100644
index 00000000..99448ec4
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/SLXHTMLStyle.java
@@ -0,0 +1,22 @@
+//
+// $Id: Css2Style.java,v 1.2 2005-09-08 12:24:01 ylafon Exp $
+// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
+//
+// (c) COPYRIGHT MIT and INRIA, 1997.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package at.gv.egiz.bku.slxhtml.css;
+
+import org.w3c.css.properties.aural.ACssStyle;
+import org.w3c.css.parser.CssPrinterStyle;
+
+/**
+ * @version $Revision: 1.2 $
+ */
+public class SLXHTMLStyle extends ACssStyle {
+
+  public void print(CssPrinterStyle printer) {
+    super.print(printer);
+  }
+
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/TableLayoutSLXHTML.java b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/TableLayoutSLXHTML.java
new file mode 100644
index 00000000..50f30cce
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/slxhtml/css/TableLayoutSLXHTML.java
@@ -0,0 +1,45 @@
+/*
+* 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.slxhtml.css;
+
+import org.w3c.css.properties.css2.table.TableLayout;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+
+public class TableLayoutSLXHTML extends TableLayout {
+
+  public TableLayoutSLXHTML() {
+  }
+
+  public TableLayoutSLXHTML(ApplContext ac, CssExpression expression,
+      boolean check) throws InvalidParamException {
+    super(ac, expression, check);
+    
+    if (new CssIdent("fixed").equals(get())) {
+      throw new SLXHTMLInvalidParamException("table-layout", "fixed", getPropertyName(), ac);
+    }
+    
+  }
+
+  public TableLayoutSLXHTML(ApplContext ac, CssExpression expression)
+      throws InvalidParamException {
+    this(ac, expression, false);
+  }
+
+}
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/text/TextValidator.java b/BKUViewer/src/main/java/at/gv/egiz/bku/text/TextValidator.java
new file mode 100644
index 00000000..5108140d
--- /dev/null
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/text/TextValidator.java
@@ -0,0 +1,32 @@
+/*
+* 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.text;
+
+import java.io.InputStream;
+
+import at.gv.egiz.bku.viewer.ValidationException;
+import at.gv.egiz.bku.viewer.Validator;
+
+public class TextValidator implements Validator {
+
+  @Override
+  public void validate(InputStream is, String charset)
+      throws ValidationException {
+    // TODO: implement character validation
+  }
+
+}
diff --git a/BKUViewer/src/main/resources/META-INF/services/at.gv.egiz.bku.viewer.Validator b/BKUViewer/src/main/resources/META-INF/services/at.gv.egiz.bku.viewer.Validator
new file mode 100644
index 00000000..0004949b
--- /dev/null
+++ b/BKUViewer/src/main/resources/META-INF/services/at.gv.egiz.bku.viewer.Validator
@@ -0,0 +1,2 @@
+application/xhtml+xml at.gv.egiz.bku.slxhtml.SLXHTMLValidator
+text/plain at.gv.egiz.bku.text.TextValidator
\ No newline at end of file
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-model-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-model-1.xsd
new file mode 100644
index 00000000..89e91faa
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-model-1.xsd
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified"
+  xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/">
+  <xs:import
+    namespace="http://www.w3.org/1999/xhtml/datatypes/"
+    schemaLocation="xhtml-datatypes-1.xsd"/>
+  <xs:annotation>
+    <xs:documentation>
+      This is the XML Schema module of common content models for SLXHTML.
+      SLXHTML is a profile of XHTML (see W3C copyright notice below).
+
+      @author: Gregor Karlinger gregor.karlinger@cio.gv.at
+      $Id: slxhtml-model-1.xsd,v 1.4 2004/05/12 11:35:31 karlinger Exp $
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+  <xs:annotation>
+    <xs:documentation> 
+      XHTML Document Model 
+      This module describes the groupings of elements/attributes 
+      that make up common content models for XHTML elements. 
+      XHTML has following basic content models: 
+      xhtml.Inline.mix; character-level elements
+      xhtml.Block.mix; block-like elements, e.g., paragraphs and lists
+      xhtml.Flow.mix; any block or inline elements 
+      xhtml.HeadOpts.mix; Head Elements 
+      xhtml.InlinePre.mix; Special class for pre content model 
+      xhtml.InlineNoAnchor.mix; Content model for Anchor 
+      
+      Any groups declared in this module may be used to create 
+      element content models, but the above are considered 'global' 
+      (insofar as that term applies here). XHTML has the
+      following Attribute Groups 
+      xhtml.Core.extra.attrib 
+      xhtml.I18n.extra.attrib
+      xhtml.Common.extra 
+      
+      The above attribute Groups are considered Global 
+    </xs:documentation>
+  </xs:annotation>  
+    
+  <xs:attributeGroup name="xhtml.I18n.extra.attrib">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: attributeGroup "dir.attrib" removed.
+      </xs:documentation>
+    </xs:annotation>  
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="xhtml.Common.extra">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: attributeGroup "style.attrib" removed.
+       </xs:documentation>
+    </xs:annotation>      
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="xhtml.Core.extra.attrib">
+  </xs:attributeGroup>
+
+  <xs:attributeGroup
+    name="xhtml.Global.core.extra.attrib">
+    <xs:annotation>
+      <xs:documentation> Extended Global Core Attributes </xs:documentation>
+    </xs:annotation>
+  </xs:attributeGroup>
+  <xs:attributeGroup
+    name="xhtml.Global.I18n.extra.attrib">
+    <xs:annotation>
+      <xs:documentation> Extended Global I18n attributes </xs:documentation>
+    </xs:annotation>
+  </xs:attributeGroup>
+  <xs:attributeGroup
+    name="xhtml.Global.Common.extra">
+    <xs:annotation>
+      <xs:documentation> Extended Global Common Attributes </xs:documentation>
+    </xs:annotation>
+  </xs:attributeGroup>
+  
+  <xs:group name="xhtml.HeadOpts.mix">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: elements "script", "meta", "link", "object" removed.
+       </xs:documentation>
+    </xs:annotation>      
+    <xs:choice>
+      <xs:element
+        name="style"
+        type="xhtml.style.type"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group
+    name="xhtml.head.content">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: Only a single instance of element "style" is 
+        allowed apart from the obligatory "title" element.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+        <xs:element
+          name="title"
+          type="xhtml.title.type"/>
+        <xs:group
+          ref="xhtml.HeadOpts.mix"/>
+    </xs:sequence>
+  </xs:group>
+  <!--
+    ins and del are used to denote editing changes
+  -->
+  <xs:group name="xhtml.Edit.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: elements "ins", "del" removed.
+       </xs:documentation>
+    </xs:annotation>      
+    <xs:choice/>
+  </xs:group>
+  <!--
+    script and noscript are used to contain scripts
+    and alternative content
+  -->
+  <xs:group name="xhtml.Script.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: elements "script", "noscript" removed.
+       </xs:documentation>
+    </xs:annotation>      
+    <xs:choice/>
+  </xs:group>
+  <xs:group name="xhtml.Misc.extra">
+    <xs:sequence/>
+  </xs:group>
+  <!--
+    These elements are neither block nor inline, and can
+    essentially be used anywhere in the document body.
+  -->
+  <xs:group
+    name="xhtml.Misc.class">
+    <xs:choice>
+      <xs:group
+        ref="xhtml.Edit.class"/>
+      <xs:group
+        ref="xhtml.Script.class"/>
+      <xs:group
+        ref="xhtml.Misc.extra"/>
+    </xs:choice>
+  </xs:group>
+  <!-- Inline Elements -->
+  <xs:group
+    name="xhtml.InlStruct.class">
+    <xs:choice>
+      <xs:element
+        name="br"
+        type="xhtml.br.type"/>
+      <xs:element
+        name="span"
+        type="xhtml.span.type"/>
+    </xs:choice>
+  </xs:group>
+  <xs:group
+    name="xhtml.InlPhras.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: elements "dfn", "samp", "kbd", "var", "q" , "abbr" and
+        "acronym" removed.
+      </xs:documentation>
+    </xs:annotation>      
+    <xs:choice>
+      <xs:element
+        name="em"
+        type="xhtml.em.type"/>
+      <xs:element
+        name="strong"
+        type="xhtml.strong.type"/>
+      <xs:element
+        name="code"
+        type="xhtml.code.type"/>
+      <xs:element
+        name="cite"
+        type="xhtml.cite.type"/>
+    </xs:choice>
+  </xs:group>
+  <xs:group
+    name="xhtml.InlPres.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: elements "tt", "i", "b", "big", "small", "sub", "sup" removed.
+      </xs:documentation>
+    </xs:annotation>      
+    <xs:sequence/>
+  </xs:group>
+  <xs:group name="xhtml.I18n.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: element "bdo" removed.
+       </xs:documentation>
+    </xs:annotation>      
+    <xs:sequence/>
+  </xs:group>
+  <xs:group name="xhtml.Anchor.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: element "a" removed.
+       </xs:documentation>
+    </xs:annotation>      
+    <xs:sequence/>
+  </xs:group>
+  <xs:group
+    name="xhtml.InlSpecial.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: elements "map", "object" removed.
+      </xs:documentation>
+    </xs:annotation>      
+    <xs:choice>
+      <xs:element
+        name="img"
+        type="xhtml.img.type"/>
+    </xs:choice>
+  </xs:group>
+  <xs:group name="xhtml.InlForm.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: elements "input", "select", "textara", "lable", "button" removed.
+       </xs:documentation>
+    </xs:annotation>      
+    <xs:sequence/>
+  </xs:group>
+  <xs:group
+    name="xhtml.Inline.extra">
+    <xs:sequence/>
+  </xs:group>
+  <xs:group name="xhtml.Ruby.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: element "ruby" removed.
+       </xs:documentation>
+    </xs:annotation>      
+    <xs:sequence/>
+  </xs:group>
+
+  <xs:group
+    name="xhtml.Inline.class">
+    <xs:choice>
+      <xs:group
+        ref="xhtml.InlStruct.class"/>
+      <xs:group
+        ref="xhtml.InlPhras.class"/>
+      <xs:group
+        ref="xhtml.InlPres.class"/>
+      <xs:group
+        ref="xhtml.I18n.class"/>
+      <xs:group
+        ref="xhtml.Anchor.class"/>
+      <xs:group
+        ref="xhtml.InlSpecial.class"/>
+      <xs:group
+        ref="xhtml.InlForm.class"/>
+      <xs:group
+        ref="xhtml.Ruby.class"/>
+      <xs:group
+        ref="xhtml.Inline.extra"/>
+    </xs:choice>
+  </xs:group>
+  <xs:group
+    name="xhtml.InlinePre.mix">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: elements "tt", "i", "b", "script", "map" removed.
+      </xs:documentation>
+    </xs:annotation>      
+    <xs:choice>
+      <xs:group
+        ref="xhtml.InlStruct.class"/>
+      <xs:group
+        ref="xhtml.InlPhras.class"/>
+      <xs:group
+        ref="xhtml.I18n.class"/>
+      <xs:group
+        ref="xhtml.Anchor.class"/>
+      <xs:group
+        ref="xhtml.Inline.extra"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group
+    name="xhtml.Inline.mix">
+    <xs:choice>
+      <xs:group
+        ref="xhtml.Inline.class"/>
+      <xs:group
+        ref="xhtml.Misc.class"/>
+    </xs:choice>
+  </xs:group>
+  
+  <xs:group
+    name="xhtml.Heading.class">
+    <xs:choice>
+      <xs:element
+        name="h1"
+        type="xhtml.h1.type"/>
+      <xs:element
+        name="h2"
+        type="xhtml.h2.type"/>
+      <xs:element
+        name="h3"
+        type="xhtml.h3.type"/>
+      <xs:element
+        name="h4"
+        type="xhtml.h4.type"/>
+      <xs:element
+        name="h5"
+        type="xhtml.h5.type"/>
+      <xs:element
+        name="h6"
+        type="xhtml.h6.type"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group
+    name="xhtml.List.class">
+    <xs:choice>
+      <xs:element
+        name="ul"
+        type="xhtml.ul.type"/>
+      <xs:element
+        name="ol"
+        type="xhtml.ol.type"/>
+      <xs:element
+        name="dl"
+        type="xhtml.dl.type"/>
+    </xs:choice>
+  </xs:group>
+  
+  <xs:group
+    name="xhtml.Table.class">
+    <xs:choice>
+      <xs:element
+        name="table"
+        type="xhtml.table.type"/>
+    </xs:choice>
+  </xs:group>
+  
+  <xs:group name="xhtml.Form.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: element "form" removed.
+       </xs:documentation>
+    </xs:annotation>      
+    <xs:choice/>
+  </xs:group>  
+
+  <xs:group name="xhtml.Fieldset.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: element "fieldset" removed.
+       </xs:documentation>
+    </xs:annotation>      
+    <xs:choice/>
+  </xs:group>  
+    
+  <xs:group
+    name="xhtml.BlkStruct.class">
+    <xs:choice>
+      <xs:element
+        name="p"
+        type="xhtml.p.type"/>
+      <xs:element
+        name="div"
+        type="xhtml.div.type"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group
+    name="xhtml.BlkPhras.class">
+    <xs:annotation>
+      <xs:documentation>
+        SLXHTML 1.2: element "address" removed.
+      </xs:documentation>
+    </xs:annotation>      
+    <xs:choice>
+      <xs:element
+        name="pre"
+        type="xhtml.pre.type"/>
+      <xs:element
+        name="blockquote"
+        type="xhtml.blockquote.type"/>
+    </xs:choice>
+  </xs:group>
+  <xs:group
+    name="xhtml.BlkPres.class">
+    <xs:sequence>
+      <xs:element
+        name="hr"
+        type="xhtml.hr.type"/>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:group
+    name="xhtml.BlkSpecial.class">
+    <xs:choice>
+      <xs:group
+        ref="xhtml.Table.class"/>
+      <xs:group
+      ref="xhtml.Form.class"/>
+      <xs:group
+        ref="xhtml.Fieldset.class"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group
+    name="xhtml.Block.extra">
+    <xs:sequence/>
+  </xs:group>
+
+  <xs:group
+    name="xhtml.Block.class">
+    <xs:choice>
+      <xs:group
+        ref="xhtml.BlkStruct.class"/>
+      <xs:group
+        ref="xhtml.BlkPhras.class"/>
+      <xs:group
+        ref="xhtml.BlkPres.class"/>
+      <xs:group
+        ref="xhtml.BlkSpecial.class"/>
+      <xs:group
+        ref="xhtml.Block.extra"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group
+    name="xhtml.Block.mix">
+    <xs:choice>
+      <xs:group
+        ref="xhtml.Heading.class"/>
+      <xs:group
+        ref="xhtml.List.class"/>
+      <xs:group
+        ref="xhtml.Block.class"/>
+      <xs:group
+        ref="xhtml.Misc.class"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group
+    name="xhtml.Flow.mix">
+    <xs:choice>
+      <xs:group
+        ref="xhtml.Heading.class"/>
+      <xs:group
+        ref="xhtml.List.class"/>
+      <xs:group
+        ref="xhtml.Block.class"/>
+      <xs:group
+        ref="xhtml.Inline.class"/>
+      <xs:group
+        ref="xhtml.Misc.class"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:element
+    name="html"
+    type="xhtml.html.type"/>
+</xs:schema>
\ No newline at end of file
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-modules-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-modules-1.xsd
new file mode 100644
index 00000000..016833be
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-modules-1.xsd
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified"
+           xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/">
+
+  <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+             schemaLocation="xhtml-datatypes-1.xsd" />
+  <xs:annotation>
+    <xs:documentation>
+      This XML Schema declares changes to the content models
+      of modules included in SLXHTML 1.2
+    </xs:documentation>
+    <xs:documentation source="xhtml-copyright-1.xsd"/>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+      Module Content Model Redefinitions 
+      
+      This schema describes the changes (Redefinitions) to the
+      content model of individual modules as they are instantiated as part of 
+      SLXHTML 1.2 Document
+    </xs:documentation>
+  </xs:annotation>
+
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- Changes to common attributes module -->
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+  <xs:redefine schemaLocation="xhtml-attribs-1.xsd">
+    
+    <xs:attributeGroup name="xhtml.I18n.attrib">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: Removed xml:lang attrib.
+        </xs:documentation>
+      </xs:annotation>         
+        <xs:attributeGroup ref="xhtml.I18n.extra.attrib"/>
+      </xs:attributeGroup>
+
+    <xs:attributeGroup name="xhtml.title">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: Removed title attrib.
+        </xs:documentation>
+      </xs:annotation>         
+    </xs:attributeGroup>
+
+  </xs:redefine>
+
+  <xs:include schemaLocation="xhtml-framework-1.xsd"/>  
+
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- Changes to block phrasal elements module -->
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  
+  <xs:redefine schemaLocation="xhtml-blkphras-1.xsd">
+    
+    <xs:attributeGroup name="xhtml.blockquote.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: Removed cite attrib.
+        </xs:documentation>
+      </xs:annotation>         
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    
+  </xs:redefine>  
+
+  <xs:include schemaLocation="xhtml-text-1.xsd"/>
+
+  <xs:include schemaLocation="xhtml-list-1.xsd"/>
+
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- Changes to Structural Module -->
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+  <xs:redefine schemaLocation="xhtml-struct-1.xsd">
+    
+    <xs:attributeGroup name="xhtml.version.attrib">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: Change value of the version attrib.
+        </xs:documentation>
+      </xs:annotation>         
+      <xs:attribute name="version" type="xh11d:FPI" fixed="-//www.buergerkarte.at//DOCUMENT SLXHTML 1.2//DE"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="xhtml.profile.attrib">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: Removed profile attrib.
+        </xs:documentation>
+      </xs:annotation>         
+    </xs:attributeGroup>
+  </xs:redefine>  
+  
+  <xs:include schemaLocation="xhtml-pres-1.xsd"/>
+
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- Changes to images module -->
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  
+  <xs:redefine schemaLocation="xhtml-image-1.xsd">
+    
+    <xs:attributeGroup name="xhtml.img.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: Removed attributes "longdesc", "height", "width".
+        </xs:documentation>
+      </xs:annotation>         
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+      <xs:attribute name="src" type="xh11d:URI" use="required"/>
+      <xs:attribute name="alt" type="xh11d:Text" use="required"/>
+    </xs:attributeGroup>
+    
+  </xs:redefine>  
+  
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- Changes to style module -->
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  
+  <xs:redefine schemaLocation="xhtml-style-1.xsd">
+    
+    <xs:attributeGroup name="xhtml.style.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: 
+          Removed attribute group "title"
+          Removed attribute "xml:space"
+          Fixed value of attribute "type"
+          Fixed value of attribute "media"
+        </xs:documentation>
+      </xs:annotation>         
+      <xs:attributeGroup ref="xhtml.I18n.attrib"/>
+      <xs:attribute name="type" type="xh11d:ContentType" use="required" fixed="text/css"/>
+      <xs:attribute name="media" type="xh11d:MediaDesc" fixed="screen"/>
+    </xs:attributeGroup>
+    
+  </xs:redefine>
+
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- Changes to table module -->
+  <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+  
+  <xs:redefine schemaLocation="xhtml-table-1.xsd">
+    
+    <xs:attributeGroup name="xhtml.td.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: 
+          Removed attribute groups "scope.attrib", "CellHAlign.attrib", "CellVAlign.attrib"
+          Removed attributes "abbr", "axis", "headers"
+        </xs:documentation>
+      </xs:annotation>         
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+      <xs:attribute name="rowspan" type="xh11d:Number" default="1"/>
+      <xs:attribute name="colspan" type="xh11d:Number" default="1"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="xhtml.th.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: 
+          Removed attribute groups "scope.attrib", "CellHAlign.attrib", "CellVAlign.attrib"
+          Removed attributes "abbr", "axis", "headers"
+        </xs:documentation>
+      </xs:annotation>
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+      <xs:attribute name="rowspan" type="xh11d:Number" default="1"/>
+      <xs:attribute name="colspan" type="xh11d:Number" default="1"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="xhtml.tr.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: 
+          Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
+        </xs:documentation>
+      </xs:annotation>
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="xhtml.col.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: 
+          Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
+          Removed attributes "span", "width"
+        </xs:documentation>
+      </xs:annotation>
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="xhtml.colgroup.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: 
+          Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
+          Removed attributes "span", "width"
+        </xs:documentation>
+      </xs:annotation>
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="xhtml.tbody.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: 
+          Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
+        </xs:documentation>
+      </xs:annotation>
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="xhtml.tfoot.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: 
+          Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
+        </xs:documentation>
+      </xs:annotation>
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="xhtml.thead.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: 
+          Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
+        </xs:documentation>
+      </xs:annotation>
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    
+    <xs:attributeGroup name="xhtml.table.attlist">
+      <xs:annotation>
+        <xs:documentation>
+          Redefinition by SLXHTML 1.2: 
+          Removed attribute groups "frame.attrib", "rules.attrib" 
+          Removed attributes "summary", "width", "border", "cellspacing", "cellpadding" 
+        </xs:documentation>
+      </xs:annotation>
+      <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+  </xs:redefine>
+
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml.xsd
new file mode 100644
index 00000000..555edb52
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml.xsd
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema" blockDefault="#all">
+  <xs:annotation>
+    <xs:documentation>
+      This is the XML Schema driver for SLXHTML 1.2.
+      SLXHTML is a profile of XHTML (see W3C copyright notice below).
+
+      @author: Gregor Karlinger gregor.karlinger@cio.gv.at
+      $Id: slxhtml.xsd,v 1.3 2004/05/12 11:35:31 karlinger Exp $
+    </xs:documentation>
+  </xs:annotation>
+  <xs:annotation>
+    <xs:documentation>  
+      This is the Schema Driver file for SLXHTML 1.2 
+      Document Type
+    
+     This schema includes    
+        + modules for SLXHTML 1.2 Document Type.
+        
+        + schema that defines all the named model for 
+          the SLXHTML 1.2 Document Type
+        
+        + schema that redefines the content model of 
+          individual elements defined in the Module 
+          implementations.
+            
+      SLXHTML 1.2 Document Type includes the following Modules
+      
+        XHTML Core modules 
+            +  text
+            +  lists
+            +  structure
+            
+        Other XHTML modules
+          +  Style
+          +  Image
+          +  Tables
+          
+    </xs:documentation>
+  </xs:annotation>
+  
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+    schemaLocation="xml.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        This import brings in the XML namespace attributes
+        The XML attributes are used by various modules
+      </xs:documentation>
+    </xs:annotation>
+  </xs:import>
+  
+  <xs:include schemaLocation="slxhtml-model-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+         This schema redefines the content model defined by 
+         the individual modules for SLXHTML 1.2 Document Type
+      </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+
+  <xs:include schemaLocation="slxhtml-modules-1.xsd">
+    <xs:annotation>
+      <xs:documentation>
+        Document Model module for the SLXHTML 1.2 Document Type.
+        This schema file defines all named models used by XHTML
+        Modularization Framework for SLXHTML 1.2 Document Type
+      </xs:documentation>
+    </xs:annotation>
+  </xs:include>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-attribs-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-attribs-1.xsd
new file mode 100644
index 00000000..df5ce483
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-attribs-1.xsd
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+
+    <xs:annotation>
+        <xs:documentation>
+      This is the XML Schema common attributes module for XHTML
+      $Id: xhtml-attribs-1.xsd,v 1.6 2005/09/26 23:37:47 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+        <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_commonatts"/>
+    </xs:annotation>
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+             schemaLocation="xml.xsd">
+        <xs:annotation>
+            <xs:documentation>
+        This import brings in the XML namespace attributes
+        The module itself does not provide the schemaLocation
+        and expects the driver schema to provide the
+        actual SchemaLocation.
+      </xs:documentation>
+        </xs:annotation>
+    </xs:import>
+    <xs:attributeGroup name="xhtml.id">
+        <xs:attribute name="id" type="xs:ID"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.class">
+        <xs:attribute name="class" type="xs:NMTOKENS"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.title">
+        <xs:attribute name="title" type="xs:string"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.Core.attrib">
+        <xs:attributeGroup ref="xhtml.id"/>
+        <xs:attributeGroup ref="xhtml.class"/>
+        <xs:attributeGroup ref="xhtml.title"/>
+        <xs:attributeGroup ref="xhtml.Core.extra.attrib"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.I18n.attrib">
+        <xs:attribute ref="xml:lang" />
+        <xs:attributeGroup ref="xhtml.I18n.extra.attrib"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.Common.attrib">
+        <xs:attributeGroup ref="xhtml.Core.attrib"/>
+        <xs:attributeGroup ref="xhtml.I18n.attrib"/>
+        <xs:attributeGroup ref="xhtml.Common.extra"/>
+    </xs:attributeGroup>
+    <!-- Global attributes -->
+    <xs:attribute name="id" type="xs:ID"/>
+    <xs:attribute name="class" type="xs:NMTOKENS"/>
+    <xs:attribute name="title" type="xs:string"/>
+    <xs:attributeGroup name="xhtml.Global.core.attrib">
+        <xs:attribute ref="id"/>
+        <xs:attribute ref="class"/>
+        <xs:attribute ref="title"/>
+        <xs:attributeGroup ref="xhtml.Global.core.extra.attrib" />
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.Global.i18n.attrib">
+        <xs:attribute ref="xml:lang" />
+        <xs:attributeGroup ref="xhtml.Global.I18n.extra.attrib"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.Global.common.attrib">
+        <xs:attributeGroup ref="xhtml.Global.core.attrib"/>
+        <xs:attributeGroup ref="xhtml.Global.i18n.attrib"/>
+        <xs:attributeGroup ref="xhtml.Global.Common.extra"/>
+    </xs:attributeGroup>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkphras-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkphras-1.xsd
new file mode 100644
index 00000000..da15e4c1
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkphras-1.xsd
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" schemaLocation="xhtml-datatypes-1.xsd" />
+
+    <xs:include schemaLocation="xhtml-attribs-1.xsd" />
+
+    <xs:annotation>
+        <xs:documentation>
+          This is the XML Schema Block Phrasal support module for XHTML
+          $Id: xhtml-blkphras-1.xsd,v 1.6 2006/09/11 10:27:50 ahby Exp $
+       </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>
+           Block Phrasal
+           This module declares the elements and their attributes used to
+           support block-level phrasal markup.
+           This is the XML Schema block phrasal elements module for XHTML
+
+            * address, blockquote, pre, h1, h2, h3, h4, h5, h6
+      </xs:documentation>
+        <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_textmodule"/>
+    </xs:annotation>
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+             schemaLocation="xml.xsd">
+        <xs:annotation>
+            <xs:documentation>
+          This import brings in the XML namespace attributes 
+          The module itself does not provide the schemaLocation
+          and expects the driver schema to provide the 
+          actual SchemaLocation.
+        </xs:documentation>
+        </xs:annotation>
+    </xs:import>
+    <!-- address -->
+    <xs:attributeGroup name="xhtml.address.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.address.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.address.type" mixed="true">
+        <xs:group ref="xhtml.address.content"/>
+        <xs:attributeGroup ref="xhtml.address.attlist"/>
+    </xs:complexType>
+    <!-- blockquote -->
+    <xs:attributeGroup name="xhtml.blockquote.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attribute name="cite" type="xh11d:URI"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.blockquote.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Block.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.blockquote.type">
+        <xs:group ref="xhtml.blockquote.content"/>
+        <xs:attributeGroup ref="xhtml.blockquote.attlist"/>
+    </xs:complexType>
+    <!-- pre -->
+    <xs:attributeGroup name="xhtml.pre.attlist">
+        <xs:attribute ref="xml:space"/>
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.pre.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.InlinePre.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.pre.type" mixed="true">
+        <xs:group ref="xhtml.pre.content"/>
+        <xs:attributeGroup ref="xhtml.pre.attlist"/>
+    </xs:complexType>
+    <!-- Heading Elements  -->
+    <xs:attributeGroup name="xhtml.heading.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:complexType name="xhtml.heading.type" mixed="true">
+        <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:attributeGroup ref="xhtml.heading.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.h1.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.h1.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.h1.type" mixed="true">
+        <xs:group ref="xhtml.h1.content"/>
+        <xs:attributeGroup ref="xhtml.h1.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.h2.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.h2.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.h2.type" mixed="true">
+        <xs:group ref="xhtml.h2.content"/>
+        <xs:attributeGroup ref="xhtml.h2.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.h3.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.h3.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.h3.type" mixed="true">
+        <xs:group ref="xhtml.h3.content"/>
+        <xs:attributeGroup ref="xhtml.h3.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.h4.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.h4.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.h4.type" mixed="true">
+        <xs:group ref="xhtml.h4.content"/>
+        <xs:attributeGroup ref="xhtml.h4.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.h5.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.h5.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.h5.type" mixed="true">
+        <xs:group ref="xhtml.h5.content"/>
+        <xs:attributeGroup ref="xhtml.h5.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.h6.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.h6.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.h6.type" mixed="true">
+        <xs:group ref="xhtml.h6.content"/>
+        <xs:attributeGroup ref="xhtml.h6.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkpres-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkpres-1.xsd
new file mode 100644
index 00000000..cf42303a
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkpres-1.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+    <xs:annotation>
+        <xs:documentation>
+      This is the XML SchemaBlock presentation element module for XHTML
+      $Id: xhtml-blkpres-1.xsd,v 1.2 2005/09/26 22:54:53 ahby Exp $
+    </xs:documentation>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>
+      Block Presentational Elements
+  
+        * hr
+  
+      This module declares the elements and their attributes used to
+      support block-level presentational markup.
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+        <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_presentationmodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="xhtml.hr.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.hr.content">
+        <xs:sequence/>
+    </xs:group>
+    <xs:complexType name="xhtml.hr.type">
+        <xs:group ref="xhtml.hr.content"/>
+        <xs:attributeGroup ref="xhtml.hr.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkstruct-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkstruct-1.xsd
new file mode 100644
index 00000000..1e658580
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkstruct-1.xsd
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+    <xs:annotation>
+        <xs:documentation>
+      Block Structural
+
+        * div, p
+  
+      This module declares the elements and their attributes used to
+      support block-level structural markup.            
+          
+      This is the XML Schema Block Structural module for XHTML
+      $Id: xhtml-blkstruct-1.xsd,v 1.3 2005/09/26 22:54:53 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    <!-- div -->
+    <xs:attributeGroup name="xhtml.div.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.div.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.div.type" mixed="true">
+        <xs:group ref="xhtml.div.content"/>
+        <xs:attributeGroup ref="xhtml.div.attlist"/>
+    </xs:complexType>
+    <!-- p -->
+    <xs:attributeGroup name="xhtml.p.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.p.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.p.type" mixed="true">
+        <xs:group ref="xhtml.p.content"/>
+        <xs:attributeGroup ref="xhtml.p.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-datatypes-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-datatypes-1.xsd
new file mode 100644
index 00000000..5943cf35
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-datatypes-1.xsd
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://www.w3.org/1999/xhtml/datatypes/"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+ targetNamespace="http://www.w3.org/1999/xhtml/datatypes/"
+ elementFormDefault="qualified"
+>
+    <xs:annotation>
+        <xs:documentation>
+          XHTML Datatypes
+          This is the XML Schema datatypes module for XHTML
+          
+          Defines containers for the XHTML datatypes, many of
+          these imported from other specifications and standards.
+          
+          $Id: xhtml-datatypes-1.xsd,v 1.9 2008/06/04 20:58:09 ahby Exp $
+        </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+        <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstraction.html#s_common_attrtypes"/>
+    </xs:annotation>
+
+    <!-- nn for pixels or nn% for percentage length -->
+    <xs:simpleType name="Length">
+        <xs:union memberTypes="xs:nonNegativeInteger">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:pattern value="\d+[%]|\d*\.\d+[%]"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:union>
+    </xs:simpleType>
+    <!-- space-separated list of link types -->
+    <xs:simpleType name="LinkTypes">
+        <xs:list itemType="xs:NMTOKEN"/>
+    </xs:simpleType>
+    <!-- single or comma-separated list of media descriptors -->
+    <xs:simpleType name="MediaDesc">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <!-- pixel, percentage, or relative -->
+    <xs:simpleType name="MultiLength">
+        <xs:union memberTypes="xh11d:Length">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:pattern value="\d*\*"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:union>
+    </xs:simpleType>
+    <!-- one or more digits (NUMBER) -->
+    <xs:simpleType name="Number">
+        <xs:restriction base="xs:nonNegativeInteger"/>
+    </xs:simpleType>
+    <!-- integer representing length in pixels -->
+    <xs:simpleType name="Pixels">
+        <xs:restriction base="xs:nonNegativeInteger"/>
+    </xs:simpleType>
+    <!-- script expression -->
+    <xs:simpleType name="Script">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <!-- sixteen color names or RGB color expression-->
+    <xs:simpleType name="Color">
+        <xs:union memberTypes="xs:NMTOKEN">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:pattern value="#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:union>
+    </xs:simpleType>
+    <!-- textual content -->
+    <xs:simpleType name="Text">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <!-- Imported Datatypes  -->
+    <!-- a single character, as per section 2.2 of [XML] -->
+    <xs:simpleType name="Character">
+        <xs:restriction base="xs:string">
+            <xs:length value="1" fixed="true"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <!-- a character encoding, as per [RFC2045] -->
+    <xs:simpleType name="Charset">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <!-- a space separated list of character encodings, as per [RFC2045] -->
+    <xs:simpleType name="Charsets">
+        <xs:list itemType="Charset"/>
+    </xs:simpleType>
+    <!-- media type, as per [RFC2045] -->
+    <xs:simpleType name="ContentType">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <!-- comma-separated list of media types, as per [RFC2045] -->
+    <xs:simpleType name="ContentTypes">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <!-- date and time information. ISO date format -->
+    <xs:simpleType name="Datetime">
+        <xs:restriction base="xs:dateTime"/>
+    </xs:simpleType>
+    <!-- formal public identifier, as per [ISO8879] -->
+    <xs:simpleType name="FPI">
+        <xs:restriction base="xs:normalizedString"/>
+    </xs:simpleType>
+
+    <!-- a window name as used in the target attribute -->
+    <xs:simpleType name="FrameTarget">
+      <xs:union>
+        <xs:simpleType>
+          <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="_blank"/>
+            <xs:enumeration value="_self"/>
+            <xs:enumeration value="_parent"/>
+            <xs:enumeration value="_top"/>
+          </xs:restriction>
+        </xs:simpleType>
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z].*"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:union>
+    </xs:simpleType>
+    
+    <!-- a language code, as per [RFC3066] -->
+    <xs:simpleType name="LanguageCode">
+        <xs:restriction base="xs:language"/>
+    </xs:simpleType>
+    <!-- a comma separated list of language ranges -->
+    <xs:simpleType name="LanguageCodes">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <!-- a Uniform Resource Identifier, see [URI] -->
+    <xs:simpleType name="URI">
+        <xs:restriction base="xs:anyURI"/>
+    </xs:simpleType>
+    <!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
+    <xs:simpleType name="URIs">
+        <xs:list itemType="xs:anyURI"/>
+    </xs:simpleType>
+    <!-- comma-separated list of MultiLength -->
+    <xs:simpleType name="MultiLengths">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <!-- character Data -->
+    <xs:simpleType name="CDATA">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <!-- CURIE placeholder datatypes -->
+    <xs:simpleType name="CURIE">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="[\i-[:]][\c-[:]]*:.+" />
+		</xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="CURIEs">
+        <xs:list itemType="xh11d:CURIE"/>
+    </xs:simpleType>
+    <xs:simpleType name="SafeCURIE">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="\[[\i-[:]][\c-[:]]*:.+\]" />
+		</xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SafeCURIEs">
+        <xs:list itemType="xh11d:SafeCURIE"/>
+    </xs:simpleType>
+    <xs:simpleType name="URIorSafeCURIE">
+		<xs:union memberTypes="xs:anyURI xh11d:SafeCURIE" />
+    </xs:simpleType>
+    <xs:simpleType name="URIorSafeCURIEs">
+        <xs:list itemType="xh11d:URIorSafeCURIE"/>
+    </xs:simpleType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-framework-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-framework-1.xsd
new file mode 100644
index 00000000..05b906d4
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-framework-1.xsd
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+ elementFormDefault="qualified"
+>
+    <xs:annotation>
+        <xs:documentation>
+      This is the XML Schema Modular Framework support module for XHTML
+      $Id: xhtml-framework-1.xsd,v 1.5 2005/09/26 23:37:47 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>
+      XHTML Modular Framework
+      This required module instantiates the necessary modules
+      needed to support the XHTML modularization framework.
+
+      The Schema modules instantiated are:
+        +  notations
+        +  datatypes
+        +  common attributes
+        +  character entities
+    </xs:documentation>
+        <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_commonatts"/>
+    </xs:annotation>
+    <!-- xs:include schemaLocation="xhtml-notations-1.xsd">
+        <xs:annotation>
+            <xs:documentation>
+         Notations module
+         Declares XHTML notations for Attribute data types
+      </xs:documentation>
+        </xs:annotation>
+    </xs:include -->
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" schemaLocation="xhtml-datatypes-1.xsd">
+        <xs:annotation>
+            <xs:documentation>
+        This module defines XHTML Attribute DataTypes
+      </xs:documentation>
+            <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstraction.html#s_common_attrtypes"/>
+        </xs:annotation>
+    </xs:import>
+    <xs:include schemaLocation="xhtml-attribs-1.xsd">
+        <xs:annotation>
+            <xs:documentation>
+        This module defines Common attributes for XHTML
+      </xs:documentation>
+            <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_commonatts"/>
+        </xs:annotation>
+    </xs:include>
+    <!-- xs:include schemaLocation="xhtml-charent-1.xsd">
+        <xs:annotation>
+            <xs:documentation>
+        Character entities module
+        Note: Entities are not supported in XML Schema
+        The Schema Module uses DTDs to define Entities
+
+        This module defines
+          + XHTML Latin 1 Character Entities
+          + XHTML Special Characters
+          + XHTML Mathematical, Greek, and Symbolic Characters
+    </xs:documentation>
+        </xs:annotation>
+    </xs:include -->
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-image-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-image-1.xsd
new file mode 100644
index 00000000..cd16bc9b
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-image-1.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+
+    <xs:annotation>
+        <xs:documentation>
+      Images    
+      This is the XML Schema Images module for XHTML
+    
+        * img
+    
+      This module provides markup to support basic image embedding.
+      
+      To avoid problems with text-only UAs as well as to make
+      image content understandable and navigable to users of
+      non-visual UAs, you need to provide a description with
+      the 'alt' attribute, and avoid server-side image maps.
+      
+      
+      $Id: xhtml-image-1.xsd,v 1.2 2005/09/26 22:54:53 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+        <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_imagemodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="xhtml.img.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attribute name="src" type="xh11d:URI" use="required"/>
+        <xs:attribute name="alt" type="xh11d:Text" use="required"/>
+        <xs:attribute name="longdesc" type="xh11d:URI"/>
+        <xs:attribute name="height" type="xh11d:Length"/>
+        <xs:attribute name="width" type="xh11d:Length"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.img.content">
+        <xs:sequence/>
+    </xs:group>
+    <xs:complexType name="xhtml.img.type">
+        <xs:group ref="xhtml.img.content"/>
+        <xs:attributeGroup ref="xhtml.img.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlphras-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlphras-1.xsd
new file mode 100644
index 00000000..919c59de
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlphras-1.xsd
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+
+    <xs:annotation>
+        <xs:documentation>
+         This is the XML Schema Inline Phrasal support module for XHTML
+         $Id: xhtml-inlphras-1.xsd,v 1.4 2005/09/26 22:54:53 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>
+      Inline Phrasal.
+      This module declares the elements and their attributes used to
+      support inline-level phrasal markup.
+      This is the XML Schema Inline Phrasal module for XHTML
+
+        * abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
+
+      $Id: xhtml-inlphras-1.xsd,v 1.4 2005/09/26 22:54:53 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_textmodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="xhtml.abbr.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.abbr.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.abbr.type" mixed="true">
+        <xs:group ref="xhtml.abbr.content"/>
+        <xs:attributeGroup ref="xhtml.abbr.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.acronym.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.acronym.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.acronym.type" mixed="true">
+        <xs:group ref="xhtml.acronym.content"/>
+        <xs:attributeGroup ref="xhtml.acronym.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.cite.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.cite.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.cite.type" mixed="true">
+        <xs:group ref="xhtml.cite.content"/>
+        <xs:attributeGroup ref="xhtml.cite.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.code.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.code.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.code.type" mixed="true">
+        <xs:group ref="xhtml.code.content"/>
+        <xs:attributeGroup ref="xhtml.code.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.dfn.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.dfn.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.dfn.type" mixed="true">
+        <xs:group ref="xhtml.dfn.content"/>
+        <xs:attributeGroup ref="xhtml.dfn.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.em.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.em.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.em.type" mixed="true">
+        <xs:group ref="xhtml.em.content"/>
+        <xs:attributeGroup ref="xhtml.em.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.kbd.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.kbd.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.kbd.type" mixed="true">
+        <xs:group ref="xhtml.kbd.content"/>
+        <xs:attributeGroup ref="xhtml.kbd.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.samp.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.samp.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.samp.type" mixed="true">
+        <xs:group ref="xhtml.samp.content"/>
+        <xs:attributeGroup ref="xhtml.samp.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.strong.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.strong.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.strong.type" mixed="true">
+        <xs:group ref="xhtml.strong.content"/>
+        <xs:attributeGroup ref="xhtml.strong.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.var.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.var.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.var.type" mixed="true">
+        <xs:group ref="xhtml.var.content"/>
+        <xs:attributeGroup ref="xhtml.var.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.q.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attribute name="cite" type="xh11d:URI"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.q.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.q.type" mixed="true">
+        <xs:group ref="xhtml.q.content"/>
+        <xs:attributeGroup ref="xhtml.q.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlpres-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlpres-1.xsd
new file mode 100644
index 00000000..a053447c
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlpres-1.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+    <xs:annotation>
+        <xs:documentation>
+      This is the XML Schema Inline Presentation element module for XHTML
+      $Id: xhtml-inlpres-1.xsd,v 1.2 2005/09/26 22:54:53 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>
+      Inline Presentational Elements
+    
+        * b, big, i, small, sub, sup, tt
+    
+      This module declares the elements and their attributes used to
+      support inline-level presentational markup.
+    </xs:documentation>
+        <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_presentationmodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="xhtml.InlPres.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.InlPres.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.InlPres.type" mixed="true">
+        <xs:group ref="xhtml.InlPres.content"/>
+        <xs:attributeGroup ref="xhtml.InlPres.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlstruct-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlstruct-1.xsd
new file mode 100644
index 00000000..635eb5f1
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-inlstruct-1.xsd
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+    <xs:annotation>
+        <xs:documentation>
+         This is the XML Schema Inline Structural support module for XHTML
+         $Id: xhtml-inlstruct-1.xsd,v 1.4 2005/09/26 22:54:53 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>
+      Inline Structural.
+      This module declares the elements and their attributes 
+      used to support inline-level structural markup.      
+      This is the XML Schema Inline Structural element module for XHTML
+
+        * br, span
+      
+    </xs:documentation>
+        <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_textmodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="xhtml.br.attlist">
+        <xs:attributeGroup ref="xhtml.Core.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.br.content">
+        <xs:sequence/>
+    </xs:group>
+    <xs:complexType name="xhtml.br.type">
+        <xs:group ref="xhtml.br.content"/>
+        <xs:attributeGroup ref="xhtml.br.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.span.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.span.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.span.type" mixed="true">
+        <xs:group ref="xhtml.span.content"/>
+        <xs:attributeGroup ref="xhtml.span.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-list-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-list-1.xsd
new file mode 100644
index 00000000..cc22ba88
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-list-1.xsd
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+    <xs:annotation>
+        <xs:documentation>
+      List Module
+      This is the XML Schema Lists module for XHTML
+      List Module Elements
+    
+        * dl, dt, dd, ol, ul, li
+    
+      This module declares the list-oriented element types
+      and their attributes.
+      $Id: xhtml-list-1.xsd,v 1.2 2005/09/26 22:54:53 ahby Exp $      
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+        <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_listmodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="xhtml.dt.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.dt.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.dt.type" mixed="true">
+        <xs:group ref="xhtml.dt.content"/>
+        <xs:attributeGroup ref="xhtml.dt.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.dd.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.dd.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.dd.type" mixed="true">
+        <xs:group ref="xhtml.dd.content"/>
+        <xs:attributeGroup ref="xhtml.dd.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.dl.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.dl.content">
+        <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element name="dt" type="xhtml.dt.type"/>
+                <xs:element name="dd" type="xhtml.dd.type"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.dl.type">
+        <xs:group ref="xhtml.dl.content"/>
+        <xs:attributeGroup ref="xhtml.dl.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.li.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.li.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.li.type" mixed="true">
+        <xs:group ref="xhtml.li.content"/>
+        <xs:attributeGroup ref="xhtml.li.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.ol.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.ol.content">
+        <xs:sequence>
+            <xs:element name="li" type="xhtml.li.type" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.ol.type">
+        <xs:group ref="xhtml.ol.content"/>
+        <xs:attributeGroup ref="xhtml.ol.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.ul.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.ul.content">
+        <xs:sequence>
+            <xs:element name="li" type="xhtml.li.type" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.ul.type">
+        <xs:group ref="xhtml.ul.content"/>
+        <xs:attributeGroup ref="xhtml.ul.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-pres-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-pres-1.xsd
new file mode 100644
index 00000000..bc36fc48
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-pres-1.xsd
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+    <xs:annotation>
+        <xs:documentation>
+      This is the XML Schema Presentation module for XHTML
+      This is a REQUIRED module.
+      $Id: xhtml-pres-1.xsd,v 1.2 2005/09/26 22:54:53 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>
+      Presentational Elements
+
+      This module defines elements and their attributes for
+      simple presentation-related markup.
+ 
+      Elements defined here:
+
+        * hr
+        * b, big, i, small, sub, sup, tt
+    </xs:documentation>
+        <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_presentationmodule"/>
+    </xs:annotation>
+    <xs:include schemaLocation="xhtml-blkpres-1.xsd">
+        <xs:annotation>
+            <xs:documentation>
+        Block Presentational module
+        Elements defined here:
+ 
+         * hr
+      </xs:documentation>
+        </xs:annotation>
+    </xs:include>
+    <xs:include schemaLocation="xhtml-inlpres-1.xsd">
+        <xs:annotation>
+            <xs:documentation>
+        Inline Presentational module
+        Elements defined here:
+
+          * b, big, i, small, sub, sup, tt
+    </xs:documentation>
+        </xs:annotation>
+    </xs:include>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-struct-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-struct-1.xsd
new file mode 100644
index 00000000..60cbcbf5
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-struct-1.xsd
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/">
+    <xs:import
+        namespace="http://www.w3.org/1999/xhtml/datatypes/"
+        schemaLocation="xhtml-datatypes-1.xsd"/>
+    <xs:annotation>
+        <xs:documentation>
+        This is the XML Schema Document Structure module for XHTML
+        Document Structure
+    
+          * title, head, body, html
+    
+        The Structure Module defines the major structural elements and 
+        their attributes.
+        
+        $Id: xhtml-struct-1.xsd,v 1.8 2006/09/11 10:27:50 ahby Exp $     
+      </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+        <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_structuremodule"/>
+    </xs:annotation>
+    <xs:attributeGroup
+        name="xhtml.title.attlist">
+        <xs:attributeGroup
+            ref="xhtml.I18n.attrib"/>
+        <xs:attributeGroup ref="xhtml.id"/>
+    </xs:attributeGroup>
+    <xs:group
+        name="xhtml.title.content">
+        <xs:sequence/>
+    </xs:group>
+    <xs:complexType
+        name="xhtml.title.type"
+        mixed="true">
+        <xs:group
+            ref="xhtml.title.content"/>
+        <xs:attributeGroup
+            ref="xhtml.title.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup
+        name="xhtml.profile.attrib">
+        <xs:attribute
+            name="profile"
+            type="xh11d:URI"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup
+        name="xhtml.head.attlist">
+        <xs:attributeGroup
+            ref="xhtml.profile.attrib"/>
+        <xs:attributeGroup
+            ref="xhtml.I18n.attrib"/>
+        <xs:attributeGroup ref="xhtml.id"/>
+    </xs:attributeGroup>
+    <xs:complexType
+        name="xhtml.head.type">
+        <xs:group
+            ref="xhtml.head.content"/>
+        <xs:attributeGroup
+            ref="xhtml.head.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup
+        name="xhtml.body.attlist">
+        <xs:attributeGroup
+            ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group
+        name="xhtml.body.content">
+        <xs:sequence>
+            <xs:group
+                ref="xhtml.Block.mix"
+                minOccurs="0"
+                maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType
+        name="xhtml.body.type">
+        <xs:group
+            ref="xhtml.body.content"/>
+        <xs:attributeGroup
+            ref="xhtml.body.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup
+        name="xhtml.version.attrib">
+        <xs:attribute
+            name="version"
+            type="xh11d:FPI"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup
+        name="xhtml.html.attlist">
+        <xs:attributeGroup
+            ref="xhtml.version.attrib"/>
+        <xs:attributeGroup
+            ref="xhtml.I18n.attrib"/>
+        <xs:attributeGroup ref="xhtml.id"/>
+    </xs:attributeGroup>
+    <xs:group
+        name="xhtml.html.content">
+        <xs:sequence>
+            <xs:element
+                name="head"
+                type="xhtml.head.type"/>
+            <xs:element
+                name="body"
+                type="xhtml.body.type"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType
+        name="xhtml.html.type">
+        <xs:group
+            ref="xhtml.html.content"/>
+        <xs:attributeGroup
+            ref="xhtml.html.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-style-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-style-1.xsd
new file mode 100644
index 00000000..1b3e7d3b
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-style-1.xsd
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+
+    <xs:annotation>
+        <xs:documentation>
+      This is the XML Schema Stylesheets module for XHTML
+      $Id: xhtml-style-1.xsd,v 1.5 2006/09/11 10:14:57 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>
+      Stylesheets
+      
+        * style
+      
+      This module declares the style element type and its attributes,
+      used to embed stylesheet information in the document head element.
+    </xs:documentation>
+        <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_stylemodule"/>
+    </xs:annotation>
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+             schemaLocation="xml.xsd">
+        <xs:annotation>
+            <xs:documentation>
+          This import brings in the XML namespace attributes 
+          The module itself does not provide the schemaLocation
+          and expects the driver schema to provide the 
+          actual SchemaLocation.
+        </xs:documentation>
+        </xs:annotation>
+    </xs:import>
+    <xs:attributeGroup name="xhtml.style.attlist">
+        <xs:attributeGroup ref="xhtml.id"/>
+        <xs:attributeGroup ref="xhtml.title"/>
+        <xs:attributeGroup ref="xhtml.I18n.attrib"/>
+        <xs:attribute name="type" type="xh11d:ContentType" use="required"/>
+        <xs:attribute name="media" type="xh11d:MediaDesc"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.style.content">
+        <xs:sequence/>
+    </xs:group>
+    <xs:complexType name="xhtml.style.type" mixed="true">
+        <xs:group ref="xhtml.style.content"/>
+        <xs:attributeGroup ref="xhtml.style.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-table-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-table-1.xsd
new file mode 100644
index 00000000..ec76db3c
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-table-1.xsd
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+
+    <xs:annotation>
+        <xs:documentation>
+          This is the XML Schema Tables module for XHTML
+          $Id: xhtml-table-1.xsd,v 1.3 2005/09/26 22:54:53 ahby Exp $
+        </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>
+          Tables
+      
+           * table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td
+      
+          This module declares element types and attributes used to provide
+          table markup similar to HTML 4.0, including features that enable
+          better accessibility for non-visual user agents.
+        </xs:documentation>
+        <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_tablemodule"/>
+    </xs:annotation>
+    <xs:attributeGroup name="xhtml.frame.attrib">
+        <xs:attribute name="frame">
+            <xs:simpleType>
+                <xs:restriction base="xs:NMTOKEN">
+                    <xs:enumeration value="void"/>
+                    <xs:enumeration value="above"/>
+                    <xs:enumeration value="below"/>
+                    <xs:enumeration value="hsides"/>
+                    <xs:enumeration value="lhs"/>
+                    <xs:enumeration value="rhs"/>
+                    <xs:enumeration value="vsides"/>
+                    <xs:enumeration value="box"/>
+                    <xs:enumeration value="border"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.rules.attrib">
+        <xs:attribute name="rules">
+            <xs:simpleType>
+                <xs:restriction base="xs:NMTOKEN">
+                    <xs:enumeration value="none"/>
+                    <xs:enumeration value="groups"/>
+                    <xs:enumeration value="rows"/>
+                    <xs:enumeration value="cols"/>
+                    <xs:enumeration value="all"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.CellVAlign.attrib">
+        <xs:attribute name="valign">
+            <xs:simpleType>
+                <xs:restriction base="xs:NMTOKEN">
+                    <xs:enumeration value="top"/>
+                    <xs:enumeration value="middle"/>
+                    <xs:enumeration value="bottom"/>
+                    <xs:enumeration value="baseline"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.CellHAlign.attrib">
+        <xs:attribute name="align">
+            <xs:simpleType>
+                <xs:restriction base="xs:NMTOKEN">
+                    <xs:enumeration value="left"/>
+                    <xs:enumeration value="center"/>
+                    <xs:enumeration value="right"/>
+                    <xs:enumeration value="justify"/>
+                    <xs:enumeration value="char"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="char" type="xh11d:Character"/>
+        <xs:attribute name="charoff" type="xh11d:Length"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.scope.attrib">
+        <xs:attribute name="scope">
+            <xs:simpleType>
+                <xs:restriction base="xs:NMTOKEN">
+                    <xs:enumeration value="row"/>
+                    <xs:enumeration value="col"/>
+                    <xs:enumeration value="rowgroup"/>
+                    <xs:enumeration value="colgroup"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="xhtml.td.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attribute name="abbr" type="xh11d:Text"/>
+        <xs:attribute name="axis" type="xh11d:CDATA"/>
+        <xs:attribute name="headers" type="xs:IDREFS"/>
+        <xs:attributeGroup ref="xhtml.scope.attrib"/>
+        <xs:attribute name="rowspan" type="xh11d:Number" default="1"/>
+        <xs:attribute name="colspan" type="xh11d:Number" default="1"/>
+        <xs:attributeGroup ref="xhtml.CellHAlign.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.td.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.td.type" mixed="true">
+        <xs:group ref="xhtml.td.content"/>
+        <xs:attributeGroup ref="xhtml.td.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.th.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attribute name="abbr" type="xh11d:Text"/>
+        <xs:attribute name="axis" type="xh11d:CDATA"/>
+        <xs:attribute name="headers" type="xs:IDREFS"/>
+        <xs:attributeGroup ref="xhtml.scope.attrib"/>
+        <xs:attribute name="rowspan" type="xh11d:Number" default="1"/>
+        <xs:attribute name="colspan" type="xh11d:Number" default="1"/>
+        <xs:attributeGroup ref="xhtml.CellHAlign.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.th.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.th.type" mixed="true">
+        <xs:group ref="xhtml.th.content"/>
+        <xs:attributeGroup ref="xhtml.th.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.tr.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellHAlign.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.tr.content">
+        <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element name="th" type="xhtml.th.type"/>
+                <xs:element name="td" type="xhtml.td.type"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.tr.type">
+        <xs:group ref="xhtml.tr.content"/>
+        <xs:attributeGroup ref="xhtml.tr.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.col.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attribute name="span" type="xh11d:Number" default="1"/>
+        <xs:attribute name="width" type="xh11d:MultiLength"/>
+        <xs:attributeGroup ref="xhtml.CellHAlign.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.col.content">
+        <xs:sequence/>
+    </xs:group>
+    <xs:complexType name="xhtml.col.type">
+        <xs:group ref="xhtml.col.content"/>
+        <xs:attributeGroup ref="xhtml.col.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.colgroup.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attribute name="span" type="xh11d:Number" default="1"/>
+        <xs:attribute name="width" type="xh11d:MultiLength"/>
+        <xs:attributeGroup ref="xhtml.CellHAlign.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.colgroup.content">
+        <xs:sequence>
+            <xs:element name="col" type="xhtml.col.type" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.colgroup.type">
+        <xs:group ref="xhtml.colgroup.content"/>
+        <xs:attributeGroup ref="xhtml.colgroup.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.tbody.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellHAlign.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.tbody.content">
+        <xs:sequence>
+            <xs:element name="tr" type="xhtml.tr.type" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.tbody.type">
+        <xs:group ref="xhtml.tbody.content"/>
+        <xs:attributeGroup ref="xhtml.tbody.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.tfoot.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellHAlign.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.tfoot.content">
+        <xs:sequence>
+            <xs:element name="tr" type="xhtml.tr.type" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.tfoot.type">
+        <xs:group ref="xhtml.tfoot.content"/>
+        <xs:attributeGroup ref="xhtml.tfoot.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.thead.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellHAlign.attrib"/>
+        <xs:attributeGroup ref="xhtml.CellVAlign.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.thead.content">
+        <xs:sequence>
+            <xs:element name="tr" type="xhtml.tr.type" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.thead.type">
+        <xs:group ref="xhtml.thead.content"/>
+        <xs:attributeGroup ref="xhtml.thead.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.caption.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.caption.content">
+        <xs:sequence>
+            <xs:group ref="xhtml.Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.caption.type" mixed="true">
+        <xs:group ref="xhtml.caption.content"/>
+        <xs:attributeGroup ref="xhtml.caption.attlist"/>
+    </xs:complexType>
+    <xs:attributeGroup name="xhtml.table.attlist">
+        <xs:attributeGroup ref="xhtml.Common.attrib"/>
+        <xs:attribute name="summary" type="xh11d:Text"/>
+        <xs:attribute name="width" type="xh11d:Length"/>
+        <xs:attribute name="border" type="xh11d:Pixels"/>
+        <xs:attributeGroup ref="xhtml.frame.attrib"/>
+        <xs:attributeGroup ref="xhtml.rules.attrib"/>
+        <xs:attribute name="cellspacing" type="xh11d:Length"/>
+        <xs:attribute name="cellpadding" type="xh11d:Length"/>
+    </xs:attributeGroup>
+    <xs:group name="xhtml.table.content">
+        <xs:sequence>
+            <xs:element name="caption" type="xhtml.caption.type" minOccurs="0"/>
+            <xs:choice>
+                <xs:element name="col" type="xhtml.col.type" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="colgroup" type="xhtml.colgroup.type" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:choice>
+            <xs:choice>
+                <xs:sequence>
+                    <xs:element name="thead" type="xhtml.thead.type" minOccurs="0"/>
+                    <xs:element name="tfoot" type="xhtml.tfoot.type" minOccurs="0"/>
+                    <xs:element name="tbody" type="xhtml.tbody.type" maxOccurs="unbounded"/>
+                </xs:sequence>
+                <xs:choice>
+                    <xs:element name="tr" type="xhtml.tr.type" maxOccurs="unbounded"/>
+                </xs:choice>
+            </xs:choice>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="xhtml.table.type">
+        <xs:group ref="xhtml.table.content"/>
+        <xs:attributeGroup ref="xhtml.table.attlist"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-text-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-text-1.xsd
new file mode 100644
index 00000000..432bdad7
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-text-1.xsd
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/"
+>
+    <xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" 
+               schemaLocation="xhtml-datatypes-1.xsd" />
+    <xs:annotation>
+        <xs:documentation>
+      Textual Content
+      This is the XML Schema Text module for XHTML
+
+      The Text module includes declarations for all core
+      text container elements and their attributes.
+    
+        +  block phrasal
+        +  block structural
+        +  inline phrasal
+        +  inline structural
+      
+      $Id: xhtml-text-1.xsd,v 1.2 2005/09/26 22:54:53 ahby Exp $
+    </xs:documentation>
+        <xs:documentation source="xhtml-copyright-1.xsd"/>
+        <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_textmodule"/>
+    </xs:annotation>
+    <xs:include schemaLocation="xhtml-blkphras-1.xsd">
+        <xs:annotation>
+            <xs:documentation>
+        Block Phrasal module
+        Elements defined here:
+
+          * address, blockquote, pre, h1, h2, h3, h4, h5, h6
+    </xs:documentation>
+        </xs:annotation>
+    </xs:include>
+    <xs:include schemaLocation="xhtml-blkstruct-1.xsd">
+        <xs:annotation>
+            <xs:documentation>
+        Block Structural module 
+        Elements defined here:
+
+          * div, p
+    </xs:documentation>
+        </xs:annotation>
+    </xs:include>
+    <xs:include schemaLocation="xhtml-inlphras-1.xsd">
+        <xs:annotation>
+            <xs:documentation>
+        Inline Phrasal module
+        Elements defined here:
+
+          * abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
+    </xs:documentation>
+        </xs:annotation>
+    </xs:include>
+    <xs:include schemaLocation="xhtml-inlstruct-1.xsd">
+        <xs:annotation>
+            <xs:documentation>
+        Inline Structural module 
+        Elements defined here:
+
+          * br,span
+    </xs:documentation>
+        </xs:annotation>
+    </xs:include>
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xml.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xml.xsd
new file mode 100644
index 00000000..eeb9db56
--- /dev/null
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xml.xsd
@@ -0,0 +1,145 @@
+<?xml version='1.0'?>
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+ <xs:annotation>
+  <xs:documentation>
+   See http://www.w3.org/XML/1998/namespace.html and
+   http://www.w3.org/TR/REC-xml for information about this namespace.
+
+    This schema document describes the XML namespace, in a form
+    suitable for import by other schema documents.  
+
+    Note that local names in this namespace are intended to be defined
+    only by the World Wide Web Consortium or its subgroups.  The
+    following names are currently defined in this namespace and should
+    not be used with conflicting semantics by any Working Group,
+    specification, or document instance:
+
+    base (as an attribute name): denotes an attribute whose value
+         provides a URI to be used as the base for interpreting any
+         relative URIs in the scope of the element on which it
+         appears; its value is inherited.  This name is reserved
+         by virtue of its definition in the XML Base specification.
+
+    id   (as an attribute name): denotes an attribute whose value
+         should be interpreted as if declared to be of type ID.
+         This name is reserved by virtue of its definition in the
+         xml:id specification.
+
+    lang (as an attribute name): denotes an attribute whose value
+         is a language code for the natural language of the content of
+         any element; its value is inherited.  This name is reserved
+         by virtue of its definition in the XML specification.
+  
+    space (as an attribute name): denotes an attribute whose
+         value is a keyword indicating what whitespace processing
+         discipline is intended for the content of the element; its
+         value is inherited.  This name is reserved by virtue of its
+         definition in the XML specification.
+
+    Father (in any context at all): denotes Jon Bosak, the chair of 
+         the original XML Working Group.  This name is reserved by 
+         the following decision of the W3C XML Plenary and 
+         XML Coordination groups:
+
+             In appreciation for his vision, leadership and dedication
+             the W3C XML Plenary on this 10th day of February, 2000
+             reserves for Jon Bosak in perpetuity the XML name
+             xml:Father
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>This schema defines attributes and an attribute group
+        suitable for use by
+        schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
+        attributes on elements they define.
+
+        To enable this, such a schema must import this schema
+        for the XML namespace, e.g. as follows:
+        &lt;schema . . .>
+         . . .
+         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+                    schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
+        Subsequently, qualified reference to any of the attributes
+        or the group defined below will have the desired effect, e.g.
+
+        &lt;type . . .>
+         . . .
+         &lt;attributeGroup ref="xml:specialAttrs"/>
+ 
+         will define a type which will schema-validate an instance
+         element with any of those attributes</xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>In keeping with the XML Schema WG's standard versioning
+   policy, this schema document will persist at
+   http://www.w3.org/2007/08/xml.xsd.
+   At the date of issue it can also be found at
+   http://www.w3.org/2001/xml.xsd.
+   The schema document at that URI may however change in the future,
+   in order to remain compatible with the latest version of XML Schema
+   itself, or with the XML namespace itself.  In other words, if the XML
+   Schema or XML namespaces change, the version of this document at
+   http://www.w3.org/2001/xml.xsd will change
+   accordingly; the version at
+   http://www.w3.org/2007/08/xml.xsd will not change.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang">
+  <xs:annotation>
+   <xs:documentation>Attempting to install the relevant ISO 2- and 3-letter
+         codes as the enumerated possible values is probably never
+         going to be a realistic possibility.  See
+         RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry
+         at http://www.iana.org/assignments/lang-tag-apps.htm for
+         further information.
+
+         The union allows for the 'un-declaration' of xml:lang with
+         the empty string.</xs:documentation>
+  </xs:annotation>
+  <xs:simpleType>
+   <xs:union memberTypes="xs:language">
+    <xs:simpleType>    
+     <xs:restriction base="xs:string">
+      <xs:enumeration value=""/>
+     </xs:restriction>
+    </xs:simpleType>
+   </xs:union>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="space">
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+                     information about this attribute.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+ 
+ <xs:attribute name="id" type="xs:ID">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xml-id/ for
+                     information about this attribute.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+  <xs:attribute ref="xml:id"/>
+ </xs:attributeGroup>
+
+</xs:schema>
diff --git a/BKUViewer/src/main/resources/org/w3c/css/properties/Config.properties b/BKUViewer/src/main/resources/org/w3c/css/properties/Config.properties
new file mode 100644
index 00000000..0ece8cda
--- /dev/null
+++ b/BKUViewer/src/main/resources/org/w3c/css/properties/Config.properties
@@ -0,0 +1,32 @@
+# configuration file for org.w3c.css.parser.CssFouffa
+# Properties should be in the style directory
+
+# Is the parser should run in CSS2 ?
+extended-parser: true
+
+# the CssStyle to use
+#style for CSS1
+css1: org.w3c.css.properties.css1.Css1Style
+#style for CSS2 (and mobile profile and TV profile)
+css2: org.w3c.css.properties.css2.font.Css2Style
+#style for CSS2.1
+css21: org.w3c.css.properties.css21.Css21Style
+#style for CSS3
+css3: org.w3c.css.properties.css3.Css3Style
+#SVG styles
+svg : org.w3c.css.properties.svg.SVGStyle
+svgbasic : org.w3c.css.properties.svg.SVGBasicStyle
+svgtiny : org.w3c.css.properties.svg.SVGTinyStyle
+#ATSC style
+atsc-tv: org.w3c.css.properties.atsc.ATSCStyle
+#SLXHMTL
+slxhtml: at.gv.egiz.bku.slxhtml.css.SLXHTMLStyle
+
+#media
+media: Media.properties
+
+# file containing the properties files for each profile
+profilesProperties: ProfilesProperties.properties
+
+#default profile
+defaultProfile: css21
diff --git a/BKUViewer/src/main/resources/org/w3c/css/properties/ProfilesProperties.properties b/BKUViewer/src/main/resources/org/w3c/css/properties/ProfilesProperties.properties
new file mode 100644
index 00000000..8c2aded8
--- /dev/null
+++ b/BKUViewer/src/main/resources/org/w3c/css/properties/ProfilesProperties.properties
@@ -0,0 +1,30 @@
+# The list of properties to use
+
+# properties for CSS1
+css1 : CSS1Properties.properties
+
+# properties for CSS2
+css2 : CSS2Properties.properties
+
+# properties for CSS2.1
+css21 : CSS21Properties.properties
+
+# properties for CSS3
+css3 : CSS3Properties.properties
+
+# properties for mobile profile
+mobile : MobileProperties.properties
+
+# properties for ATSC TV profile
+atsc-tv : ATSCProperties.properties
+
+# properties for TV profile
+tv : TVProperties.properties
+
+# properties for SVG profiles
+svg : SVGProperties.properties
+svgbasic : SVGBasicProperties.properties
+svgtiny : SVGTinyProperties.properties
+
+# properties for SLXHTML profile
+slxhtml : SLXHTMLProperties.properties
diff --git a/BKUViewer/src/main/resources/org/w3c/css/properties/SLXHTMLProperties.properties b/BKUViewer/src/main/resources/org/w3c/css/properties/SLXHTMLProperties.properties
new file mode 100644
index 00000000..dec68c11
--- /dev/null
+++ b/BKUViewer/src/main/resources/org/w3c/css/properties/SLXHTMLProperties.properties
@@ -0,0 +1,641 @@
+# All properties for all media
+
+# CSS2 Properties
+
+# Margin spacing
+#
+# The margin-top, margin-bottom, margin-left and margin-right properties 
+# must be supported by a Citizen Card Environment. Values specified as percentages 
+# (cf. section 3.5.1.2) should be supported.
+#
+# The margin property may be supported by a Citizen Card Environment.
+#
+# An instance document must not contain a negative value in the properties mentioned 
+# above. Otherwise it must be rejected by the Citizen Card Environment.
+
+margin-top:                     at.gv.egiz.bku.slxhtml.css.CssMarginTopSLXHTML
+margin-bottom:                  at.gv.egiz.bku.slxhtml.css.CssMarginBottomSLXHTML
+margin-left:                    at.gv.egiz.bku.slxhtml.css.CssMarginLeftSLXHTML
+margin-right:                   at.gv.egiz.bku.slxhtml.css.CssMarginRightSLXHTML
+margin:                         at.gv.egiz.bku.slxhtml.css.CssMarginSLXHTML
+
+# Padding spacing
+#
+# The padding-top, padding-bottom, padding-left and padding-right properties must be 
+# supported by a Citizen Card Environment. Values specified as percentages (cf. section 
+# 3.5.1.2) should be supported.
+#
+# The padding property may be supported by a Citizen Card Environment.
+#
+# An instance document must not contain a negative value in the properties 
+# mentioned above. Otherwise it must be rejected by the Citizen Card Environment.
+
+padding-top:                    at.gv.egiz.bku.slxhtml.css.CssPaddingTopSLXHTML
+padding-bottom:                 at.gv.egiz.bku.slxhtml.css.CssPaddingBottomSLXHTML
+padding-left:                   at.gv.egiz.bku.slxhtml.css.CssPaddingLeftSLXHTML
+padding-right:                  at.gv.egiz.bku.slxhtml.css.CssPaddingRightSLXHTML
+padding:                        at.gv.egiz.bku.slxhtml.css.CssPaddingSLXHTML
+
+#
+# Borders
+#
+
+# Border width
+#
+# The border-top-width, border-bottom-width, border-left-width, border-right-width 
+# and border-width properties should be supported by a Citizen Card Environment. If 
+# the properties are supported, the predefined values thin, medium and thick should 
+# also be supported (cf. [CSS 2], section 8.5.1). 
+
+border-top-width:               org.w3c.css.properties.css1.CssBorderTopWidthCSS2
+border-right-width:             org.w3c.css.properties.css1.CssBorderRightWidthCSS2
+border-left-width:              org.w3c.css.properties.css1.CssBorderLeftWidthCSS2
+border-bottom-width:            org.w3c.css.properties.css1.CssBorderBottomWidthCSS2
+
+# Border colour
+#
+# The border-top-color, border-bottom-color, border-left-color, border-right-color 
+# and border-color properties should be supported by a Citizen Card Environment. The 
+# predefined value transparent for the border-color property may be supported (cf. 
+# [CSS 2], section 8.5.2).
+
+border-top-color:               at.gv.egiz.bku.slxhtml.css.CssBorderTopColorSLXHTML
+border-right-color:             at.gv.egiz.bku.slxhtml.css.CssBorderRightColorSLXHTML
+border-left-color:              at.gv.egiz.bku.slxhtml.css.CssBorderLeftColorSLXHTML
+border-bottom-color:            at.gv.egiz.bku.slxhtml.css.CssBorderBottomColorSLXHTML
+
+# Border style
+# 
+# The border-top-style, border-bottom-style, border-left-style, border-right-style and 
+# border-style properties should be supported by a Citizen Card Environment. If the properties 
+# are supported, the predefined values none, dashed, dotted, solid and double should also 
+# be supported; all other values may be supported (cf. [CSS 2], section 8.5.3).
+
+border-top-style:               org.w3c.css.properties.css1.CssBorderTopStyleCSS2
+border-right-style:             org.w3c.css.properties.css1.CssBorderRightStyleCSS2
+border-left-style:              org.w3c.css.properties.css1.CssBorderLeftStyleCSS2
+border-bottom-style:            org.w3c.css.properties.css1.CssBorderBottomStyleCSS2
+
+# Shorthand
+#
+# The properties for the shorthand version of the border properties (border-top, 
+# border-bottom, border-left, border-right and border (cf. [CSS 2], section 8.5.4) 
+# should be supported by a Citizen Card Environment. The recommended values result 
+# from the three previous sections.
+
+border-width:                   org.w3c.css.properties.css1.CssBorderWidthCSS2
+border-color:                   at.gv.egiz.bku.slxhtml.css.CssBorderColorSLXHTML
+border-style:                   org.w3c.css.properties.css1.CssBorderStyleCSS2
+border-top:                     org.w3c.css.properties.css1.CssBorderTopCSS2
+border-right:                   org.w3c.css.properties.css1.CssBorderRightCSS2
+border-left:                    org.w3c.css.properties.css1.CssBorderLeftCSS2
+border-bottom:                  org.w3c.css.properties.css1.CssBorderBottomCSS2
+border:                         at.gv.egiz.bku.slxhtml.css.CssBorderSLXHTML
+
+#
+# Positioning of boxes
+#
+
+# Box type
+#
+# The property for controlling the box type (display) may be supported by a Citizen 
+# Card Environment (cf. [CSS 2], section 9.2).
+
+display:                        org.w3c.css.properties.css1.CssDisplayCSS2
+
+# Positioning scheme
+#
+# The property for defining the positioning scheme for a box (position, cf. [CSS 2], 
+# section 9.3) must not be contained in an instance document to prevent content 
+# from overlapping. Otherwise the instance document must be rejected by the Citizen 
+# Card Environment.
+
+#! position:                       org.w3c.css.properties.css1.CssPosition
+
+# Box spacing
+# 
+# The property for defining the positioning scheme for a box (top, bottom, left, right; 
+# cf. [CSS 2], section 9.3) must not be contained in an instance document to prevent 
+# content from overlapping. Otherwise the instance document must be rejected by the 
+# Citizen Card Environment. 
+ 
+#! top:                            org.w3c.css.properties.css1.CssTop
+#! right:                          org.w3c.css.properties.css1.CssRight
+#! left:                           org.w3c.css.properties.css1.CssLeft
+#! bottom:                         org.w3c.css.properties.css1.CssBottom
+ 
+# Flow around boxes
+#
+# The properties for defining the flow around boxes (float, clear) may be supported by 
+# a Citizen Card Environment (cf. [CSS 2], section 9.5).
+
+float:                          org.w3c.css.properties.css1.CssFloat
+clear:                          org.w3c.css.properties.css1.CssClear
+
+# Positioning of boxes on the z-axis
+#
+# The property for defining the positioning of boxes on the z-axis (z-index, cf. [CSS 2], 
+# section 9.9) must not be contained in an instance document to prevent content from 
+# overlapping. Otherwise the instance document must be rejected by the Citizen Card Environment.
+
+#! z-index:                        org.w3c.css.properties.css1.CssZIndex
+
+# Text direction
+#
+# The properties for controlling the text direction (direction, unicode-bidi) may be 
+# supported by a Citizen Card Environment (cf. [CSS 2], section 9.10).
+
+direction:                      org.w3c.css.properties.css1.CssDirection
+unicode-bidi:                   org.w3c.css.properties.css1.CssUnicodeBidi
+
+#
+# Displaying boxes
+#
+
+# Width and height
+#
+# The properties for specifying the width and height of a box (width, height, cf. [CSS 2], 
+# sections 10.2 and 10.5) must not be supported by a Citizen Card Environment to prevent 
+# content from overlapping. Otherwise the instance document must be rejected by the 
+# Citizen Card Environment.
+# 
+# The properties for specifying the minimum width and height of a box (min-width, min-height) 
+# may be supported by a Citizen Card Environment (cf. [CSS 2], sections 10.4 and 10.7).
+# 
+# The properties for specifying the maximum width and height of a box (max-width, max-height, 
+# cf. [CSS 2], sections 10.4 and 10.7) must not be supported by a Citizen Card Environment 
+# to prevent content from overlapping. Otherwise the instance document must be rejected by 
+# the Citizen Card Environment. 
+
+#! width:                          org.w3c.css.properties.css1.CssWidth
+min-width:                      org.w3c.css.properties.css1.CssMinWidth
+#! max-width:                      org.w3c.css.properties.css1.CssMaxWidth
+min-height:                     org.w3c.css.properties.css1.CssMinHeight
+#! max-height:                     org.w3c.css.properties.css1.CssMaxHeight
+#! height:                         org.w3c.css.properties.css1.CssHeight
+
+# Line height
+#
+# The properties for specifying the line height (line-height, vertical-align) should be 
+# supported by a Citizen Card (cf. [CSS 2], section 10.8). The only exception is the 
+# vertical-align property: In this case a Citizen Card Environment must be able to interpret 
+# the values sub and super.
+
+line-height:                    org.w3c.css.properties.css1.CssLineHeightCSS2
+vertical-align:                 org.w3c.css.properties.css1.CssVerticalAlign
+
+#
+# Visible area in boxes
+#
+
+# The property for specifying the visibility of a box (visibility) may be supported by a 
+# Citizen Card Environment (cf. [CSS 2], section 11).
+#
+# The properties for controlling the visible area of a box (overflow, clip; cf. [CSS 2], 
+# section 11) must not be contained in an instance document to prevent hidden content. Otherwise 
+# the instance document must be rejected by the Citizen Card Environment.
+
+#! overflow:                       org.w3c.css.properties.css1.CssOverflow
+#! clip:                           org.w3c.css.properties.css1.CssClip
+visibility:                     org.w3c.css.properties.css1.CssVisibility
+
+#
+# Generated content, numbering, lists
+#
+
+# Generated content
+#
+# The property for generating content (content) may be supported by a Citizen Card Environment 
+# (cf. [CSS 2], section 12.2).
+
+content:                        org.w3c.css.properties.css1.CssContentCSS2
+
+# Displaying quotation marks
+#
+# The property for displaying quotation marks (quotes) may be supported by a Citizen Card 
+# Environment (cf. [CSS 2], section 12.3).
+
+quotes:                         org.w3c.css.properties.css1.CssQuotes
+
+# Numbering
+#
+# The properties for automatic numbering (counter-reset, counter-increment) may be supported 
+# by a Citizen Card Environment (cf. [CSS 2], section 12.5).
+
+counter-reset:                  org.w3c.css.properties.css1.CssCounterReset
+counter-increment:              org.w3c.css.properties.css1.CssCounterIncrement
+
+#
+# Markers and lists
+#
+
+# Marker spacing
+# 
+# The property for defining the space between a marker and the associated box 
+# (marker-offset) may be supported by a Citizen Card Environment (cf. [CSS 2], 
+# section 12.6.1).
+
+marker-offset:                  org.w3c.css.properties.css1.CssMarkerOffset
+
+# List symbols
+#
+# For the property for selecting the list symbol (list-style-type) a Citizen 
+# Card Environment must support the values none, disc, circle, square, decimal, 
+# decimal-leading-zero, lower-roman, upper-roman, lower-alpha, lower-latin, 
+# upper-alpha and upper-latin. The other values may be supported (cf. [CSS 2], 
+# section 12.6.2).
+
+list-style-type:                org.w3c.css.properties.css1.CssListStyleTypeCSS2
+
+# Position of the list symbol
+#
+# The property for positioning the list symbol in relation to the associated box 
+# (list-style-position) should be supported by a Citizen Card Environment (cf. [CSS 2], 
+# section 12.6.2).
+
+list-style-position:            org.w3c.css.properties.css1.CssListStylePositionCSS2
+
+# Image as a list symbol
+#
+# The property for selecting an image as a list symbol (list-style-image) may be supported 
+# by a Citizen Card Environment (cf. [CSS 2], section 12.6.2). If the Citizen Card Environment 
+# supports this property, then it must proceed in respect of the integration of the image 
+# in the signature as described in section 2.1.7. 
+
+# optional, not supported:
+#! list-style-image:               org.w3c.css.properties.css1.CssListStyleImageCSS2
+
+# Shorthand
+#
+# The property for the shorthand version of the list properties (list-style) should be supported 
+# by a Citizen Card Environment. The recommended values result from the explanations for the 
+# list-style-type, list-style-position and list-style-image properties above (cf. [CSS 2], 
+# section 12.6.2).
+
+list-style:                     org.w3c.css.properties.css1.CssListStyleCSS2
+
+# Page-based media
+#
+# The properties for page-based media may be supported by a Citizen Card Environment (size, marks, 
+# page-break-before, page-break-inside, page-break-after, page, orphans and widows (cf. [CSS 2], 
+# section 13).
+
+page-break-before:              org.w3c.css.properties.paged.PageBreakBefore
+page-break-after:               org.w3c.css.properties.paged.PageBreakAfter
+page-break-inside:              org.w3c.css.properties.paged.PageBreakInside
+page:                           org.w3c.css.properties.paged.Page
+orphans:                        org.w3c.css.properties.paged.Orphans
+widows:                         org.w3c.css.properties.paged.Widows
+
+@page.size:                     org.w3c.css.properties.paged.Size
+@page.marks:                    org.w3c.css.properties.paged.Marks
+@page.page-break-before:        org.w3c.css.properties.paged.PageBreakBefore
+@page.page-break-after:         org.w3c.css.properties.paged.PageBreakAfter
+@page.page-break-inside:        org.w3c.css.properties.paged.PageBreakInside
+@page.page:                     org.w3c.css.properties.paged.Page
+@page.orphans:                  org.w3c.css.properties.paged.Orphans
+@page.widows:                   org.w3c.css.properties.paged.Widows
+
+
+#
+# Colours and background
+#
+
+# A Citizen Card Environment must support all the options for specifying a colour listed in [CSS 2], 
+# section 4.3.6 for a CSS property, if such an option is available for this property according to [CSS 2].
+#
+# The exceptions are the system colours (cf. [CSS 2], section 18.2); these must not be used in an 
+# instance document so as to prevent dependencies on the system environment. Otherwise the instance 
+# document must be rejected by the Citizen Card Environment.
+
+# Colour
+
+# The property for defining the foreground colour of the content of an element (color) must be 
+# supported by a Citizen Card Environment (cf. [CSS 2], section 14.1).
+
+color:                          at.gv.egiz.bku.slxhtml.css.CssColorSLXHTML
+
+# Background
+#
+# The property for defining the background colour of the content of an element (background-color) 
+# must be supported by a Citizen Card Environment (cf. [CSS 2], section 14.2.1).
+#
+# The properties for selecting and controlling an image as background (background-image, background-repeat, 
+# background-position, background-attachment; cf. [CSS 2], section 14.2.1) must not be contained in an 
+# instance document to prevent content from overlapping. Otherwise the instance document must be 
+# rejected by the Citizen Card Environment.
+
+# The property for the shorthand version of the background properties (background) should be supported 
+# by a Citizen Card Environment. The recommended values result from the explanations for the background-color 
+# property above (cf. [CSS 2], section 14.2.1). If the property contains values for selecting and controlling 
+# an image as background, the instance document must be rejected by the Citizen Card Environment.
+
+background-color:               at.gv.egiz.bku.slxhtml.css.CssBackgroundColorSLXHTML
+#! background-image:               org.w3c.css.properties.css1.CssBackgroundImageCSS2
+#! background-repeat:              org.w3c.css.properties.css1.CssBackgroundRepeatCSS2
+#! background-attachment:          org.w3c.css.properties.css1.CssBackgroundAttachmentCSS2
+#! background-position:            org.w3c.css.properties.css1.CssBackgroundPositionCSS2
+background:                     at.gv.egiz.bku.slxhtml.css.CssBackgroundSLXHTML
+
+#
+# Fonts
+#
+#
+# For the property for selecting a font family (font-family), a Citizen Card Environment must 
+# support the predefined values serif, sans-serif and monospaced for the general font families. 
+# All other values may be supported by a Citizen Card Environment (cf. [CSS 2], section 15.2.2).
+#
+# If a preferred font family is specified in the instance document that cannot be displayed by the 
+# Citizen Card Environment, then the Citizen Card Environment may still display the instance 
+# document if another displayable font family has been specified as an alternative. For example, 
+# if the specification in the instance document is font-family: "Times New Roman", serif, then the 
+# Citizen Card Environment may display the instance document in the secure viewer even if it does 
+# not know the Times New Roman font family (as it must always support serif).
+
+font-family:                    org.w3c.css.properties.css1.CssFontFamilyCSS2
+
+# Font style
+#
+# The properties for defining the font style (font-style) and font weight (font-weight) 
+# must be supported by a Citizen Card Environment. The values normal and italic must be supported, 
+# while the value oblique should be supported.
+# 
+# The property for defining the font variant (font-variant) should be supported by a Citizen Card 
+# Environment, while the property for defining the font stretch (font-stretch) may be supported 
+# by a Citizen Card Environment (cf. [CSS 2], section 15.2.3).
+
+font-style:                     org.w3c.css.properties.css1.CssFontStyleCSS2
+font-weight:                    org.w3c.css.properties.css1.CssFontWeightCSS2
+font-variant:                   org.w3c.css.properties.css1.CssFontVariantCSS2
+font-stretch:                   org.w3c.css.properties.css1.CssFontStretchCSS2
+
+# Font size
+#
+# The property for specifying the font size (font-size) must be supported by a Citizen 
+# Card Environment. The property for specifying the stretch ratio (font-size-adjust) may 
+# be supported by a Citizen Card Environment (cf. [CSS 2], section 15.2.4).
+
+font-size:                      org.w3c.css.properties.css1.CssFontSizeCSS2
+font-size-adjust:               org.w3c.css.properties.css1.CssFontSizeAdjustCSS2
+
+# Shorthand
+#
+# The property for the shorthand version of the font properties (font) should be supported by 
+# a Citizen Card Environment (cf. [CSS 2], section 15.2.5). The recommended values result from 
+# the explanations above for the font-style, font-variant, font-weight, font-size and font-family 
+# properties and the explanations for the line-height property in section 3.5.4.2.
+#
+# The additional, predefined values relating to the system fonts used (caption, icon, etc.) must 
+# not be contained in an instance document so as to prevent dependencies on the system environment. 
+# Otherwise the instance document must be rejected by the Citizen Card Environment. 
+
+font:                           at.gv.egiz.bku.slxhtml.css.CssFontSLXHTML
+
+#
+# Displaying text
+#
+
+# Non-displayable characters
+# 
+# If the text of an instance document contains a character that cannot be displayed by the 
+# Citizen Card Environment, then the instance document must be rejected by the Citizen Card 
+# Environment. The character must not be represented by a placeholder.
+
+# FIXME: How to implement?!
+
+# Indent
+#
+# The property for indenting the first line of a text block (text-indent) should be supported 
+# by a Citizen Card Environment (cf. [CSS 2], section 16.1).
+
+text-indent:                    org.w3c.css.properties.css1.CssTextIndent
+
+# Alignment
+#
+# For the property for aligning the content of a text block (text-align) a Citizen Card Environment 
+# must support the values left, right and center. The value justified should be supported, 
+# while the specification of a string value may be supported (cf. [CSS 2], section 16.2).
+
+text-align:                     org.w3c.css.properties.css1.CssTextAlign
+
+# Text decoration
+#
+# For the property for decorating a text (text-decoration; cf. [CSS 2], section 16.3.1) a 
+# Citizen Card Environment must support the values none, underline and line-through.
+#
+# The value blink must not be contained in an instance document. Otherwise the instance 
+# document must be rejected by the Citizen Card Environment.
+#
+# The other values may be supported by a Citizen Card Environment.
+
+text-decoration:                at.gv.egiz.bku.slxhtml.css.CssTextDecorationSLXHTML
+
+# Shadows
+#
+# The property for specifying a text shadow (text-shadow) may be supported by a Citizen Card 
+# Environment (cf. [CSS 2], section 16.3.2).
+
+text-shadow:                    org.w3c.css.properties.css1.CssTextShadow
+
+# Word and letter spacing
+#
+# The word-spacing and letter-spacing should be supported by a Citizen Card Environment 
+# (cf. [CSS 2], section 16.4).
+#
+# An instance document must not contain negative values in order to prevent content from 
+# overlapping. Otherwise the instance document must be rejected by the Citizen Card Environment. 
+
+word-spacing:                   at.gv.egiz.bku.slxhtml.css.CssWordSpacingSLXHTML
+letter-spacing:                 at.gv.egiz.bku.slxhtml.css.CssLetterSpacingSLXHTML
+
+# Capitalisation
+#
+# The property for specifying the capitalisation of the text of an element (text-transform) 
+# may be supported by a Citizen Card Environment (cf. [CSS 2], section 16.5).
+
+text-transform:                 org.w3c.css.properties.css1.CssTextTransform
+
+# White space
+#
+# The property for the handling of white space within the text of an element (white-space) should 
+# be supported by a Citizen Card Environment (cf. [CSS 2], section 16.6).
+
+white-space:                    org.w3c.css.properties.css1.CssWhiteSpace
+
+#
+# Tables
+#
+
+# Position of caption
+#
+# A Citizen Card Environment should support the top and bottom properties for the property for 
+# specifying the position when labelling a table (caption-side); the properties left and right 
+# may be supported (cf. [CSS 2], section 17.4.1).
+
+caption-side:                   org.w3c.css.properties.css2.table.CaptionSide
+
+# Layout algorithm
+#
+# The property for defining the layout algorithm for a table (table-layout) may be supported by 
+# a Citizen Card Environment (cf. [CSS 2], section 17.5.2).
+#
+# However, the fixed value must not be supported because the layout algorithm selected with it can 
+# cause content to overlap.
+#
+# In general, the viewer component of the Citizen Card Environment must use a layout algorithm for a 
+# table that does not generate an overflow, in other words with which the content of every table 
+# element can be rendered so that it does not extend beyond the confines of the table element. 
+# There is an example of such an algorithm in [CSS 2], section 17.5.2, subsection Automatic table layout.
+
+table-layout:                   at.gv.egiz.bku.slxhtml.css.TableLayoutSLXHTML
+row-span:                       org.w3c.css.properties.css2.table.RowSpan
+column-span:                    org.w3c.css.properties.css2.table.ColumnSpan
+
+# Borders
+#
+# The properties for displaying borders in tables (border-collapse, border-spacing, empty-cells) may 
+# be supported by a Citizen Card Environment (cf. [CSS 2], section 17.6).
+
+border-collapse:                org.w3c.css.properties.css2.table.BorderCollapse
+border-spacing:                 org.w3c.css.properties.css2.table.BorderSpacing
+empty-cells:                    org.w3c.css.properties.css2.table.EmptyCells
+
+# Voice output
+#
+# The property for controlling the voice output of the column headers in a table (speak-header) may 
+# be supported by a Citizen Card Environment (cf. [CSS 2], section 17.7.1).
+
+speak-header:                   org.w3c.css.properties.css2.table.SpeakHeader
+
+#
+# User interface
+#
+
+# Cursor format
+#
+# The property for controlling the cursor format (cursor; cf. [CSS 2], section 18.1) must not be 
+# contained in an instance document. Otherwise the instance document must be rejected by the Citizen 
+# Card Environment. 
+
+#! cursor:                         org.w3c.css.properties.css2.user.CursorCSS2
+
+# Contours
+#
+# The properties for defining element contours (outline-width, outline-style, outline-color and 
+# outline; cf. [CSS 2], section 18.4) must not be contained in an instance document. Otherwise the 
+# instance document must be rejected by the Citizen Card Environment. 
+
+#! outline:                        org.w3c.css.properties.css2.user.Outline
+#! outline-width:                  org.w3c.css.properties.css2.user.OutlineWidth
+#! outline-style:                  org.w3c.css.properties.css2.user.OutlineStyle
+#! outline-color:                  org.w3c.css.properties.css2.user.OutlineColor
+
+#
+# Aural Properties
+#
+# The properties for the voice output of a document (cf. [CSS 2], section 19) may be supported 
+# by a Citizen Card Environment.
+
+volume:                         org.w3c.css.properties.aural.ACssVolume
+pause-before:                   org.w3c.css.properties.aural.ACssPauseBefore
+pause-after:                    org.w3c.css.properties.aural.ACssPauseAfter
+pause:                          org.w3c.css.properties.aural.ACssPause
+cue-before:                     org.w3c.css.properties.aural.ACssCueBefore
+cue-after:                      org.w3c.css.properties.aural.ACssCueAfter
+cue:                            org.w3c.css.properties.aural.ACssCue
+play-during:                    org.w3c.css.properties.aural.ACssPlayDuring
+voice-family:                   org.w3c.css.properties.aural.ACssVoiceFamily
+elevation:                      org.w3c.css.properties.aural.ACssElevation
+speech-rate:                    org.w3c.css.properties.aural.ACssSpeechRate
+pitch:                          org.w3c.css.properties.aural.ACssPitch
+pitch-range:                    org.w3c.css.properties.aural.ACssPitchRange
+stress:                         org.w3c.css.properties.aural.ACssStress
+richness:                       org.w3c.css.properties.aural.ACssRichness
+speak-punctuation:              org.w3c.css.properties.aural.ACssSpeakPunctuation
+speak-date:                     org.w3c.css.properties.aural.ACssSpeakDate
+speak-numeral:                  org.w3c.css.properties.aural.ACssSpeakNumeral
+speak-time:                     org.w3c.css.properties.aural.ACssSpeakTime
+speak:                          org.w3c.css.properties.aural.ACssSpeak
+azimuth:                        org.w3c.css.properties.aural.ACssAzimuth
+
+#
+# @page
+#
+# The @page rule for defining the page properties for page-based output media may be 
+# supported by a Citizen Card Environment (cf. [CSS 2], section 13, and section 3.5.7 
+# of this document). 
+#
+
+@page.margin-top:               org.w3c.css.properties.css1.CssMarginTop
+@page.margin-bottom:            org.w3c.css.properties.css1.CssMarginBottom
+@page.margin-left:              org.w3c.css.properties.css1.CssMarginLeft
+@page.margin-right:             org.w3c.css.properties.css1.CssMarginRight
+@page.margin:                   org.w3c.css.properties.css1.CssMargin
+@page.padding-top:              org.w3c.css.properties.css1.CssPaddingTop
+@page.padding-bottom:           org.w3c.css.properties.css1.CssPaddingBottom
+@page.padding-left:             org.w3c.css.properties.css1.CssPaddingLeft
+@page.padding-right:            org.w3c.css.properties.css1.CssPaddingRight
+@page.padding:                  org.w3c.css.properties.css1.CssPadding
+@page.border-top-width:         org.w3c.css.properties.css1.CssBorderTopWidthCSS2
+@page.border-right-width:       org.w3c.css.properties.css1.CssBorderRightWidthCSS2
+@page.border-left-width:        org.w3c.css.properties.css1.CssBorderLeftWidthCSS2
+@page.border-bottom-width:      org.w3c.css.properties.css1.CssBorderBottomWidthCSS2
+@page.border-top-color:         org.w3c.css.properties.css1.CssBorderTopColorCSS2
+@page.border-right-color:       org.w3c.css.properties.css1.CssBorderRightColorCSS2
+@page.border-left-color:        org.w3c.css.properties.css1.CssBorderLeftColorCSS2
+@page.border-bottom-color:      org.w3c.css.properties.css1.CssBorderBottomColorCSS2
+@page.border-top-style:         org.w3c.css.properties.css1.CssBorderTopStyleCSS2
+@page.border-right-style:       org.w3c.css.properties.css1.CssBorderRightStyleCSS2
+@page.border-left-style:        org.w3c.css.properties.css1.CssBorderLeftStyleCSS2
+@page.border-bottom-style:      org.w3c.css.properties.css1.CssBorderBottomStyleCSS2
+@page.border-width:             org.w3c.css.properties.css1.CssBorderWidthCSS2
+@page.border-color:             org.w3c.css.properties.css1.CssBorderColorCSS2
+@page.border-style:             org.w3c.css.properties.css1.CssBorderStyleCSS2
+@page.border-top:               org.w3c.css.properties.css1.CssBorderTopCSS2
+@page.border-right:             org.w3c.css.properties.css1.CssBorderRightCSS2
+@page.border-left:              org.w3c.css.properties.css1.CssBorderLeftCSS2
+@page.border-bottom:            org.w3c.css.properties.css1.CssBorderBottomCSS2
+@page.border:                   org.w3c.css.properties.css1.CssBorderCSS2
+@page.display:                  org.w3c.css.properties.css1.CssDisplayCSS2
+@page.position:                 org.w3c.css.properties.css1.CssPosition
+@page.z-index:                  org.w3c.css.properties.css1.CssZIndex
+@page.direction:                org.w3c.css.properties.css1.CssDirection
+@page.unicode-bidi:             org.w3c.css.properties.css1.CssUnicodeBidi
+@page.top:                      org.w3c.css.properties.css1.CssTop
+@page.right:                    org.w3c.css.properties.css1.CssRight
+@page.left:                     org.w3c.css.properties.css1.CssLeft
+@page.bottom:                   org.w3c.css.properties.css1.CssBottom
+@page.float:                    org.w3c.css.properties.css1.CssFloat
+@page.clear:                    org.w3c.css.properties.css1.CssClear
+
+#
+# @font-face
+#
+# The @font-face rule for describing or referencing additional font families (cf. [CSS 2], 
+# section 15.3) must not be used in an instance document. The viewer component of the Citizen 
+# Card Environment must reject an instance document containing a @font-face rule. 
+
+#! @font-face.font-style:          org.w3c.css.properties.css2.font.FontStyle
+#! @font-face.font-variant:        org.w3c.css.properties.css2.font.FontVariant
+#! @font-face.font-weight:         org.w3c.css.properties.css2.font.FontWeight
+#! @font-face.font-size:           org.w3c.css.properties.css2.font.FontSize
+#! @font-face.font-family:         org.w3c.css.properties.css2.font.FontFamily
+#! @font-face.font-stretch:        org.w3c.css.properties.css2.font.FontStretch
+#! @font-face.unicode-range:       org.w3c.css.properties.css2.font.UnicodeRange
+#! @font-face.units-per-em:        org.w3c.css.properties.css2.font.UnitsPerEm
+#! @font-face.src:                 org.w3c.css.properties.css2.font.Src
+#! @font-face.panose-1:            org.w3c.css.properties.css2.font.Panose1
+#! @font-face.stemv:               org.w3c.css.properties.css2.font.Stemv
+#! @font-face.stemh:               org.w3c.css.properties.css2.font.Stemh
+#! @font-face.slope:               org.w3c.css.properties.css2.font.Slope
+#! @font-face.cap-height:          org.w3c.css.properties.css2.font.CapHeight
+#! @font-face.x-hegiht:            org.w3c.css.properties.css2.font.XHeight
+#! @font-face.widths:              org.w3c.css.properties.css2.font.Widths
+#! @font-face.ascent:              org.w3c.css.properties.css2.font.Ascent
+#! @font-face.descent:             org.w3c.css.properties.css2.font.Descent
+#! @font-face.bbox:                org.w3c.css.properties.css2.font.Bbox
+#! @font-face.baseline:            org.w3c.css.properties.css2.font.Baseline
+#! @font-face.centerline:          org.w3c.css.properties.css2.font.Centerline
+#! @font-face.definition-src:      org.w3c.css.properties.css2.font.DefinitionSrc
+#! @font-face.mathline:            org.w3c.css.properties.css2.font.Mathline
+#! @font-face.topline:             org.w3c.css.properties.css2.font.Topline
diff --git a/BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/ValidatorTest.java b/BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/ValidatorTest.java
new file mode 100644
index 00000000..38c64262
--- /dev/null
+++ b/BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/ValidatorTest.java
@@ -0,0 +1,66 @@
+/*
+* 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.slxhtml;
+
+import static org.junit.Assert.*;
+
+import java.io.InputStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+
+import at.gv.egiz.bku.viewer.ValidationException;
+import at.gv.egiz.bku.viewer.Validator;
+import at.gv.egiz.bku.viewer.ValidatorFactory;
+
+
+public class ValidatorTest {
+  
+  private static Log log = LogFactory.getLog(ValidatorTest.class);
+  
+  @Test
+  public void testGetInstance() {
+    
+    Validator validator = ValidatorFactory.newValidator("application/xhtml+xml");
+    
+    assertNotNull(validator);
+    
+  }
+
+  @Test
+  public void testValidate() throws ValidationException {
+    
+    String slxhtmlFile = "at/gv/egiz/bku/slxhtml/test.xhtml";
+    
+    Validator validator = ValidatorFactory.newValidator("application/xhtml+xml");
+
+    ClassLoader cl = ValidatorTest.class.getClassLoader();
+    InputStream slxhtml = cl.getResourceAsStream(slxhtmlFile);
+    long t0 = System.currentTimeMillis();
+    try {
+      validator.validate(slxhtml, null);
+    } catch (ValidationException e) {
+      e.printStackTrace();
+      throw e;
+    }
+    long t1 = System.currentTimeMillis();
+    log.info("Validated SLXHTML file '" + slxhtmlFile + "' in " + (t1 - t0) + "ms.");
+    
+  }
+  
+}
diff --git a/BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/css/CssValidatorTest.java b/BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/css/CssValidatorTest.java
new file mode 100644
index 00000000..2b4740f9
--- /dev/null
+++ b/BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/css/CssValidatorTest.java
@@ -0,0 +1,75 @@
+/*
+* 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.slxhtml.css;
+
+import static org.junit.Assert.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
+
+import org.junit.Test;
+
+import at.gv.egiz.bku.viewer.ValidationException;
+
+public class CssValidatorTest {
+
+  @Test
+  public void testProperties() throws IOException {
+
+    ClassLoader cs = CssValidatorTest.class.getClassLoader();
+    InputStream is = cs.getResourceAsStream("org/w3c/css/properties/SLXHTMLProperties.properties");
+    
+    assertNotNull(is);
+    
+    Properties cssProperties = new Properties();
+    cssProperties.load(is);
+    
+    Set<String> names = cssProperties.stringPropertyNames();
+    for (String name : names) {
+      String className = cssProperties.getProperty(name);
+      try {
+        Class.forName(className);
+      } catch (ClassNotFoundException e) {
+        fail("Implementation class '" + className + "' for property '" + name + "' not found.");
+      }
+      
+    }
+    
+  }
+  
+  @Test(expected=ValidationException.class)
+  public void testValidator() throws UnsupportedEncodingException, ValidationException {
+    
+    String css = "@charset \"ABCDEFG\";\n" +
+    		" @import url(http://test.abc/test); * { color: black }";
+    ByteArrayInputStream input = new ByteArrayInputStream(css.getBytes("UTF-8"));
+    
+    CSSValidatorSLXHTML validator = new CSSValidatorSLXHTML();
+    
+    Locale locale = new Locale("de");
+    
+    validator.validate(input, locale, "Test", 10);
+    
+  }
+  
+  
+}
diff --git a/BKUViewer/src/test/resources/at/gv/egiz/bku/slxhtml/test.xhtml b/BKUViewer/src/test/resources/at/gv/egiz/bku/slxhtml/test.xhtml
new file mode 100644
index 00000000..cbd29551
--- /dev/null
+++ b/BKUViewer/src/test/resources/at/gv/egiz/bku/slxhtml/test.xhtml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xhtml:html xmlns:xhtml="http://www.w3.org/1999/xhtml">
+    <xhtml:head>
+        <xhtml:title>Ein einfaches SLXHTML-Dokument</xhtml:title>
+        <xhtml:style type="text/css">@font-face { color: red }; p { color: red; }</xhtml:style>
+    </xhtml:head>
+    <xhtml:body>
+        <xhtml:p>Ich bin ein einfacher Text in rot.</xhtml:p>
+    </xhtml:body>
+</xhtml:html>
diff --git a/BKUViewer/src/test/resources/commons-logging.properties b/BKUViewer/src/test/resources/commons-logging.properties
new file mode 100644
index 00000000..29292562
--- /dev/null
+++ b/BKUViewer/src/test/resources/commons-logging.properties
@@ -0,0 +1 @@
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
diff --git a/BKUViewer/src/test/resources/log4j.properties b/BKUViewer/src/test/resources/log4j.properties
new file mode 100644
index 00000000..053eac17
--- /dev/null
+++ b/BKUViewer/src/test/resources/log4j.properties
@@ -0,0 +1,19 @@
+# loglever DEBUG, appender STDOUT
+log4j.rootLogger=TRACE, STDOUT
+#log4j.logger.at.gv.egiz.slbinding.RedirectEventFilter=DEBUG, STDOUT
+
+# STDOUT appender
+log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
+#log4j.appender.STDOUT.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20c |  %10t | %m%n
+#log4j.appender.STDOUT.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+log4j.appender.STDOUT.layout.ConversionPattern=%-5p |%d | %t | %c %x- %m%n
+
+### FILE appender
+#log4j.appender.file=org.apache.log4j.RollingFileAppender
+#log4j.appender.file.maxFileSize=100KB
+#log4j.appender.file.maxBackupIndex=9
+#log4j.appender.file.File=egovbus_ca.log
+#log4j.appender.file.threshold=info
+#log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 2ccf0766..2db0cc84 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
@@ -42,10 +40,13 @@
       <artifactId>commons-httpclient</artifactId>
       <scope>compile</scope>
     </dependency>
+	<dependency>
+      <groupId>xerces</groupId>
+	  <artifactId>xercesImpl</artifactId>
+	</dependency>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
-      <version>2.7.0</version>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/multipart/InputStreamPartSource.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/multipart/InputStreamPartSource.java
index 253f8ff5..1a22f787 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/multipart/InputStreamPartSource.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/multipart/InputStreamPartSource.java
@@ -14,11 +14,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package at.gv.egiz.bku.binding.multipart;
 
 import java.io.IOException;
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/multipart/SLResultPart.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/multipart/SLResultPart.java
index 566b77b3..5585f02e 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/multipart/SLResultPart.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/multipart/SLResultPart.java
@@ -14,11 +14,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package at.gv.egiz.bku.binding.multipart;
 
 import at.gv.egiz.bku.slcommands.SLResult;
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
index 136fa6f3..628326cf 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
@@ -44,7 +44,9 @@ import at.gv.egiz.bku.slcommands.impl.xsect.IdValueFactory;
 import at.gv.egiz.bku.slcommands.impl.xsect.IdValueFactoryImpl;
 import at.gv.egiz.bku.slcommands.impl.xsect.Signature;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
+import at.gv.egiz.bku.slexceptions.SLException;
 import at.gv.egiz.bku.slexceptions.SLRequestException;
+import at.gv.egiz.bku.slexceptions.SLViewerException;
 import at.gv.egiz.dom.DOMUtils;
 import at.gv.egiz.stal.InfoboxReadRequest;
 import at.gv.egiz.stal.InfoboxReadResponse;
@@ -166,9 +168,10 @@ public class CreateXMLSignatureCommandImpl extends SLCommandImpl<CreateXMLSignat
    * Signs the signature.
    * 
    * @throws SLCommandException
-   *           if signing the signature fails
+   *           if signing the signature fails
+   * @throws SLViewerException 
    */
-  private void signXMLSignature() throws SLCommandException {
+  private void signXMLSignature() throws SLCommandException, SLViewerException {
     
     try {
       signature.sign(getCmdCtx().getSTAL(), keyboxIdentifier);
@@ -213,11 +216,9 @@ public class CreateXMLSignatureCommandImpl extends SLCommandImpl<CreateXMLSignat
       
       return new CreateXMLSignatureResultImpl(signature.getDocument());
       
-    } catch (SLCommandException e) {
+    } catch (SLException e) {
       return new ErrorResultImpl(e);
-    } catch (SLRequestException e) {
-      return new ErrorResultImpl(e);
-    }
+    } 
   }
 
   @Override
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
index d25f2526..ae4918ce 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
@@ -30,6 +30,7 @@ import java.nio.charset.Charset;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -71,8 +72,12 @@ import at.gv.egiz.bku.binding.HttpUtil;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLRequestException;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.bku.slexceptions.SLViewerException;
 import at.gv.egiz.bku.utils.urldereferencer.StreamData;
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
+import at.gv.egiz.bku.viewer.ValidationException;
+import at.gv.egiz.bku.viewer.Validator;
+import at.gv.egiz.bku.viewer.ValidatorFactory;
 import at.gv.egiz.dom.DOMUtils;
 import at.gv.egiz.slbinding.impl.XMLContentType;
 
@@ -99,10 +104,51 @@ public class DataObject {
    */
   private static final String[] DEFAULT_PREFFERED_MIME_TYPES = 
     new String[] {
-      "application/xhtml+xml", 
-      "text/plain"
-    };
-  
+      "text/plain",
+      "application/xhtml+xml" 
+    };
+  
+  /**
+   * Validate hash input.
+   */
+  private static boolean validate = false;
+
+  /**
+   * Enable validation of hash data input.
+   * 
+   * @param validate
+   *          <code>true</code> if validation should be enabled, or
+   *          <code>false</code> otherwise.
+   */
+  public static void enableHashDataInputValidation(boolean validate) {
+    DataObject.validate = validate;
+  }
+
+  /**
+   * @return <code>true</code> if hash data input validation is enabled,
+   * or <code>false</code> otherwise.
+   */
+  public static boolean isHashDataInputValidationEnabled() {
+    return validate;
+  }
+  
+  /**
+   * Valid MIME types.
+   */
+  private static String[] validMimeTypes = DEFAULT_PREFFERED_MIME_TYPES;
+
+  /**
+   * Sets the list of valid hash data input media types.
+   * <p>The array is also used for transformation path selection.
+   * The transformation path with a final type, that appears in the
+   * given array in the earliest position is used selected.</p>
+   * 
+   * @param mediaTypes an array of MIME media types.
+   */
+  public static void setValidHashDataInputMediaTypes(String[] mediaTypes) {
+    validMimeTypes = mediaTypes;
+  }
+  
   /**
    * The DOM implementation used.
    */
@@ -184,7 +230,70 @@ public class DataObject {
   public String getDescription() {
     return description;
   }
-
+
+  public void validateHashDataInput() throws SLViewerException {
+    
+    if (validate) {
+
+      if (reference == null) {
+        log.error("Medthod validateHashDataInput() called before reference has been created.");
+        throw new SLViewerException(5000);
+      }
+      
+      InputStream digestInputStream = reference.getDigestInputStream();
+      if (digestInputStream == null) {
+        log.error("Method validateHashDataInput() called before reference has been generated " +
+              "or reference caching is not enabled.");
+        throw new SLViewerException(5000);
+      }
+      
+      if (mimeType == null) {
+        log.info("FinalDataMetaInfo does not specify MIME type of to be signed data.");
+        // TODO: add detailed message
+        throw new SLViewerException(5000);
+      }
+      
+      // get MIME media type
+      String mediaType = mimeType.split(";")[0].trim();
+      // and optional charset 
+      String charset = HttpUtil.getCharset(mimeType, false);
+      
+      if (Arrays.asList(validMimeTypes).contains(mediaType)) {
+        
+        Validator validator;
+        try {
+          validator = ValidatorFactory.newValidator(mediaType);
+        } catch (IllegalArgumentException e) {
+          log.error("No validator found for mime type '" + mediaType + "'.");
+          throw new SLViewerException(5000);
+        }
+        
+        try {
+          validator.validate(digestInputStream, charset);
+        } catch (ValidationException e) {
+          if ("text/plain".equals(mediaType)) {
+            log.info("Data to be displayed contains unsupported characters.", e);
+            // TODO: add detailed message
+            throw new SLViewerException(5003);
+          } else if ("application/xhtml+xml".equals(mediaType)) {
+            // TODO: add detailed message
+            log.info("Standard display format: HTML does not conform to specification.", e);
+            throw new SLViewerException(5004);
+          } else {
+            // TODO: add detailed message
+            log.info("Data to be displayed is invalid.", e);
+            throw new SLViewerException(5000);
+          }
+        }
+        
+      } else {
+        log.info("MIME media type '" + mediaType + "' is not a valid digest input.");
+        throw new SLViewerException(5001); 
+      }
+    }
+    
+  }
+  
   /**
    * Configures this DataObject with the information provided within the given
    * <code>sl:DataObjectInfo</code>.
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALSignature.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALSignature.java
index eba1d96d..2d89c8ae 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALSignature.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALSignature.java
@@ -17,6 +17,8 @@
 package at.gv.egiz.bku.slcommands.impl.xsect;
 
 import at.gv.egiz.bku.slcommands.impl.HashDataInputImpl;
+import at.gv.egiz.bku.slexceptions.SLViewerException;
+
 import java.io.ByteArrayOutputStream;
 import java.security.InvalidKeyException;
 import java.security.InvalidParameterException;
@@ -123,9 +125,14 @@ public class STALSignature extends SignatureSpi {
 //    log.debug("got " + dataObjects.size() + " DataObjects, passing HashDataInputs to STAL SignRequest");
     
     List<HashDataInput> hashDataInputs = new ArrayList<HashDataInput>();
-      for (DataObject dataObject : dataObjects) {
-          hashDataInputs.add(new HashDataInputImpl(dataObject));
+    for (DataObject dataObject : dataObjects) {
+      try {
+        dataObject.validateHashDataInput();
+      } catch (SLViewerException e) {
+        throw new STALSignatureException(e);
       }
+      hashDataInputs.add(new HashDataInputImpl(dataObject));
+    }
     
     SignRequest signRequest = new SignRequest();
     signRequest.setKeyIdentifier(keyboxIdentifier);
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java
index 191f8371..2330ed3f 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java
@@ -81,6 +81,7 @@ import at.buergerkarte.namespaces.securitylayer._1.SignatureInfoCreationType;
 import at.gv.egiz.bku.binding.HttpUtil;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLRequestException;
+import at.gv.egiz.bku.slexceptions.SLViewerException;
 import at.gv.egiz.bku.utils.HexDump;
 import at.gv.egiz.bku.utils.urldereferencer.StreamData;
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
@@ -387,10 +388,11 @@ public class Signature {
    *           if signing the XMLSignature fails
    * @throws SLCommandException
    *           if building the XMLSignature fails
+   * @throws SLViewerException 
    * @throws NullPointerException
    *           if <code>signContext</code> is <code>null</code>
    */
-  public void sign(DOMSignContext signContext) throws MarshalException, XMLSignatureException, SLCommandException {
+  public void sign(DOMSignContext signContext) throws MarshalException, XMLSignatureException, SLCommandException, SLViewerException {
 
     if (xmlSignature == null) {
       buildXMLSignature();
@@ -415,6 +417,9 @@ public class Signature {
       Throwable cause = e.getCause();
       while (cause != null) {
         if (cause instanceof STALSignatureException) {
+          if (((STALSignatureException) cause).getCause() instanceof SLViewerException) {
+            throw (SLViewerException) ((STALSignatureException) cause).getCause(); 
+          }
           int errorCode = ((STALSignatureException) cause).getErrorCode();
           SLCommandException commandException = new SLCommandException(errorCode);
           log.info("Failed to sign signature.", commandException);
@@ -482,11 +487,12 @@ public class Signature {
    *           if signing this Signature fails
    * @throws SLCommandException
    *           if building this Signature fails 
+   * @throws SLViewerException 
    * @throws NullPointerException
    *           if <code>stal</code> or <code>keyboxIdentifier</code> is
    *           <code>null</code>
    */
-  public void sign(STAL stal, String keyboxIdentifier) throws MarshalException, XMLSignatureException, SLCommandException {
+  public void sign(STAL stal, String keyboxIdentifier) throws MarshalException, XMLSignatureException, SLCommandException, SLViewerException {
 
     if (stal == null) {
       throw new NullPointerException("Argument 'stal' must not be null.");
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slexceptions/SLViewerException.java b/bkucommon/src/main/java/at/gv/egiz/bku/slexceptions/SLViewerException.java
index 1d128a00..853328d5 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slexceptions/SLViewerException.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slexceptions/SLViewerException.java
@@ -17,9 +17,12 @@
 package at.gv.egiz.bku.slexceptions;
 
 public class SLViewerException extends SLException {
-
+
+  public SLViewerException(int errorCode) {
+    super(errorCode);
+  }
+
   public SLViewerException(int errorCode, String msg, Object[] args) {
     super(errorCode, msg, args);
-    // TODO Auto-generated constructor stub
   }
 }
\ No newline at end of file
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidationException.java b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidationException.java
new file mode 100644
index 00000000..fb332a09
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidationException.java
@@ -0,0 +1,38 @@
+/*
+* 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.viewer;
+
+public class ValidationException extends Exception {
+
+  private static final long serialVersionUID = 1L;
+
+  public ValidationException() {
+  }
+
+  public ValidationException(String message) {
+    super(message);
+  }
+
+  public ValidationException(Throwable cause) {
+    super(cause);
+  }
+
+  public ValidationException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/viewer/Validator.java b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/Validator.java
new file mode 100644
index 00000000..08b21080
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/Validator.java
@@ -0,0 +1,25 @@
+/*
+* 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.viewer;
+
+import java.io.InputStream;
+
+public interface Validator {
+  
+  public void validate(InputStream is, String charset) throws ValidationException;
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidatorFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidatorFactory.java
new file mode 100644
index 00000000..e16a261e
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidatorFactory.java
@@ -0,0 +1,165 @@
+/*
+* 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.viewer;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class ValidatorFactory {
+  
+  /**
+   * Logging facility.
+   */
+  protected static Log log = LogFactory.getLog(ValidatorFactory.class);
+  
+  private static final Class<Validator> VALIDATOR_CLASS = Validator.class;
+  
+  private static final String SERVICE_ID = "META-INF/services/" + VALIDATOR_CLASS.getName();
+
+  /**
+   * Creates a new Validator for the given <code>mimeType</code>.
+   * 
+   * @param mimeType
+   * 
+   * @return
+   * 
+   * @throws IllegalArgumentException
+   *           if no Validator for the <code>mimeType</code> could be found
+   */
+  public static Validator newValidator(String mimeType) throws IllegalArgumentException {
+    
+    ClassLoader classLoader = ValidatorFactory.class.getClassLoader();
+    ValidatorFactory factory = new ValidatorFactory(classLoader);
+    
+    Validator validator = factory.createValidator(mimeType);
+    
+    if (validator == null) {
+      throw new IllegalArgumentException("Validator for '" + mimeType
+          + "' could not be found.");
+    }
+
+    return validator;
+    
+  }
+  
+  private ClassLoader classLoader;
+  
+  /**
+   * Private constructor.
+   * 
+   * @param classLoader must not be <code>null</code>
+   */
+  private ValidatorFactory(ClassLoader classLoader) {
+    
+    if (classLoader == null) {
+      throw new NullPointerException("Argument 'classLoader' must no be null.");
+    }
+    
+    this.classLoader = classLoader;
+    
+  }
+
+  private Validator createValidator(String mimeType) {
+    
+    Iterator<URL> serviceIterator = createServiceIterator();
+    while (serviceIterator.hasNext()) {
+      URL url = serviceIterator.next();
+      
+      Properties properties = new Properties();
+      try {
+        properties.load(url.openStream());
+      } catch (IOException e) {
+        log.error("Failed to load service properties " + url.toExternalForm());
+        continue;
+      }
+      String className = properties.getProperty(mimeType);
+      if (className != null) {
+        try {
+          return createValidatorInstance(className);
+        } catch (Exception e) {
+          continue;
+        }
+      }
+      
+    }
+    
+    return null;
+    
+  }
+  
+  private Validator createValidatorInstance(String className)
+      throws ClassNotFoundException, InstantiationException,
+      IllegalAccessException {
+    
+    try {
+      Class<?> implClass = classLoader.loadClass(className);
+      return (Validator) implClass.newInstance();
+    } catch (ClassNotFoundException e) {
+      log.error("Validator class '" + className + "' not found.", e);
+      throw e;
+    } catch (InstantiationException e) {
+      log.error("Faild to initialize validator class '" + className + "'.", e);
+      throw e;
+    } catch (IllegalAccessException e) {
+      log.error("Faild to initialize validator class '" + className + "'.", e);
+      throw e;
+    } catch (ClassCastException e) {
+      log.error("Class '" + className + "' is not a validator implementation.", e);
+      throw e;
+    }
+    
+  }
+  
+  private Iterator<URL> createServiceIterator() {
+    
+    try {
+      final Enumeration<URL> resources = classLoader.getResources(SERVICE_ID);
+      return new Iterator<URL> () {
+
+        @Override
+        public boolean hasNext() {
+          return resources.hasMoreElements();
+        }
+
+        @Override
+        public URL next() {
+          return resources.nextElement();
+        }
+
+        @Override
+        public void remove() {
+          throw new UnsupportedOperationException();
+        }
+        
+      };
+    } catch (IOException e) {
+      log.error("Failed to enumerate resources " + SERVICE_ID);
+      List<URL> list = Collections.emptyList(); 
+      return list.iterator();
+    }
+    
+  }
+  
+}
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
index a650d67f..9e34d9ae 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
@@ -68,6 +68,7 @@ import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
 import at.buergerkarte.namespaces.securitylayer._1.SignatureInfoCreationType;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLRequestException;
+import at.gv.egiz.bku.slexceptions.SLViewerException;
 import at.gv.egiz.bku.utils.urldereferencer.StreamData;
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencerContext;
@@ -361,7 +362,7 @@ public class SignatureTest {
     
   }
 
-  private void signAndMarshalSignature(Signature signature) throws MarshalException, XMLSignatureException, SLCommandException {
+  private void signAndMarshalSignature(Signature signature) throws MarshalException, XMLSignatureException, SLCommandException, SLViewerException {
 
     Node parent = signature.getParent();
     Node nextSibling = signature.getNextSibling();
@@ -387,7 +388,7 @@ public class SignatureTest {
 
   @SuppressWarnings("unchecked")
   @Test
-  public void testDataObject_Base64Content_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException {
+  public void testDataObject_Base64Content_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Base64Content_1.xml");
     
@@ -427,7 +428,7 @@ public class SignatureTest {
 
   @SuppressWarnings("unchecked")
   @Test
-  public void testDataObject_XMLContent_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException {
+  public void testDataObject_XMLContent_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_XMLContent_1.xml");
     
@@ -467,7 +468,7 @@ public class SignatureTest {
 
   @SuppressWarnings("unchecked")
   @Test
-  public void testDataObject_XMLContent_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException {
+  public void testDataObject_XMLContent_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_XMLContent_2.xml");
     
@@ -508,7 +509,7 @@ public class SignatureTest {
   
   @SuppressWarnings("unchecked")
   @Test
-  public void testDataObject_LocRefContent_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException {
+  public void testDataObject_LocRefContent_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_LocRefContent_1.xml");
     
@@ -546,7 +547,7 @@ public class SignatureTest {
 
   @SuppressWarnings("unchecked")
   @Test
-  public void testDataObject_LocRefContent_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException {
+  public void testDataObject_LocRefContent_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_LocRefContent_2.xml");
     
@@ -584,7 +585,7 @@ public class SignatureTest {
 
   @SuppressWarnings("unchecked")
   @Test
-  public void testDataObject_Reference_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException {
+  public void testDataObject_Reference_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Reference_1.xml");
     
@@ -622,7 +623,7 @@ public class SignatureTest {
 
   @SuppressWarnings("unchecked")
   @Test
-  public void testDataObject_Detached_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException {
+  public void testDataObject_Detached_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Detached_1.xml");
     
@@ -653,7 +654,7 @@ public class SignatureTest {
   
   @SuppressWarnings("unchecked")
   @Test
-  public void testDataObject_Detached_Base64Content() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException {
+  public void testDataObject_Detached_Base64Content() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Detached_Base64Content.xml");
     
@@ -704,7 +705,7 @@ public class SignatureTest {
   
   @SuppressWarnings("unchecked")
   @Test
-  public void testTransformsInfo_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException {
+  public void testTransformsInfo_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
     CreateXMLSignatureRequestType requestType = unmarshalCreateXMLSignatureRequest("TransformsInfo_1.xml");
     
diff --git a/pom.xml b/pom.xml
index 352257f0..3438e596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,17 +7,18 @@
   <version>1.0-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
-  <modules>
-    <module>utils</module>
-    <module>bkucommon</module>
-    <module>STAL</module>
-    <module>BKUOnline</module>
-    <module>smcc</module>
-    <module>BKULocal</module>
-    <module>BKUApplet</module>
-    <module>smccSTAL</module>
-    <module>STALService</module>
-    <module>BKUCommonGUI</module>
+  <modules>
+    <module>utils</module>
+    <module>bkucommon</module>
+    <module>STAL</module>
+    <module>BKUOnline</module>
+    <module>smcc</module>
+    <module>BKULocal</module>
+    <module>BKUApplet</module>
+    <module>smccSTAL</module>
+    <module>STALService</module>
+    <module>BKUCommonGUI</module>
+    <module>BKUViewer</module>
   </modules>
   <developers>
   	<developer>
@@ -161,6 +162,16 @@
         <version>4.4</version>
         <scope>test</scope>
       </dependency>
+	  <dependency>
+	    <groupId>xerces</groupId>
+	    <artifactId>xercesImpl</artifactId>
+	    <version>2.9.1</version>
+	  </dependency>
+      <dependency>
+	    <groupId>xalan</groupId>
+	    <artifactId>xalan</artifactId>
+	    <version>2.7.0</version>
+	  </dependency>
       <dependency>
         <groupId>iaik</groupId>
         <artifactId>iaik_jce_full_signed</artifactId>
-- 
cgit v1.2.3


From c2ae3db1bc6dcb8ba3eb3461c05e293917c004ca Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 30 Oct 2008 10:33:29 +0000
Subject: Updated SMCC to use exclusive access and to throw exceptions upon
 locked or not activated cards. Improved locale support in the security layer
 request and response processing. Fixed issue in STAL which prevented the use
 of RSA-SHA1 signatures. Added additional parameters to the applet test pages.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@128 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/PinDocument.java  |   2 +-
 .../egiz/bku/online/webapp/BKURequestHandler.java  |  20 +-
 BKUOnline/src/main/webapp/HTTP-ohne.html           |  11 +-
 BKUOnline/src/main/webapp/appletPage.jsp           |  29 +-
 .../at/gv/egiz/stal/util/JCEAlgorithmNames.java    |   4 +-
 .../gv/egiz/bku/binding/HTTPBindingProcessor.java  |   3 +-
 .../gv/egiz/bku/slcommands/SLCommandContext.java   |  17 +-
 .../impl/CreateXMLSignatureCommandImpl.java        |   4 +-
 .../egiz/bku/slcommands/impl/ErrorResultImpl.java  |  42 ++-
 .../slcommands/impl/InfoboxReadCommandImpl.java    |   2 +-
 .../gv/egiz/bku/slcommands/impl/SLResultImpl.java  |   8 +-
 .../bku/slcommands/impl/ErrorResultImplTest.java   |   3 +-
 smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java   | 348 ++++++++++++---------
 .../at/gv/egiz/smcc/AbstractSignatureCard.java     | 169 +++++++---
 .../at/gv/egiz/smcc/FileNotFoundException.java     |  38 +++
 .../main/java/at/gv/egiz/smcc/LockedException.java |  38 +++
 .../at/gv/egiz/smcc/NotActivatedException.java     |  44 +++
 .../src/main/java/at/gv/egiz/smcc/STARCOSCard.java | 339 ++++++++++++--------
 smcc/src/main/java/at/gv/egiz/smcc/SWCard.java     |  79 ++++-
 .../at/gv/egiz/smcc/SignatureCardException.java    |   2 +-
 .../java/at/gv/egiz/smcc/SignatureCardFactory.java | 223 +++++++++++--
 .../java/at/gv/egiz/smcc/util/SmartCardIO.java     |   3 +-
 .../test/java/at/gv/egiz/smcc/STARCOSCardTest.java |  92 ++++++
 .../bku/smccstal/InfoBoxReadRequestHandler.java    |   8 +
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |  10 +-
 25 files changed, 1149 insertions(+), 389 deletions(-)
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/FileNotFoundException.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/LockedException.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/NotActivatedException.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java

(limited to 'bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
index 8ae9d7a3..2054ae86 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
@@ -46,7 +46,7 @@ class PINDocument extends PlainDocument {
 
         @Override
         public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
-            if (pinSpec.getMaxLength() >= (getLength() + str.length())) {
+            if (pinSpec.getMaxLength() < 0 || pinSpec.getMaxLength() >= (getLength() + str.length())) {
                 boolean matches = true;
                 for (int i = 0; i < str.length(); i++) {
                     Matcher m = pinPattern.matcher(str.substring(i, i + 1));
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 6f3b9d7f..9092e3f9 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
@@ -44,6 +44,8 @@ import at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage;
  */
 public class BKURequestHandler extends SpringBKUServlet {
 
+  private static final long serialVersionUID = 1L;
+
   public final static String REDIRECT_URL = "appletPage.jsp";
 
   protected Log log = LogFactory.getLog(BKURequestHandler.class);
@@ -105,6 +107,8 @@ public class BKURequestHandler extends SpringBKUServlet {
     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);
     if (width != null) {
       try {
         log.trace("Found applet width parameter: " + width);
@@ -124,12 +128,16 @@ public class BKURequestHandler extends SpringBKUServlet {
       }
     }
     if (background != null) {
-      try {
-        log.trace("Found applet background parameter: " + background);
-        session.setAttribute("appletBackground", background);
-      } catch (NumberFormatException nfe) {
-        log.warn(nfe);
-      }
+      log.trace("Found applet background parameter: " + background);
+      session.setAttribute("appletBackground", background);
+    }
+    if (guiStyle != null) {
+      log.trace("Found applet GUI style parameter: " + guiStyle);
+      session.setAttribute("appletGuiStyle", guiStyle);
+    }
+    if (hashDataDisplay != null) {
+      log.trace("Found applet hash data display parameter: " + hashDataDisplay);
+      session.setAttribute("appletHashDataDisplay", hashDataDisplay);
     }
 
     resp.sendRedirect(REDIRECT_URL);
diff --git a/BKUOnline/src/main/webapp/HTTP-ohne.html b/BKUOnline/src/main/webapp/HTTP-ohne.html
index 1923113e..044432ce 100644
--- a/BKUOnline/src/main/webapp/HTTP-ohne.html
+++ b/BKUOnline/src/main/webapp/HTTP-ohne.html
@@ -92,8 +92,17 @@ legend {
   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">GUI Style</label> 
+	<input type="radio" name="appletHashDataDisplay" value="external" checked="checked">external
+	<input type="radio" name="appletHashDataDisplay" value="internal">internal
+</p>
 
-</textarea></p>
 <!-- 
 <p><label for="RedirectURL">RedirectURL</label> <input
 	name="RedirectURL" value="" id="RedirectURL"></p>
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index 950141c4..ffb67828 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -20,7 +20,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MOCCA Appletpage</title>
+<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>
 <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
@@ -29,19 +29,18 @@
 </head>
 <body>
 <%
-  int width = session.getAttribute("appletWidth") == null
-					? 190
-					: (Integer) session.getAttribute("appletWidth");
-			int height = session.getAttribute("appletHeight") == null
-					? 130
-					: (Integer) session.getAttribute("appletHeight");
-			String backgroundImg = (String) session
-					.getAttribute("appletBackground");
+  int width = session.getAttribute("appletWidth") == null ? 190
+      : (Integer) session.getAttribute("appletWidth");
+  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");
 %>
 <script>
 	if (!deployJava.versionCheck('1.6.0_04+')) {
 		document
-				.write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">');
+				.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',
@@ -51,15 +50,15 @@
 			height :<%=height%>
 		};
 		var parameters = {
-                        GuiStyle : 'simple',
+            GuiStyle : '<%=guiStyle%>',
 			Background : '<%=backgroundImg%>',
-			WSDL_URL :'../stal?wsdl',
-                        HashDataDisplay : 'external',
-                        HashDataURL : '../hashDataInput',
+			WSDL_URL : '../stal?wsdl',
+            HashDataDisplay : '<%=hashDataDisplay%>',
+            HashDataURL : '../hashDataInput',
 			SessionID : '<%=session.getId()%>',
 			RedirectURL : '../bkuResult'
 		};
-		var version = '1.6.0_02';
+		var version = '1.6.0_04';
 		deployJava.runApplet(attributes, parameters, version);
 	}
 </script>
diff --git a/STAL/src/main/java/at/gv/egiz/stal/util/JCEAlgorithmNames.java b/STAL/src/main/java/at/gv/egiz/stal/util/JCEAlgorithmNames.java
index 7e8a767e..c162eed4 100644
--- a/STAL/src/main/java/at/gv/egiz/stal/util/JCEAlgorithmNames.java
+++ b/STAL/src/main/java/at/gv/egiz/stal/util/JCEAlgorithmNames.java
@@ -31,7 +31,7 @@ public class JCEAlgorithmNames {
   
   public static String[] SHA_1_ALGORITMS = {
       "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1",
-      "http://www.w3.org/2000/09/xmldsig#sha1" };
+      "http://www.w3.org/2000/09/xmldsig#rsa-sha1" };
 
   private static JCEAlgorithmNames instance = new JCEAlgorithmNames();
 
@@ -42,7 +42,7 @@ public class JCEAlgorithmNames {
   }
 
   public static String getJCEHashName(String xmlAlgorithmURI) {
-    return instance.hashNameMap.get(xmlAlgorithmURI);
+     return instance.hashNameMap.get(xmlAlgorithmURI);
   }
 
   public void registerHash(String xmlAlgorithmURI, String jceName) {
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
index 5e44e82b..4a22874c 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
@@ -564,6 +564,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
 		SLCommandContext commandCtx = new SLCommandContext();
 		commandCtx.setSTAL(getSTAL());
 		commandCtx.setURLDereferencerContext(new SimpleFormDataContextImpl(this));
+		commandCtx.setLocale(locale);
 		slCommand = SLCommandFactory.getInstance().createSLCommand(source,
 				commandCtx);
 		log.debug("Created new command: " + slCommand);
@@ -731,7 +732,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
 	protected void handleBindingProcessorError(OutputStream os, String encoding,
 			Templates templates) throws IOException {
 		log.debug("Writing error as result");
-		ErrorResultImpl error = new ErrorResultImpl(bindingProcessorError);
+		ErrorResultImpl error = new ErrorResultImpl(bindingProcessorError, locale);
 		error.writeTo(new StreamResult(new OutputStreamWriter(os, encoding)), templates);
 	}
 
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandContext.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandContext.java
index c95736bd..5af2afac 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandContext.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandContext.java
@@ -16,13 +16,17 @@
 */
 package at.gv.egiz.bku.slcommands;
 
+import java.util.Locale;
+
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencerContext;
 import at.gv.egiz.stal.STAL;
 
 public class SLCommandContext {
   
   private STAL stal;
-  private URLDereferencerContext urlDerefCtx;
+  private URLDereferencerContext urlDerefCtx;
+  
+  private Locale locale;
 
   public void setSTAL(STAL aStal) {
     this.stal = aStal;
@@ -38,5 +42,14 @@ public class SLCommandContext {
 
   public URLDereferencerContext getURLDereferencerContext() {
     return urlDerefCtx;
-  }
+  }
+
+  public Locale getLocale() {
+    return locale;
+  }
+
+  public void setLocale(Locale locale) {
+    this.locale = locale;
+  }
+  
 }
\ No newline at end of file
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
index 628326cf..6462bcf6 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
@@ -216,8 +216,8 @@ public class CreateXMLSignatureCommandImpl extends SLCommandImpl<CreateXMLSignat
       
       return new CreateXMLSignatureResultImpl(signature.getDocument());
       
-    } catch (SLException e) {
-      return new ErrorResultImpl(e);
+    } catch (SLException e) {
+      return new ErrorResultImpl(e, cmdCtx.getLocale());
     } 
   }
 
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImpl.java
index 176ba001..5d0f0de0 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImpl.java
@@ -16,6 +16,8 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
+import java.util.Locale;
+
 import javax.xml.transform.Result;
 import javax.xml.transform.Templates;
 
@@ -32,22 +34,34 @@ public class ErrorResultImpl extends SLResultImpl implements ErrorResult {
   /**
    * The exception containing information provided in the <code>ErrorResponse</code>.
    */
-  protected SLException slException;
-
-  /**
-   * Creates a new instance of this ErrorResultImpl with the given
-   * <code>slException</code> containing information provided in the
-   * <code>ErrorResponse</code>.
-   * 
-   * @param slException the exception 
-   */
-  public ErrorResultImpl(SLException slException) {
-    this.slException = slException;
-  }
-
+  protected SLException slException;
+  
+  /**
+   * The locale to be used for rendering an <code>ErrorResponse</code>.
+   */
+  protected Locale locale;
+  
+  /**
+   * Creates a new instance of this ErrorResultImpl with the given
+   * <code>slException</code> containing information provided in the
+   * <code>ErrorResponse</code> and the <code>locale</code> for rendering
+   * the <code>ErrorResponse</code>.
+   * 
+   * @param slException the exception
+   * @param locale the locale
+   */
+  public ErrorResultImpl(SLException slException, Locale locale) {
+    this.slException = slException;
+    this.locale = locale;
+  }
+
   @Override
   public void writeTo(Result result, Templates templates) {
-    writeErrorTo(slException, result, templates);
+    if (locale == null) {
+      writeErrorTo(slException, result, templates);
+    } else {
+      writeErrorTo(slException, result, templates, locale);
+    }
   }
   
 }
\ No newline at end of file
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 d23c0598..c7bb5205 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
@@ -279,7 +279,7 @@ public class InfoboxReadCommandImpl extends SLCommandImpl<InfoboxReadRequestType
         throw new SLCommandException(4000);
       }
     } catch (SLCommandException e) {
-      return new ErrorResultImpl(e);
+      return new ErrorResultImpl(e, cmdCtx.getLocale());
     }
   }
  
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 57309182..7306b237 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,8 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
+import java.util.Locale;
+
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
@@ -181,6 +183,10 @@ public abstract class SLResultImpl implements SLResult {
   }
   
   protected void writeErrorTo(SLException slException, Result result, Templates templates) {
+    writeErrorTo(slException, result, templates, Locale.getDefault());
+  }
+  
+  protected void writeErrorTo(SLException slException, Result result, Templates templates, Locale locale) {
     
     TransformerHandler transformerHandler = null;
     if (templates != null) {
@@ -195,7 +201,7 @@ public abstract class SLResultImpl implements SLResult {
     ObjectFactory factory = new ObjectFactory();
     ErrorResponseType responseType = factory.createErrorResponseType();
     responseType.setErrorCode(slException.getErrorCode());
-    responseType.setInfo(slException.getDetailedMsg());
+    responseType.setInfo(slException.getLocalizedMessage(locale));
     JAXBElement<ErrorResponseType> response = factory.createErrorResponse(responseType);
     
     Marshaller marshaller = getMarshaller();
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImplTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImplTest.java
index 8455e934..f10ca520 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImplTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImplTest.java
@@ -17,6 +17,7 @@
 package at.gv.egiz.bku.slcommands.impl;
 
 import java.io.ByteArrayOutputStream;
+import java.util.Locale;
 
 import javax.xml.transform.stream.StreamResult;
 
@@ -31,7 +32,7 @@ public class ErrorResultImplTest {
   public void writeTo() {
     
     SLException slException = new SLException(0,"test.noerror", null);
-    ErrorResult errorResult = new ErrorResultImpl(slException);
+    ErrorResult errorResult = new ErrorResultImpl(slException, Locale.getDefault());
     
     ByteArrayOutputStream stream = new ByteArrayOutputStream();
     StreamResult result = new StreamResult(stream);
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
index abe086ee..9e56701f 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
@@ -30,12 +30,18 @@ package at.gv.egiz.smcc;
 
 import java.nio.charset.Charset;
 
+import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
 import javax.smartcardio.CommandAPDU;
 import javax.smartcardio.ResponseAPDU;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
+  
+  private static Log log = LogFactory.getLog(ACOSCard.class);
 
   public static final byte[] AID_DEC = new byte[] { (byte) 0xA0, (byte) 0x00,
       (byte) 0x00, (byte) 0x01, (byte) 0x18, (byte) 0x45, (byte) 0x4E };
@@ -97,7 +103,145 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
     super("at/gv/egiz/smcc/ACOSCard");
   }
 
-  byte[] selectFileAID(byte[] fid) throws CardException, SignatureCardException {
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.SignatureCard#getCertificate(at.gv.egiz.smcc.SignatureCard.KeyboxName)
+   */
+  public byte[] getCertificate(KeyboxName keyboxName)
+      throws SignatureCardException {
+  
+    byte[] aid;
+    byte[] efc;
+    int maxsize;
+    if (keyboxName == KeyboxName.SECURE_SIGNATURE_KEYPAIR) {
+      aid = AID_SIG;
+      efc = EF_C_CH_DS;
+      maxsize = EF_C_CH_DS_MAX_SIZE;
+    } else if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
+      aid = AID_DEC;
+      efc = EF_C_CH_EKEY;
+      maxsize = EF_C_CH_EKEY_MAX_SIZE;
+    } else {
+      throw new IllegalArgumentException("Keybox " + keyboxName
+          + " not supported.");
+    }
+
+    log.debug("Get certificate for keybox '" + keyboxName.getKeyboxName() + "'" +
+        " (AID=" + toString(aid) + " EF=" + toString(efc) + ").");
+    
+    try {
+      Card card = getCardChannel().getCard();
+      try {
+        card.beginExclusive();
+        return readTLVFile(aid, efc, maxsize + 15000);
+      } catch (FileNotFoundException e) {
+        // if certificate is not present, 
+        // the citizen card application has not been activated
+        throw new NotActivatedException();
+      } finally {
+        card.endExclusive();
+      }
+    } catch (CardException e) {
+      throw new SignatureCardException("Failed to get exclusive card access.");
+    }
+
+    
+  }
+
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.SignatureCard#getInfobox(java.lang.String, at.gv.egiz.smcc.PINProvider, java.lang.String)
+   */
+  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
+      throws SignatureCardException {
+  
+    if ("IdentityLink".equals(infobox)) {
+  
+      PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("inf.pin.name"));
+      
+      try {
+        Card card = getCardChannel().getCard();
+        try {
+          card.beginExclusive();
+          return readTLVFilePIN(AID_DEC, EF_INFOBOX, KID_PIN_INF, provider,
+              spec, EF_INFOBOX_MAX_SIZE);
+        } catch (FileNotFoundException e) {
+          // if certificate is not present, 
+          // the citizen card application has not been activated
+          throw new NotActivatedException();
+        } finally {
+          card.endExclusive();
+        }
+      } catch (CardException e) {
+        throw new SignatureCardException("Failed to get exclusive card access.");
+      }
+  
+    } else {
+      throw new IllegalArgumentException("Infobox '" + infobox
+          + "' not supported.");
+    }
+  
+  }
+
+  public byte[] createSignature(byte[] hash, KeyboxName keyboxName,
+      PINProvider provider) throws SignatureCardException {
+  
+    if (hash.length != 20) {
+      throw new IllegalArgumentException("Hash value must be of length 20.");
+    }
+  
+    try {
+      Card card = getCardChannel().getCard();
+      try {
+        card.beginExclusive();
+        
+        if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)) {
+
+          // SELECT DF
+          selectFileFID(DF_SIG);
+          // VERIFY
+          verifyPIN(provider, new PINSpec(6, 10, "[0-9]", getResourceBundle()
+              .getString("sig.pin.name")), KID_PIN_SIG);
+          // MSE: SET DST
+          mseSetDST(0x81, 0xb6, DST_SIG);
+          // PSO: HASH
+          psoHash(hash);
+          // PSO: COMPUTE DIGITAL SIGNATURE
+          return psoComputDigitalSiganture();
+      
+        } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)) {
+
+          // SELECT DF
+          selectFileFID(DF_DEC);
+          // VERIFY
+          verifyPIN(provider, new PINSpec(4, 4, "[0-9]", getResourceBundle()
+              .getString("dec.pin.name")), KID_PIN_DEC);
+          // MSE: SET DST
+          mseSetDST(0x41, 0xa4, DST_DEC);
+          // INTERNAL AUTHENTICATE
+          return internalAuthenticate(hash);
+
+          
+          // 00 88 10 00 23 30 21 30 09 06 05 2B 0E 03 02 1A 05 00 04 14 54 26 F0 EA  AF EA F0 4E D4 A1 AD BF 66 D4 A5 9B 45 6F AF 79 00
+          // 00 88 10 00 23 30 21 30 09 06 05 2B 0E 03 02 1A 05 00 04 14 DF 8C AB 8F E2 AD AC 7B 5A AF BE E9 44 5E 95 99 FA AF 2F 48 00
+          
+        } else {
+          throw new IllegalArgumentException("KeyboxName '" + keyboxName
+              + "' not supported.");
+        }
+        
+      } catch (FileNotFoundException e) {
+        // if certificate is not present, 
+        // the citizen card application has not been activated
+        throw new NotActivatedException();
+      } finally {
+        card.endExclusive();
+      }
+    } catch (CardException e) {
+      throw new SignatureCardException("Failed to get exclusive card access.");
+    }
+
+  }
+
+  protected byte[] selectFileAID(byte[] fid) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
     ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x04,
         0x00, fid, 256));
@@ -109,18 +253,40 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
     }
   }
 
-  byte[] selectFileFID(byte[] fid) throws CardException, SignatureCardException {
+  protected ResponseAPDU selectFileFID(byte[] fid) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
-    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x00,
+    return transmit(channel, new CommandAPDU(0x00, 0xA4, 0x00,
         0x00, fid, 256));
-    if (resp.getSW() == 0x6a82) {
-      throw new SignatureCardException("Failed to select file (FID="
-          + toString(fid) + "): SW=" + Integer.toHexString(resp.getSW()) + ")");
+  }
+
+  protected int verifyPIN(String pin, byte kid) throws CardException, SignatureCardException {
+    
+    CardChannel channel = getCardChannel();
+
+    byte[] asciiPIN = pin.getBytes(Charset.forName("ASCII"));
+    byte[] encodedPIN = new byte[8];
+    System.arraycopy(asciiPIN, 0, encodedPIN, 0, Math.min(asciiPIN.length,
+        encodedPIN.length));
+
+    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00,
+        kid, encodedPIN), false);
+    
+    if (resp.getSW() == 0x63c0) {
+      throw new LockedException("PIN locked.");
+    } else if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
+      // return number of possible retries
+      return resp.getSW2() & 0x0f;
+    } else if (resp.getSW() == 0x6983) {
+      throw new NotActivatedException();
+    } else if (resp.getSW() == 0x9000) {
+      return -1;
     } else {
-      return resp.getBytes();
+      throw new SignatureCardException("Failed to verify pin: SW="
+          + Integer.toHexString(resp.getSW()) + ".");
     }
-  }
 
+  }
+  
   /**
    * 
    * @param pinProvider
@@ -128,56 +294,30 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
    *          the PIN spec to be given to the pinProvider
    * @param kid
    *          the KID (key identifier) of the PIN to be verified
-   * @param kfpc
-   *          acutal value of the KFCP (key fault presentation counter) or less
-   *          than 0 if actual value is unknown
-   * 
-   * @return -1 if the PIN has been verifyed successfully, or else the new value
-   *         of the KFCP (key fault presentation counter)
-   * 
    * @throws CancelledException
    *           if the user canceld the operation
    * @throws javax.smartcardio.CardException
    * @throws at.gv.egiz.smcc.SignatureCardException
    */
-  int verifyPIN(PINProvider pinProvider, PINSpec spec, byte kid, int kfpc)
+  protected void verifyPIN(PINProvider pinProvider, PINSpec spec, byte kid)
       throws CardException, CancelledException, SignatureCardException {
 
-    CardChannel channel = getCardChannel();
-
-    // get PIN
-    String pin = pinProvider.providePIN(spec, kfpc);
-    if (pin == null) {
-      // User canceld operation
-      // throw new CancelledException("User canceld PIN entry");
-      return -2;
-    }
-
-    byte[] asciiPIN = pin.getBytes(Charset.forName("ASCII"));
-    byte[] encodedPIN = new byte[8];
-    System.arraycopy(asciiPIN, 0, encodedPIN, 0, Math.min(asciiPIN.length,
-        encodedPIN.length));
-
-    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00,
-        kid, encodedPIN));
-    if (resp.getSW1() == (byte) 0x63 && resp.getSW2() >> 4 == (byte) 0xc) {
-      return resp.getSW2() & (byte) 0x0f;
-    } else if (resp.getSW() == 0x6983) {
-      // PIN blocked
-      throw new SignatureCardException(spec.getLocalizedName() + " blocked.");
-    } else if (resp.getSW() != 0x9000) {
-      throw new SignatureCardException("Failed to verify pin: SW="
-          + Integer.toHexString(resp.getSW()) + ".");
-    } else {
-      return -1;
-    }
-
+    int retries = -1;
+    do {
+      String pin = pinProvider.providePIN(spec, retries);
+      if (pin == null) {
+        // user canceled operation
+        throw new CancelledException("User canceled operation");
+      } 
+      retries = verifyPIN(pin, kid);
+    } while (retries > 0);
+      
   }
-
-  void mseSetDST(byte[] dst) throws CardException, SignatureCardException {
+    
+  void mseSetDST(int p1, int p2, byte[] dst) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
-    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x22, 0x81,
-        0xB6, dst));
+    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x22, p1,
+        p2, dst));
     if (resp.getSW() != 0x9000) {
       throw new SignatureCardException("MSE:SET DST failed: SW="
           + Integer.toHexString(resp.getSW()));
@@ -207,102 +347,30 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
       return resp.getData();
     }
   }
-
-  public byte[] getCertificate(KeyboxName keyboxName)
-      throws SignatureCardException {
-
-    if (keyboxName == KeyboxName.SECURE_SIGNATURE_KEYPAIR) {
-      return readTLVFile(AID_SIG, EF_C_CH_DS, EF_C_CH_DS_MAX_SIZE);
-    } else if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
-      return readTLVFile(AID_DEC, EF_C_CH_EKEY, EF_C_CH_EKEY_MAX_SIZE);
-    } else {
-      throw new IllegalArgumentException("Keybox " + keyboxName
-          + " not supported.");
-    }
-
-  }
-
-  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
-      throws SignatureCardException {
-
-    if ("IdentityLink".equals(infobox)) {
-
-      PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString(
-          "inf.pin.name"));
-      try {
-        byte[] res = readTLVFilePIN(AID_DEC, EF_INFOBOX, KID_PIN_INF, provider,
-            spec, EF_INFOBOX_MAX_SIZE);
-        return res;
-      } catch (Exception e) {
-        throw new SecurityException(e);
-      }
-
+  
+  byte[] internalAuthenticate(byte[] hash) throws CardException, SignatureCardException {
+    byte[] digestInfo = new byte[] {
+        (byte) 0x30, (byte) 0x21, (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x05, (byte) 0x2B, (byte) 0x0E, 
+        (byte) 0x03, (byte) 0x02, (byte) 0x1A, (byte) 0x05, (byte) 0x00, (byte) 0x04
+    };
+    
+    byte[] data = new byte[digestInfo.length + hash.length + 1];
+    
+    System.arraycopy(digestInfo, 0, data, 0, digestInfo.length);
+    data[digestInfo.length] = (byte) hash.length;
+    System.arraycopy(hash, 0, data, digestInfo.length + 1, hash.length);
+    
+    CardChannel channel = getCardChannel();
+    
+    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x88, 0x10, 0x00, data, 256));
+    if (resp.getSW() != 0x9000) {
+      throw new SignatureCardException("INTERNAL AUTHENTICATE failed: SW=" + Integer.toHexString(resp.getSW()));
     } else {
-      throw new IllegalArgumentException("Infobox '" + infobox
-          + "' not supported.");
+      return resp.getData();
     }
-
   }
 
   public String toString() {
     return "a-sign premium";
   }
-
-  public byte[] createSignature(byte[] hash, KeyboxName keyboxName,
-      PINProvider provider) throws SignatureCardException {
-
-    if (hash.length != 20) {
-      throw new IllegalArgumentException("Hash value must be of length 20");
-    }
-
-    byte[] fid;
-    byte kid;
-    byte[] dst;
-    PINSpec spec;
-    if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)) {
-      fid = DF_SIG;
-      kid = KID_PIN_SIG;
-      dst = DST_SIG;
-      spec = new PINSpec(6, 10, "[0-9]", getResourceBundle().getString(
-          "sig.pin.name"));
-
-    } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)) {
-      fid = DF_DEC;
-      kid = KID_PIN_DEC;
-      dst = DST_DEC;
-      spec = new PINSpec(6, 10, "[0-9]", getResourceBundle().getString(
-          "dec.pin.name"));
-
-    } else {
-      throw new IllegalArgumentException("KeyboxName '" + keyboxName
-          + "' not supported.");
-    }
-
-    try {
-
-      // SELECT DF
-      selectFileFID(fid);
-      // VERIFY
-      int kfpc = -1;
-      while (true) {
-        kfpc = verifyPIN(provider, spec, kid, kfpc);
-        if (kfpc < -1) {
-          return null;
-        } else if (kfpc < 0) {
-          break;
-        }
-      }
-      // MSE: SET DST
-      mseSetDST(dst);
-      // PSO: HASH
-      psoHash(hash);
-      // PSO: COMPUTE DIGITAL SIGNATURE
-      byte[] rs = psoComputDigitalSiganture();
-
-      return rs;
-
-    } catch (CardException e) {
-      throw new SignatureCardException("Failed to create signature.", e);
-    }
-  }
 }
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 77a3e2ea..cebc63fc 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -31,7 +31,6 @@ package at.gv.egiz.smcc;
 import java.nio.ByteBuffer;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.logging.Logger;
 
 import javax.smartcardio.ATR;
 import javax.smartcardio.Card;
@@ -60,7 +59,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     this.resourceBundleName = resourceBundleName;
   }
 
-  String toString(byte[] b) {
+  protected String toString(byte[] b) {
     StringBuffer sb = new StringBuffer();
     if (b != null && b.length > 0) {
       sb.append(Integer.toHexString((b[0] & 240) >> 4));
@@ -74,13 +73,46 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     return sb.toString();
   }
 
-  abstract byte[] selectFileAID(byte[] fid) throws CardException,
+  protected abstract byte[] selectFileAID(byte[] fid) throws CardException,
       SignatureCardException;
 
-  abstract byte[] selectFileFID(byte[] fid) throws CardException,
+  protected abstract ResponseAPDU selectFileFID(byte[] fid) throws CardException,
       SignatureCardException;
 
-  byte[] readBinary(CardChannel channel, int offset, int len)
+  /**
+   * VERIFY PIN
+   * 
+   * <p>
+   * Implementations of this method should call
+   * {@link PINProvider#providePIN(PINSpec, int)} to retrieve the PIN entered by
+   * the user and VERIFY PIN on the smart card until the PIN has been
+   * successfully verified.
+   * </p>
+   * 
+   * @param pinProvider
+   *          the PINProvider
+   * @param spec
+   *          the PINSpec
+   * @param kid
+   *          the key ID (KID) of the PIN to verify
+   * 
+   * @throws CardException
+   *           if smart card communication fails
+   * 
+   * @throws CancelledException
+   *           if the PINProvider indicated that the user canceled the PIN entry
+   * @throws NotActivatedException
+   *           if the card application has not been activated
+   * @throws LockedException
+   *           if the card application is locked
+   * 
+   * @throws SignatureCardException
+   *           if VERIFY PIN fails
+   */
+  protected abstract void verifyPIN(PINProvider pinProvider, PINSpec spec,
+      byte kid) throws CardException, SignatureCardException;
+
+  protected byte[] readBinary(CardChannel channel, int offset, int len)
       throws CardException, SignatureCardException {
 
     ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xB0,
@@ -94,7 +126,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   }
 
-  int readBinary(int offset, int len, byte[] b) throws CardException,
+  protected int readBinary(int offset, int len, byte[] b) throws CardException,
       SignatureCardException {
 
     if (b.length < len) {
@@ -114,7 +146,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   }
 
-  byte[] readBinaryTLV(int maxSize, byte expectedType) throws CardException,
+  protected byte[] readBinaryTLV(int maxSize, byte expectedType) throws CardException,
       SignatureCardException {
 
     CardChannel channel = getCardChannel();
@@ -150,15 +182,38 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   }
 
-  abstract int verifyPIN(PINProvider pinProvider, PINSpec spec, byte kid,
-      int kfpc) throws CardException, SignatureCardException;
-
-  public byte[] readTLVFile(byte[] aid, byte[] ef, int maxLength)
+  /**
+   * Read the content of a TLV file.
+   * 
+   * @param aid the application ID (AID)
+   * @param ef the elementary file (EF)
+   * @param maxLength the maximum length of the file
+   * 
+   * @return the content of the file
+   * 
+   * @throws SignatureCardException
+   */
+  protected byte[] readTLVFile(byte[] aid, byte[] ef, int maxLength)
       throws SignatureCardException {
     return readTLVFilePIN(aid, ef, (byte) 0, null, null, maxLength);
   }
 
-  public byte[] readTLVFilePIN(byte[] aid, byte[] ef, byte kid,
+  
+  /**
+   * Read the content of a TLV file wich may require a PIN.
+   * 
+   * @param aid the application ID (AID)
+   * @param ef the elementary file (EF)
+   * @param kid the key ID (KID) of the corresponding PIN
+   * @param provider the PINProvider
+   * @param spec the PINSpec
+   * @param maxLength the maximum length of the file
+   * 
+   * @return the content of the file
+   * 
+   * @throws SignatureCardException
+   */
+  protected byte[] readTLVFilePIN(byte[] aid, byte[] ef, byte kid,
       PINProvider provider, PINSpec spec, int maxLength)
       throws SignatureCardException {
 
@@ -179,33 +234,38 @@ public abstract class AbstractSignatureCard implements SignatureCard {
       }
 
       // SELECT FILE (EF)
-      rb = selectFileFID(ef);
-      if (rb[rb.length - 2] != (byte) 0x90 || rb[rb.length - 1] != (byte) 0x00) {
+      ResponseAPDU resp = selectFileFID(ef);
+      if (resp.getSW() == 0x6a82) {
+        
+        // EF not found
+        throw new FileNotFoundException("EF " + toString(ef) + " not found.");
+        
+      } else if (resp.getSW() != 0x9000) {
 
         throw new SignatureCardException("SELECT FILE with "
             + "FID="
             + toString(ef)
             + " failed ("
             + "SW="
-            + Integer.toHexString((0xFF & (int) rb[rb.length - 1])
-                | (0xFF & (int) rb[rb.length - 2]) << 8) + ").");
+            + Integer.toHexString(resp.getSW()) + ").");
+        
       }
 
       // try to READ BINARY
-      int sw = readBinary(0, 1, new byte[1]);
+      byte[] b = new byte[1];
+      int sw = readBinary(0, 1, b);
+      
       if (provider != null && sw == 0x6982) {
 
         // VERIFY
-        int kfpc = -1; // unknown
-        while (true) {
-          kfpc = verifyPIN(provider, spec, kid, kfpc);
-          if (kfpc < -1) {
-            return null;
-          } else if (kfpc < 0) {
-            break;
-          }
+        verifyPIN(provider, spec, kid);
+        
+      } else if (sw == 0x9000) {
+        // not expected type
+        if (b[0] != 0x30) {
+          throw new NotActivatedException();
         }
-      } else if (sw != 0x9000) {
+      } else {
         throw new SignatureCardException("READ BINARY failed (SW="
             + Integer.toHexString(sw) + ").");
       }
@@ -221,17 +281,56 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   }
 
-  ResponseAPDU transmit(CardChannel channel, CommandAPDU commandAPDU)
+  /**
+   * Transmit the given command APDU using the given card channel.
+   * 
+   * @param channel
+   *          the card channel
+   * @param commandAPDU
+   *          the command APDU
+   * @param logData
+   *          <code>true</code> if command APDU data may be logged, or
+   *          <code>false</code> otherwise
+   * 
+   * @return the corresponding response APDU
+   * 
+   * @throws CardException
+   *           if smart card communication fails
+   */
+  protected ResponseAPDU transmit(CardChannel channel, CommandAPDU commandAPDU, boolean logData)
+      throws CardException {
+    
+    if (log.isTraceEnabled()) {
+      log.trace(commandAPDU 
+          + (logData ? "\n" + toString(commandAPDU.getBytes()) : ""));
+      long t0 = System.currentTimeMillis();
+      ResponseAPDU responseAPDU = channel.transmit(commandAPDU);
+      long t1 = System.currentTimeMillis();
+      log.trace(responseAPDU + "\n[" + (t1 - t0) + "ms] "
+          + (logData ? "\n" + toString(responseAPDU.getBytes()) : ""));
+      return responseAPDU;
+    } else {
+      return channel.transmit(commandAPDU);
+    }
+    
+  }
+
+  /**
+   * Transmit the given command APDU using the given card channel.
+   * 
+   * @param channel the card channel
+   * @param commandAPDU the command APDU
+   * 
+   * @return the corresponding response APDU
+   * 
+   * @throws CardException if smart card communication fails
+   */
+  protected ResponseAPDU transmit(CardChannel channel, CommandAPDU commandAPDU)
       throws CardException {
-    log.trace(commandAPDU + "\n" + toString(commandAPDU.getBytes()));
-    long t0 = System.currentTimeMillis();
-    ResponseAPDU responseAPDU = channel.transmit(commandAPDU);
-    long t1 = System.currentTimeMillis();
-    log.trace(responseAPDU + "\n[" + (t1 - t0) + "ms] "
-        + toString(responseAPDU.getBytes()));
-    return responseAPDU;
+    return transmit(channel, commandAPDU, true);
   }
 
+  
   public void init(Card card) {
     card_ = card;
     ATR atr = card.getATR();
@@ -242,7 +341,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     }
   }
 
-  CardChannel getCardChannel() {
+  protected CardChannel getCardChannel() {
     return card_.getBasicChannel();
   }
 
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/FileNotFoundException.java b/smcc/src/main/java/at/gv/egiz/smcc/FileNotFoundException.java
new file mode 100644
index 00000000..f96611c2
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/FileNotFoundException.java
@@ -0,0 +1,38 @@
+/*
+* 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;
+
+public class FileNotFoundException extends SignatureCardException {
+
+  private static final long serialVersionUID = 1L;
+
+  public FileNotFoundException() {
+  }
+
+  public FileNotFoundException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public FileNotFoundException(String message) {
+    super(message);
+  }
+
+  public FileNotFoundException(Throwable cause) {
+    super(cause);
+  }
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/LockedException.java b/smcc/src/main/java/at/gv/egiz/smcc/LockedException.java
new file mode 100644
index 00000000..e00322a0
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/LockedException.java
@@ -0,0 +1,38 @@
+/*
+* 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;
+
+public class LockedException extends SignatureCardException {
+
+  private static final long serialVersionUID = 1L;
+
+  public LockedException() {
+  }
+
+  public LockedException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public LockedException(String message) {
+    super(message);
+  }
+
+  public LockedException(Throwable cause) {
+    super(cause);
+  }
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/NotActivatedException.java b/smcc/src/main/java/at/gv/egiz/smcc/NotActivatedException.java
new file mode 100644
index 00000000..9181fc5f
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/NotActivatedException.java
@@ -0,0 +1,44 @@
+/*
+* 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;
+
+/**
+ * This exception is thrown upon a call to a function that
+ * has not been activated (e.g. not yet activated citizen card). 
+ */
+public class NotActivatedException extends SignatureCardException {
+
+  private static final long serialVersionUID = 1L;
+
+  public NotActivatedException() {
+    super();
+  }
+
+  public NotActivatedException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public NotActivatedException(String message) {
+    super(message);
+  }
+
+  public NotActivatedException(Throwable cause) {
+    super(cause);
+  }
+
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
index 79e2663e..99acbc0f 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
@@ -31,12 +31,21 @@ package at.gv.egiz.smcc;
 import java.math.BigInteger;
 import java.util.Arrays;
 
+import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
 import javax.smartcardio.CommandAPDU;
 import javax.smartcardio.ResponseAPDU;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 public class STARCOSCard extends AbstractSignatureCard implements SignatureCard {
+  
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(STARCOSCard.class);
 
   public static final byte[] MF = new byte[] { (byte) 0x3F, (byte) 0x00 };
 
@@ -83,7 +92,7 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
 
   public static final byte KID_PIN_SS = (byte) 0x81;
 
-  // Gew�hnliche Signatur (GS)
+  // Gewöhnliche Signatur (GS)
 
   public static final byte[] AID_DF_GS = new byte[] { (byte) 0xd0, (byte) 0x40,
       (byte) 0x00, (byte) 0x00, (byte) 0x17, (byte) 0x00, (byte) 0x13,
@@ -104,31 +113,157 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
       // .
       // )
       (byte) 0x80, (byte) 0x02, (byte) 0x00, // local, key ID, key version
-      (byte) 0x89, (byte) 0x01, // tag, length (algorithm ID)
-      (byte) 0x14 // ECDSA
+      (byte) 0x89, (byte) 0x03, // tag, length (algorithm ID)
+      (byte) 0x13, (byte) 0x35, (byte) 0x10 // ECDSA
   };
 
   public static final byte KID_PIN_CARD = (byte) 0x01;
   
+  /**
+   * Creates an new instance.
+   */
   public STARCOSCard() {
     super("at/gv/egiz/smcc/STARCOSCard");
   }
  
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.SignatureCard#getCertificate(at.gv.egiz.smcc.SignatureCard.KeyboxName)
+   */
   public byte[] getCertificate(KeyboxName keyboxName)
       throws SignatureCardException {
 
+    byte[] aid;
+    byte[] efc;
     if (keyboxName == KeyboxName.SECURE_SIGNATURE_KEYPAIR) {
-      return readTLVFile(AID_DF_SS, EF_C_X509_CH_DS, 2000);
+      aid = AID_DF_SS;
+      efc = EF_C_X509_CH_DS;
     } else if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
-      return readTLVFile(AID_DF_GS, EF_C_X509_CH_AUT, 2000);
+      aid = AID_DF_GS;
+      efc = EF_C_X509_CH_AUT;
     } else {
       throw new IllegalArgumentException("Keybox " + keyboxName
           + " not supported.");
     }
 
+    log.debug("Get certificate for keybox '" + keyboxName.getKeyboxName() + "'" +
+        " (AID=" + toString(aid) + " EF=" + toString(efc) + ").");
+
+    try {
+      Card card = getCardChannel().getCard();
+      try {
+        card.beginExclusive();
+        return readTLVFile(aid, efc, 2000);
+      } catch (FileNotFoundException e) {
+        // if certificate is not present, 
+        // the citizen card application has not been activated
+        throw new NotActivatedException();
+      } finally {
+        card.endExclusive();
+      }
+    } catch (CardException e) {
+      throw new SignatureCardException("Failed to get exclusive card access.");
+    }
+    
+  }
+
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.SignatureCard#getInfobox(java.lang.String, at.gv.egiz.smcc.PINProvider, java.lang.String)
+   */
+  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
+      throws SignatureCardException {
+  
+    if ("IdentityLink".equals(infobox)) {
+  
+      PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
+      
+      try {
+        Card card = getCardChannel().getCard();
+        try {
+          card.beginExclusive();
+          return readTLVFilePIN(AID_INFOBOX, EF_INFOBOX, KID_PIN_CARD,
+              provider, spec, 2000);
+        } catch (FileNotFoundException e) {
+          // if certificate is not present, 
+          // the citizen card application has not been activated
+          throw new NotActivatedException();
+        } finally {
+          card.endExclusive();
+        }
+      } catch (CardException e) {
+        throw new SignatureCardException("Failed to get exclusive card access.");
+      }
+      
+    } else {
+      throw new IllegalArgumentException("Infobox '" + infobox
+          + "' not supported.");
+    }
+  
+  }
+
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.SignatureCard#createSignature(byte[], at.gv.egiz.smcc.SignatureCard.KeyboxName, at.gv.egiz.smcc.PINProvider)
+   */
+  public byte[] createSignature(byte[] hash, KeyboxName keyboxName,
+      PINProvider provider) throws SignatureCardException {
+  
+    if (hash.length != 20) {
+      throw new IllegalArgumentException("Hash value must be of length 20.");
+    }
+  
+    byte[] aid;
+    byte kid;
+    byte[] dst;
+    PINSpec spec;
+    if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)) {
+      aid = AID_DF_SS;
+      kid = KID_PIN_SS;
+      dst = DST_SS;
+      spec = new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"));
+  
+    } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)) {
+      aid = AID_DF_GS;
+      kid = KID_PIN_CARD;
+      dst = DST_GS;
+      spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
+  
+    } else {
+      throw new IllegalArgumentException("KeyboxName '" + keyboxName
+          + "' not supported.");
+    }
+  
+    try {
+      Card card = getCardChannel().getCard();
+      try {
+        card.beginExclusive();
+
+        // SELECT MF
+        selectMF();
+        // SELECT DF
+        selectFileAID(aid);
+        // VERIFY
+        verifyPIN(provider, spec, kid);
+        // MSE: SET DST
+        mseSetDST(dst);
+        // PSO: HASH
+        psoHash(hash);
+        // PSO: COMPUTE DIGITAL SIGNATURE
+        return psoComputDigitalSiganture();
+
+
+      } catch (FileNotFoundException e) {
+        // if certificate is not present, 
+        // the citizen card application has not been activated
+        throw new NotActivatedException();
+      } finally {
+        card.endExclusive();
+      }
+    } catch (CardException e) {
+      throw new SignatureCardException("Failed to get exclusive card access.");
+    }
+  
   }
 
-  byte[] selectFileAID(byte[] fid) throws CardException, SignatureCardException {
+  protected byte[] selectFileAID(byte[] fid) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
     ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x04,
         0x04, fid, 256));
@@ -150,16 +285,10 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
     }
   }
 
-  byte[] selectFileFID(byte[] fid) throws CardException, SignatureCardException {
+  protected ResponseAPDU selectFileFID(byte[] fid) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
-    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x02,
+    return transmit(channel, new CommandAPDU(0x00, 0xA4, 0x02,
         0x04, fid, 256));
-    if (resp.getSW() == 0x6a82) {
-      throw new SignatureCardException("Failed to select file (FID="
-          + toString(fid) + "): SW=" + Integer.toHexString(resp.getSW()) + ".");
-    } else {
-      return resp.getBytes();
-    }
   }
 
   void mseSetDST(byte[] dst) throws CardException, SignatureCardException {
@@ -201,134 +330,86 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
     }
   }
 
-  int verifyPIN(PINProvider pinProvider, PINSpec spec, byte kid, int kfpc)
-      throws CardException, SignatureCardException {
-
+  /**
+   * VERIFY PIN
+   * <p>
+   * If <code>pin</code> is <code>null</code> only the PIN status is checked and
+   * returned.
+   * </p>
+   * 
+   * @param pin
+   *          the PIN (may be <code>null</code>)
+   * @param kid
+   *          the KID of the PIN to be verified
+   * 
+   * @return -1 if VERIFY PIN was successful, or the number of possible retries 
+   * 
+   * @throws CardException
+   *           if communication with the smart card fails.
+   * @throws NotActivatedException
+   *           if the card application has not been activated
+   * @throws SignatureCardException
+   *           if VERIFY PIN fails
+   */
+  private int verifyPIN(String pin, byte kid) throws CardException, SignatureCardException {
+    
     CardChannel channel = getCardChannel();
 
-    // get number of possible retries
-    ResponseAPDU resp = transmit(channel,
-        new CommandAPDU(0x00, 0x20, 0x00, kid));
-    int retries;
-    if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
-      retries = resp.getSW2() & 0x0f;
-    } else if (resp.getSW() == 0x6984) {
-      // PIN LCS = "Initilized" (not activated)
-      throw new SignatureCardException(spec.getLocalizedName() + " not set.");
-    } else {
-      throw new SignatureCardException("Failed to get PIN retries: SW="
-          + Integer.toHexString(resp.getSW()));
-    }
-
-    // get PIN
-    String pin = pinProvider.providePIN(spec, retries);
+    ResponseAPDU resp;
     if (pin == null) {
-      // User canceled operation
-      // throw new CancelledException("User canceld PIN entry");
-      return -2;
-    }
-    // PIN length in bytes
-    int len = (int) Math.ceil(pin.length() / 2);
-
-    // BCD encode PIN and marshal PIN block
-    byte[] pinBytes = new BigInteger(pin, 16).toByteArray();
-    byte[] pinBlock = new byte[8];
-    if (len < pinBytes.length) {
-      System.arraycopy(pinBytes, pinBytes.length - len, pinBlock, 1, len);
+      resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid));
     } else {
-      System.arraycopy(pinBytes, 0, pinBlock, len - pinBytes.length + 1,
-          pinBytes.length);
+      // PIN length in bytes
+      int len = (int) Math.ceil(pin.length() / 2);
+
+      // BCD encode PIN and marshal PIN block
+      byte[] pinBytes = new BigInteger(pin, 16).toByteArray();
+      byte[] pinBlock = new byte[8];
+      if (len < pinBytes.length) {
+        System.arraycopy(pinBytes, pinBytes.length - len, pinBlock, 1, len);
+      } else {
+        System.arraycopy(pinBytes, 0, pinBlock, len - pinBytes.length + 1,
+            pinBytes.length);
+      }
+      pinBlock[0] = (byte) (0x20 + len * 2);
+      Arrays.fill(pinBlock, len + 1, 8, (byte) 0xff);
+
+      resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid, pinBlock), false);
+      
     }
-    pinBlock[0] = (byte) (0x20 + len * 2);
-    Arrays.fill(pinBlock, len + 1, 8, (byte) 0xff);
 
-    resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid, pinBlock));
-    if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
+    if (resp.getSW() == 0x63c0) {
+      throw new LockedException("PIN locked.");
+    } else if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
+      // return number of possible retries
       return resp.getSW2() & 0x0f;
-    } else if (resp.getSW() != 0x9000) {
+    } else if (resp.getSW() == 0x6984) {
+      // PIN LCS = "Initialized" (-> not activated)
+      throw new NotActivatedException("PIN not set.");
+    } else if (resp.getSW() == 0x9000) {
+      return -1; // success
+    } else {
       throw new SignatureCardException("Failed to verify pin: SW="
           + Integer.toHexString(resp.getSW()));
-    } else {
-      return -1;
-    }
-
-  }
-
-  public byte[] createSignature(byte[] hash, KeyboxName keyboxName,
-      PINProvider provider) throws SignatureCardException {
-
-    if (hash.length != 20) {
-      throw new IllegalArgumentException("Hash value must be of length 20");
-    }
-
-    byte[] aid;
-    byte kid;
-    byte[] dst;
-    PINSpec spec;
-    if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)) {
-      aid = AID_DF_SS;
-      kid = KID_PIN_SS;
-      dst = DST_SS;
-      spec = new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"));
-
-    } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)) {
-      aid = AID_DF_GS;
-      kid = KID_PIN_CARD;
-      dst = DST_GS;
-      spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
-
-    } else {
-      throw new IllegalArgumentException("KeyboxName '" + keyboxName
-          + "' not supported.");
     }
-
-    try {
-
-      // SELECT MF
-      selectMF();
-      // SELECT DF
-      selectFileAID(aid);
-      // VERIFY
-      int retr = -1; // unknown
-      while (true) {
-        retr = verifyPIN(provider, spec, kid, retr);
-        if (retr < -1) {
-          return null;
-        } else if (retr < 0) {
-          break;
-        }
-      }
-      // MSE: SET DST
-      mseSetDST(dst);
-      // PSO: HASH
-      psoHash(hash);
-      // PSO: COMPUTE DIGITAL SIGNATURE
-      byte[] rs = psoComputDigitalSiganture();
-      return rs;
-
-    } catch (CardException e) {
-      throw new SignatureCardException("Failed to create signature.", e);
-    }
-
+    
   }
+  
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.AbstractSignatureCard#verifyPIN(at.gv.egiz.smcc.PINProvider, at.gv.egiz.smcc.PINSpec, byte, int)
+   */
+  protected void verifyPIN(PINProvider pinProvider, PINSpec spec, byte kid)
+      throws CardException, SignatureCardException {
 
-  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
-      throws SignatureCardException {
-
-    if ("IdentityLink".equals(infobox)) {
-
-      PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
-      try {
-        byte[] res = readTLVFilePIN(AID_INFOBOX, EF_INFOBOX, KID_PIN_CARD,
-            provider, spec, 2000);
-        return res;
-      } catch (Exception e) {
-        throw new SignatureCardException(e);
+    int retries = verifyPIN(null, kid);
+    do {
+      String pin = pinProvider.providePIN(spec, retries);
+      if (pin == null) {
+        // user canceled operation
+        throw new CancelledException("User canceld operation.");
       }
-    } else {
-      throw new IllegalArgumentException("Infobox '" + infobox
-          + "' not supported.");
-    }
+      retries = verifyPIN(pin, kid);
+    } while (retries > 0);
 
   }
 
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 68a6f6df..22a66c3f 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
@@ -25,6 +25,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.security.InvalidKeyException;
 import java.security.Key;
 import java.security.KeyStore;
@@ -52,16 +54,20 @@ import org.apache.commons.logging.LogFactory;
  */
 public class SWCard implements SignatureCard {
   
-  private static final String BKU_USER_DIR = ".bku";
+  private static final String BKU_USER_DIR = ".mocca";
 
   private static final String SWCARD_DIR = "smcc";
   
   private static final String KEYSTORE_CERTIFIED_KEYPAIR = "certified.p12";
   
+  private static final String KEYSTORE_PASSWORD_CERTIFIED_KEYPAIR = "certified.pwd";
+  
   private static final String CERTIFICATE_CERTIFIED_KEYPAIR = "certified.cer";
   
   private static final String KEYSTORE_SECURE_KEYPAIR = "secure.p12";
   
+  private static final String KEYSTORE_PASSWORD_SECURE_KEYPAIR = "secure.pwd";
+
   private static final String CERTIFICATE_SECURE_KEYPAIR = "secure.cer";
   
   private static String swCardDir;
@@ -70,8 +76,12 @@ public class SWCard implements SignatureCard {
 
   private KeyStore certifiedKeyStore;
   
+  private String certifiedKeyStorePassword;
+  
   private KeyStore secureKeyStore;
   
+  private String secureKeyStorePassword;
+  
   private Certificate certifiedCertificate;
   
   private Certificate secureCertificate;
@@ -168,7 +178,7 @@ public class SWCard implements SignatureCard {
     }
     
     try {
-      keyStore.load(keyStoreFile, null);
+      keyStore.load(keyStoreFile, password);
     } catch (Exception e) {
       String msg = "Failed to load KeyStore from file '" + fileName + "'.";
       log.info(msg, e);
@@ -176,10 +186,33 @@ public class SWCard implements SignatureCard {
     } 
     
     return keyStore;
-
   
   }
   
+  private String loadKeyStorePassword(String passwordFileName) throws SignatureCardException {
+
+    String fileName = getFileName(passwordFileName);
+    FileInputStream keyStorePasswordFile;
+    try {
+      keyStorePasswordFile = new FileInputStream(fileName);
+    } catch (FileNotFoundException e) {
+      return null;
+    }
+    
+    try {
+      InputStreamReader reader = new InputStreamReader(keyStorePasswordFile, Charset.forName("UTF-8"));
+      StringBuilder sb = new StringBuilder();
+      char b[] = new char[16];
+      for (int l; (l = reader.read(b)) != -1;) {
+        sb.append(b, 0, l);
+      }
+      return sb.toString();
+    } catch (IOException e) {
+      throw new SignatureCardException("Failed to read file '" + passwordFileName + "'.");
+    }
+    
+  }
+  
   private KeyStore getKeyStore(KeyboxName keyboxName, char[] password) throws SignatureCardException {
     
     if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
@@ -198,6 +231,23 @@ public class SWCard implements SignatureCard {
     
   }
   
+  private String getPassword(KeyboxName keyboxName) throws SignatureCardException {
+    
+    if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
+      if (certifiedKeyStorePassword == null) {
+        certifiedKeyStorePassword = loadKeyStorePassword(KEYSTORE_PASSWORD_CERTIFIED_KEYPAIR);
+      }
+      return certifiedKeyStorePassword;
+    } else if (keyboxName == KeyboxName.SECURE_SIGNATURE_KEYPAIR) {
+      if (secureKeyStorePassword == null) {
+        secureKeyStorePassword = loadKeyStorePassword(KEYSTORE_PASSWORD_SECURE_KEYPAIR);
+      }
+      return secureKeyStorePassword;
+    } else {
+      throw new SignatureCardException("Keybox of type '" + keyboxName + "' not supported.");
+    }
+    
+  }
   
   public byte[] getCertificate(KeyboxName keyboxName)
       throws SignatureCardException {
@@ -254,9 +304,21 @@ public class SWCard implements SignatureCard {
   public byte[] createSignature(byte[] hash, KeyboxName keyboxName, PINProvider provider) throws SignatureCardException {
 
     // KeyStore password
-    PINSpec pinSpec = new PINSpec(0, -1, ".", "KeyStore-Password");
-    
-    KeyStore keyStore = getKeyStore(keyboxName, null);
+    String password = getPassword(keyboxName);
+
+    if (password == null) {
+
+      PINSpec pinSpec = new PINSpec(0, -1, ".", "KeyStore-Password");
+      
+      password = provider.providePIN(pinSpec, -1);
+      
+      if (password == null) {
+        return null;
+      }
+      
+    }
+
+    KeyStore keyStore = getKeyStore(keyboxName, password.toCharArray());
 
     PrivateKey privateKey = null;
     
@@ -269,8 +331,7 @@ public class SWCard implements SignatureCard {
           Key key = null;
           while (key == null) {
             try {
-              String pin = provider.providePIN(pinSpec, -1);
-              key = keyStore.getKey(alias, pin.toCharArray());
+              key = keyStore.getKey(alias, password.toCharArray());
             } catch (UnrecoverableKeyException e) {
               log.info("Failed to get Key from KeyStore. Wrong password?", e);
             }
@@ -315,8 +376,6 @@ public class SWCard implements SignatureCard {
 
   @Override
   public void setLocale(Locale locale) {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Not supported yet.");
   }
 
   @Override
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardException.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardException.java
index f2a964fe..f296f3a2 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardException.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardException.java
@@ -34,7 +34,7 @@ public class SignatureCardException extends Exception {
    * 
    */
   private static final long serialVersionUID = 1L;
-
+  
   /**
    * Creates a new instance of this <code>SignatureCardException</code>.
    * 
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 2131a737..777299d9 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
@@ -28,19 +28,189 @@
 //
 package at.gv.egiz.smcc;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import javax.smartcardio.ATR;
 import javax.smartcardio.Card;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A factory for creating {@link SignatureCard}s from {@link Card}s. 
+ */
 public class SignatureCardFactory {
+  
+  /**
+   * This class represents a supported smart card. 
+   */
+  private class SupportedCard {
+    
+    /**
+     * The ATR pattern. 
+     */
+    private byte[] atrPattern;
+    
+    /**
+     * The ATR mask.
+     */
+    private byte[] atrMask;
+    
+    /**
+     * The implementation class.
+     */
+    private String impl;
 
-  public static SignatureCardFactory getInstance() {
-    return new SignatureCardFactory();
+    /**
+     * Creates a new SupportedCard instance with the given ATR pattern and mask
+     * und the corresponding implementation class.
+     * 
+     * @param atrPattern
+     *          the ATR pattern
+     * @param atrMask
+     *          the ATR mask
+     * @param implementationClass
+     *          the name of the implementation class
+     * 
+     * @throws NullPointerException
+     *           if <code>atrPattern</code> or <code>atrMask</code> is
+     *           <code>null</code>.
+     * @throws IllegalArgumentException
+     *           if the lengths of <code>atrPattern</code> and
+     *           <code>atrMask</code> of not equal.
+     */
+    public SupportedCard(byte[] atrPattern, byte[] atrMask, String implementationClass) {
+      if (atrPattern.length != atrMask.length) {
+        throw new IllegalArgumentException("Length of 'atr' and 'mask' must be equal.");
+      }
+      this.atrPattern = atrPattern;
+      this.atrMask = atrMask;
+      this.impl = implementationClass;
+    }
+
+    /**
+     * Returns true if the given ATR matches the ATR pattern and mask this
+     * SupportedCard object.
+     * 
+     * @param atr
+     *          the ATR
+     * 
+     * @return <code>true</code> if the given ATR matches the ATR pattern and
+     *         mask of this SupportedCard object, or <code>false</code>
+     *         otherwise.
+     */
+    public boolean matches(ATR atr) {
+
+      byte[] bytes = atr.getBytes();
+      if (bytes == null) {
+        return false;
+      }
+      if (bytes.length < atrMask.length) {
+        // we cannot test for equal length here, as we get ATRs with 
+        // additional bytes on systems using PCSClite (e.g. linux and OS X) sometimes
+        return false;
+      }
+
+      int l = Math.min(atrMask.length, bytes.length);
+      for (int i = 0; i < l; i++) {
+        if ((bytes[i] & atrMask[i]) != atrPattern[i]) {
+          return false;
+        }
+      }
+      return true;
+      
+    }
+
+    /**
+     * @return the corresponding implementation class.
+     */
+    public String getImplementationClassName() {
+      return impl;
+    }
+    
+  }
+
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(SignatureCardFactory.class);
+  
+  /**
+   * The instance to be returned by {@link #getInstance()}.
+   */
+  private static SignatureCardFactory instance;
+  
+  /**
+   * The list of supported smart cards.
+   */
+  private List<SupportedCard> supportedCards;
+  
+  /**
+   * @return an instance of this SignatureCardFactory.
+   */
+  public static synchronized SignatureCardFactory getInstance() {
+    if (instance == null) {
+      instance = new SignatureCardFactory();
+    }
+    return instance;
   }
 
+  /**
+   * Private constructor.
+   */
   private SignatureCardFactory() {
+    
+    supportedCards = new ArrayList<SupportedCard>();
+
+    // e-card
+    supportedCards.add(new SupportedCard(
+        // ATR  (3b:bd:18:00:81:31:fe:45:80:51:02:00:00:00:00:00:00:00:00:00:00:00)
+        new byte[] {
+            (byte) 0x3b, (byte) 0xbd, (byte) 0x18, (byte) 0x00, (byte) 0x81, (byte) 0x31, (byte) 0xfe, (byte) 0x45, 
+            (byte) 0x80, (byte) 0x51, (byte) 0x02, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, 
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 
+        },
+        // mask (ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:00:00:00:00:00:00:00:00:00:00:00)
+        new byte[] {
+            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, 
+            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, 
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 
+        },
+        "at.gv.egiz.smcc.STARCOSCard"));
 
+    // a-sign premium
+    supportedCards.add(new SupportedCard(
+        // ATR  (3b:bf:11:00:81:31:fe:45:45:50:41:00:00:00:00:00:00:00:00:00:00:00:00:00)
+        new byte[] {
+            (byte) 0x3b, (byte) 0xbf, (byte) 0x11, (byte) 0x00, (byte) 0x81, (byte) 0x31, (byte) 0xfe, (byte) 0x45, 
+            (byte) 0x45, (byte) 0x50, (byte) 0x41, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, 
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 
+        },
+        // mask (ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:00:00:00:00:00:00:00:00:00:00:00:00:00)
+        new byte[] {
+            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, 
+            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, 
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00
+        },
+        "at.gv.egiz.smcc.ACOSCard"));
+    
   }
 
+  /**
+   * Creates a SignatureCard instance with the given smart card.
+   * 
+   * @param card
+   *          the smart card, or <code>null</code> if a software card should be
+   *          created
+   * 
+   * @return a SignatureCard instance
+   * 
+   * @throws CardNotSupportedException
+   *           if no implementation of the given <code>card</code> could be
+   *           found
+   */
   public SignatureCard createSignatureCard(Card card)
       throws CardNotSupportedException {
     
@@ -51,31 +221,34 @@ public class SignatureCardFactory {
     }
 
     ATR atr = card.getATR();
-    byte[] historicalBytes = atr.getHistoricalBytes();
-    if(historicalBytes == null || historicalBytes.length < 3) {
-      throw new CardNotSupportedException("Card not supported: ATR=" + toString(atr.getBytes()));
+    Iterator<SupportedCard> cards = supportedCards.iterator();
+    while (cards.hasNext()) {
+      SupportedCard supportedCard = cards.next();
+      if(supportedCard.matches(atr)) {
+        
+        ClassLoader cl = SignatureCardFactory.class.getClassLoader();
+        SignatureCard sc;
+        try {
+          Class<?> scClass = cl.loadClass(supportedCard.getImplementationClassName());
+          sc = (SignatureCard) scClass.newInstance();
+          sc.init(card);
+          return sc;
+
+        } catch (ClassNotFoundException e) {
+          log.warn("Cannot find signature card implementation class.", e);
+          throw new CardNotSupportedException("Cannot find signature card implementation class.", e);
+        } catch (InstantiationException e) {
+          log.warn("Failed to instantiate signature card implementation.", e);
+          throw new CardNotSupportedException("Failed to instantiate signature card implementation.", e);
+        } catch (IllegalAccessException e) {
+          log.warn("Failed to instantiate signature card implementation.", e);
+          throw new CardNotSupportedException("Failed to instantiate signature card implementation.", e);
+        }
+        
+      }
     }
     
-    int t = ((0xFF & (int) historicalBytes[0]) << 16) + 
-      ((0xFF & (int) historicalBytes[1]) << 8) + 
-      (0xFF & (int) historicalBytes[2]);
-
-    SignatureCard sCard;
-    switch (t) {
-      case 0x455041 :
-      case 0x4D4341 :
-        sCard = new ACOSCard();
-        break;
-
-      case 0x805102 :
-        sCard = new STARCOSCard();
-        break;
-
-      default :
-        throw new CardNotSupportedException("Card not supported: ATR=" + toString(atr.getBytes()));
-    }
-    sCard.init(card);
-    return sCard;
+    throw new CardNotSupportedException("Card not supported: ATR=" + toString(atr.getBytes()));
     
   }
   
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 ffffd3af..b70b44a7 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
@@ -142,7 +142,8 @@ public class SmartCardIO {
       for (CardTerminal terminal : cardTerminals_.list(CardTerminals.State.CARD_INSERTION)) {
 
         Card card = null;
-        try {
+        try {
+          log.trace("Trying to connect to card.");
           // try to connect to card
           card = terminal.connect("*");
         } catch (CardException e) {
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java
new file mode 100644
index 00000000..b921a5d5
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java
@@ -0,0 +1,92 @@
+/*
+* 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.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Locale;
+
+import javax.smartcardio.CardException;
+import javax.smartcardio.CommandAPDU;
+import javax.smartcardio.ResponseAPDU;
+
+import at.gv.egiz.smcc.SignatureCard.KeyboxName;
+import at.gv.egiz.smcc.util.SMCCHelper;
+
+public class STARCOSCardTest {
+
+  /**
+   * @param args
+   * @throws CardException 
+   * @throws NoSuchAlgorithmException 
+   */
+  public static void main(String[] args) throws CardException, NoSuchAlgorithmException {
+    
+    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 {
+//      signatureCard.getCertificate(KeyboxName.SECURE_SIGNATURE_KEYPAIR);
+//      signatureCard.getCertificate(KeyboxName.CERITIFIED_KEYPAIR);
+//      signatureCard.getInfobox("IdentityLink", new CommandLinePINProvider(), null);
+      MessageDigest messageDigest = MessageDigest.getInstance("SHA-1");
+      byte[] digest = messageDigest.digest("test".getBytes());
+      signatureCard.createSignature(digest, KeyboxName.CERITIFIED_KEYPAIR, new CommandLinePINProvider());
+    } catch (SignatureCardException e) {
+      e.printStackTrace();
+    }
+
+  }
+  
+  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/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
index b48d6d50..cfac8cf5 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
@@ -20,6 +20,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.LockedException;
+import at.gv.egiz.smcc.NotActivatedException;
 import at.gv.egiz.smcc.PINProvider;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.smcc.SignatureCard;
@@ -100,6 +102,12 @@ public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements
           stalResp.setInfoboxValue(resp);
           return stalResp;
         }
+      } catch (NotActivatedException e) {
+        log.info("Citizen card not activated.", e);
+        return new ErrorResponse(6001);
+      } catch (LockedException e) {
+        log.info("Citizen card locked.", e);
+        return new ErrorResponse(6001);
       } catch (CancelledException cx) {
         log.debug("User cancelled request", cx);
         return new ErrorResponse(6001);
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index dcd12b02..466ec2a9 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -32,6 +32,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.LockedException;
+import at.gv.egiz.smcc.NotActivatedException;
 import at.gv.egiz.smcc.PINProvider;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.smcc.SignatureCard;
@@ -78,7 +80,7 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
                 String jceName = JCEAlgorithmNames.getJCEHashName(signatureMethod);
                 if (jceName == null) {
                     log.error("Hash algorithm not supported:");
-                    return new ErrorResponse(1000);
+                    return new ErrorResponse(4006);
                 }
                 MessageDigest md = MessageDigest.getInstance(jceName);
                 md.update(signReq.getSignedInfo());
@@ -90,6 +92,12 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
                 SignResponse stalResp = new SignResponse();
                 stalResp.setSignatureValue(resp);
                 return stalResp;
+            } catch (NotActivatedException e) {
+              log.info("Citizen card not activated.", e);
+              return new ErrorResponse(6001);
+            } catch (LockedException e) {
+              log.info("Citizen card locked.", e);
+              return new ErrorResponse(6001);
             } catch (CancelledException cx) {
                 log.debug("User cancelled request");
                 return new ErrorResponse(6001);
-- 
cgit v1.2.3


From 7201a18efa2f9aac4109b1accb5de9d8449dd558 Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 14 Nov 2008 10:34:30 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@169
 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

---
 BKUOnline/src/main/resources/log4j.properties      |   5 +-
 .../webapp/helpfiles/de/help.hashdataviewer.html   |  39 ++
 .../webapp/helpfiles/de/help.hashdataviewer.png    | Bin 0 -> 11310 bytes
 .../impl/CreateXMLSignatureCommandImpl.java        | 446 +++++++++++----------
 4 files changed, 273 insertions(+), 217 deletions(-)
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.png

(limited to 'bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java')

diff --git a/BKUOnline/src/main/resources/log4j.properties b/BKUOnline/src/main/resources/log4j.properties
index 58f09511..f608c83d 100644
--- a/BKUOnline/src/main/resources/log4j.properties
+++ b/BKUOnline/src/main/resources/log4j.properties
@@ -14,7 +14,10 @@
 # limitations under the License.
 
 
-log4j.rootLogger=TRACE, STDOUT, file
+#log4j.rootLogger=INFO, STDOUT, file
+log4j.rootLogger=INFO, file
+#log4j.logger.at.gv = INFO
+
 
 # STDOUT appender
 log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html b/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
new file mode 100644
index 00000000..3a56e88a
--- /dev/null
+++ b/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/help.hashdataviewer.png" alt="Bildschirmfoto des Applets" height="130" width="150"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <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 gesetzeskonform 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>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.png b/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.png
new file mode 100644
index 00000000..83004322
Binary files /dev/null and b/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.png differ
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
index 6462bcf6..b2e3b303 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
@@ -1,230 +1,244 @@
 /*
-* 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.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Collections;
-import java.util.Date;
-
-import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.URIReferenceException;
-import javax.xml.crypto.dsig.XMLSignatureException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSSerializer;
-
-import at.buergerkarte.namespaces.securitylayer._1.CreateXMLSignatureRequestType;
-import at.buergerkarte.namespaces.securitylayer._1.DataObjectInfoType;
-import at.gv.egiz.bku.slcommands.CreateXMLSignatureCommand;
-import at.gv.egiz.bku.slcommands.SLCommandContext;
-import at.gv.egiz.bku.slcommands.SLResult;
-import at.gv.egiz.bku.slcommands.impl.xsect.AlgorithmMethodFactory;
-import at.gv.egiz.bku.slcommands.impl.xsect.AlgorithmMethodFactoryImpl;
-import at.gv.egiz.bku.slcommands.impl.xsect.IdValueFactory;
-import at.gv.egiz.bku.slcommands.impl.xsect.IdValueFactoryImpl;
-import at.gv.egiz.bku.slcommands.impl.xsect.Signature;
-import at.gv.egiz.bku.slexceptions.SLCommandException;
+ * 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.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.Date;
+
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.URIReferenceException;
+import javax.xml.crypto.dsig.XMLSignatureException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSSerializer;
+
+import at.buergerkarte.namespaces.securitylayer._1.CreateXMLSignatureRequestType;
+import at.buergerkarte.namespaces.securitylayer._1.DataObjectInfoType;
+import at.gv.egiz.bku.slcommands.CreateXMLSignatureCommand;
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slcommands.SLResult;
+import at.gv.egiz.bku.slcommands.impl.xsect.AlgorithmMethodFactory;
+import at.gv.egiz.bku.slcommands.impl.xsect.AlgorithmMethodFactoryImpl;
+import at.gv.egiz.bku.slcommands.impl.xsect.IdValueFactory;
+import at.gv.egiz.bku.slcommands.impl.xsect.IdValueFactoryImpl;
+import at.gv.egiz.bku.slcommands.impl.xsect.Signature;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLException;
-import at.gv.egiz.bku.slexceptions.SLRequestException;
+import at.gv.egiz.bku.slexceptions.SLRequestException;
 import at.gv.egiz.bku.slexceptions.SLViewerException;
-import at.gv.egiz.dom.DOMUtils;
-import at.gv.egiz.stal.InfoboxReadRequest;
-import at.gv.egiz.stal.InfoboxReadResponse;
-import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
-
-/**
- * This class implements the security layer command <code>CreateXMLSignatureRequest</code>.
- * 
- * @author mcentner
- */
-public class CreateXMLSignatureCommandImpl extends SLCommandImpl<CreateXMLSignatureRequestType> implements
-    CreateXMLSignatureCommand {
-  
-  /**
-   * Logging facility.
-   */
-  protected static Log log = LogFactory.getLog(CreateXMLSignatureCommandImpl.class);
-  
-  /**
-   * The signing certificate.
-   */
-  protected X509Certificate signingCertificate;
-  
-  /**
-   * The keybox identifier of the key used for signing.
-   */
-  protected String keyboxIdentifier;
-  
-  /**
-   * The to-be signed signature.
-   */
-  protected Signature signature;
-
-  @Override
-  public void init(SLCommandContext ctx, Object unmarshalledRequest)
-      throws SLCommandException {
-    super.init(ctx, unmarshalledRequest);
-  }
-
-  @Override
-  public void prepareXMLSignature() throws SLCommandException, SLRequestException {
-
-   CreateXMLSignatureRequestType request = getRequestValue();
-    
+import at.gv.egiz.dom.DOMUtils;
+import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.InfoboxReadRequest;
+import at.gv.egiz.stal.InfoboxReadResponse;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+
+/**
+ * This class implements the security layer command
+ * <code>CreateXMLSignatureRequest</code>.
+ * 
+ * @author mcentner
+ */
+public class CreateXMLSignatureCommandImpl extends
+    SLCommandImpl<CreateXMLSignatureRequestType> implements
+    CreateXMLSignatureCommand {
+
+  /**
+   * Logging facility.
+   */
+  protected static Log log = LogFactory
+      .getLog(CreateXMLSignatureCommandImpl.class);
+
+  /**
+   * The signing certificate.
+   */
+  protected X509Certificate signingCertificate;
+
+  /**
+   * The keybox identifier of the key used for signing.
+   */
+  protected String keyboxIdentifier;
+
+  /**
+   * The to-be signed signature.
+   */
+  protected Signature signature;
+
+  @Override
+  public void init(SLCommandContext ctx, Object unmarshalledRequest)
+      throws SLCommandException {
+    super.init(ctx, unmarshalledRequest);
+  }
+
+  @Override
+  public void prepareXMLSignature() throws SLCommandException,
+      SLRequestException {
+
+    CreateXMLSignatureRequestType request = getRequestValue();
+
     // TODO: make configurable?
-    IdValueFactory idValueFactory = new IdValueFactoryImpl();
-    
+    IdValueFactory idValueFactory = new IdValueFactoryImpl();
+
     // TODO: make configurable?
-    AlgorithmMethodFactory algorithmMethodFactory;
-    try {
-      algorithmMethodFactory = new AlgorithmMethodFactoryImpl(signingCertificate);
-    } catch (NoSuchAlgorithmException e) {
-      log.error("Failed to get DigestMethod.", e);
-      throw new SLCommandException(4006);
-    }
-    
-    signature = new Signature(getCmdCtx().getURLDereferencerContext(), idValueFactory, algorithmMethodFactory);
-
+    AlgorithmMethodFactory algorithmMethodFactory;
+    try {
+      algorithmMethodFactory = new AlgorithmMethodFactoryImpl(
+          signingCertificate);
+    } catch (NoSuchAlgorithmException e) {
+      log.error("Failed to get DigestMethod.", e);
+      throw new SLCommandException(4006);
+    }
+
+    signature = new Signature(getCmdCtx().getURLDereferencerContext(),
+        idValueFactory, algorithmMethodFactory);
+
     // SigningTime
-    signature.setSigningTime(new Date());
-    
+    signature.setSigningTime(new Date());
+
     // SigningCertificate
-    signature.setSignerCeritifcate(signingCertificate);
-    
+    signature.setSignerCeritifcate(signingCertificate);
+
     // SignatureInfo
-    if (request.getSignatureInfo() != null) {
-      signature.setSignatureInfo(request.getSignatureInfo());
-    }
-    
+    if (request.getSignatureInfo() != null) {
+      signature.setSignatureInfo(request.getSignatureInfo());
+    }
+
     // DataObjects
-    for (DataObjectInfoType dataObjectInfo : request.getDataObjectInfo()) {
-      signature.addDataObject(dataObjectInfo);
-    }
-    
-    signature.buildXMLSignature();
-    
-  }
-
-  /**
-   * Gets the signing certificate from STAL.
-   * 
-   * @throws SLCommandException
-   *           if getting the singing certificate fails
-   */
-  private void getSigningCertificate() throws SLCommandException {
-    
-    CreateXMLSignatureRequestType request = getRequestValue();
-    keyboxIdentifier = request.getKeyboxIdentifier();
-    
-    InfoboxReadRequest stalRequest = new InfoboxReadRequest();
-    stalRequest.setInfoboxIdentifier(keyboxIdentifier);
-    
-    requestSTAL(Collections.singletonList((STALRequest) stalRequest));
-    
-    STALResponse stalResponse = stalResponses.next();
-    
-    if (stalResponse instanceof InfoboxReadResponse) {
-      byte[] infobox = ((InfoboxReadResponse) stalResponse).getInfoboxValue();
-      
-      try {
-        CertificateFactory certFactory = CertificateFactory.getInstance("X509");
-        signingCertificate = (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(infobox));
-      } catch (CertificateException e) {
-        log.info("Failed to decode signing certificate.", e);
+    for (DataObjectInfoType dataObjectInfo : request.getDataObjectInfo()) {
+      signature.addDataObject(dataObjectInfo);
+    }
+
+    signature.buildXMLSignature();
+
+  }
+
+  /**
+   * Gets the signing certificate from STAL.
+   * 
+   * @throws SLCommandException
+   *           if getting the singing certificate fails
+   */
+  private void getSigningCertificate() throws SLCommandException {
+
+    CreateXMLSignatureRequestType request = getRequestValue();
+    keyboxIdentifier = request.getKeyboxIdentifier();
+
+    InfoboxReadRequest stalRequest = new InfoboxReadRequest();
+    stalRequest.setInfoboxIdentifier(keyboxIdentifier);
+
+    requestSTAL(Collections.singletonList((STALRequest) stalRequest));
+
+    STALResponse stalResponse = stalResponses.next();
+
+    if (stalResponse instanceof InfoboxReadResponse) {
+      byte[] infobox = ((InfoboxReadResponse) stalResponse).getInfoboxValue();
+
+      try {
+        CertificateFactory certFactory = CertificateFactory.getInstance("X509");
+        signingCertificate = (X509Certificate) certFactory
+            .generateCertificate(new ByteArrayInputStream(infobox));
+      } catch (CertificateException e) {
+        log.info("Failed to decode signing certificate.", e);
         // TODO: issue appropriate error
-        throw new SLCommandException(4000);
-      }
-      
-    } else {
-      log.info("Failed to get signing certificate.");
-      // TODO: issue appropriate error
-      throw new SLCommandException(4000);
-    }
-    
-  }
-
-  /**
-   * Signs the signature.
-   * 
-   * @throws SLCommandException
+        throw new SLCommandException(4000);
+      }
+
+    } else if (stalResponse instanceof ErrorResponse) {
+      ErrorResponse err = (ErrorResponse) stalResponse;
+      log.info("Received an error response from STAL with code: "
+          + err.getErrorCode());
+      throw new SLCommandException(err.getErrorCode());
+
+    } else {
+      log.info("Failed to get signing certificate.");
+      throw new SLCommandException(4000);
+    }
+
+  }
+
+  /**
+   * Signs the signature.
+   * 
+   * @throws SLCommandException
    *           if signing the signature fails
-   * @throws SLViewerException 
-   */
-  private void signXMLSignature() throws SLCommandException, SLViewerException {
-    
-    try {
-      signature.sign(getCmdCtx().getSTAL(), keyboxIdentifier);
-    } catch (MarshalException e) {
-      log.error("Failed to marshall XMLSignature.", e);
-      throw new SLCommandException(4000);
-    } catch (XMLSignatureException e) {
-      if (e.getCause() instanceof URIReferenceException) {
-        URIReferenceException uriReferenceException = (URIReferenceException) e.getCause();
-        if (uriReferenceException.getCause() instanceof SLCommandException) {
-          throw (SLCommandException) uriReferenceException.getCause();
-        }
-      }
-      log.error("Failed to sign XMLSignature.", e);
-      throw new SLCommandException(4000);
-    }
-    
-  }
-  
-  @Override
-  public SLResult execute() {
-    try {
-      
-      // get certificate in order to select appropriate algorithms for hashing and signing
-      getSigningCertificate();
-      
+   * @throws SLViewerException
+   */
+  private void signXMLSignature() throws SLCommandException, SLViewerException {
+
+    try {
+      signature.sign(getCmdCtx().getSTAL(), keyboxIdentifier);
+    } catch (MarshalException e) {
+      log.error("Failed to marshall XMLSignature.", e);
+      throw new SLCommandException(4000);
+    } catch (XMLSignatureException e) {
+      if (e.getCause() instanceof URIReferenceException) {
+        URIReferenceException uriReferenceException = (URIReferenceException) e
+            .getCause();
+        if (uriReferenceException.getCause() instanceof SLCommandException) {
+          throw (SLCommandException) uriReferenceException.getCause();
+        }
+      }
+      log.error("Failed to sign XMLSignature.", e);
+      throw new SLCommandException(4000);
+    }
+
+  }
+
+  @Override
+  public SLResult execute() {
+    try {
+
+      // get certificate in order to select appropriate algorithms for hashing
+      // and signing
+      getSigningCertificate();
+
       // prepare the XMLSignature for signing
-      prepareXMLSignature();
-      
+      prepareXMLSignature();
+
       // sign the XMLSignature
-      signXMLSignature();
-      
-      if (log.isTraceEnabled()) {
-        
-        DOMImplementationLS domImplLS = DOMUtils.getDOMImplementationLS();
-        LSSerializer serializer = domImplLS.createLSSerializer();
-        String debugString = serializer.writeToString(signature.getDocument());
-
-        log.trace(debugString);
-        
-      }
-      
-      return new CreateXMLSignatureResultImpl(signature.getDocument());
-      
+      signXMLSignature();
+
+      if (log.isTraceEnabled()) {
+
+        DOMImplementationLS domImplLS = DOMUtils.getDOMImplementationLS();
+        LSSerializer serializer = domImplLS.createLSSerializer();
+        String debugString = serializer.writeToString(signature.getDocument());
+
+        log.trace(debugString);
+
+      }
+
+      return new CreateXMLSignatureResultImpl(signature.getDocument());
+
     } catch (SLException e) {
-      return new ErrorResultImpl(e, cmdCtx.getLocale());
-    } 
-  }
-
-  @Override
-  public String getName() {
-    return "CreateXMLSignatureRequest";
-  }
-  
-  
-}
+      return new ErrorResultImpl(e, cmdCtx.getLocale());
+    }
+  }
+
+  @Override
+  public String getName() {
+    return "CreateXMLSignatureRequest";
+  }
+
+}
-- 
cgit v1.2.3


From 3aadcf8f877a560bed75af7e0db918aa26ef2a03 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 4 Dec 2008 10:00:31 +0000
Subject: Refactoring of infobox implementation.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@232 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/webapp/WEB-INF/applicationContext.xml |  34 ++
 .../src/main/webapp/WEB-INF/applicationContext.xml |  17 +
 .../main/java/at/gv/egiz/bku/binding/DataUrl.java  |   1 +
 .../bku/binding/LegacyDataUrlConnectionImpl.java   | 230 +++++++++
 .../java/at/gv/egiz/bku/conf/Configurator.java     |  41 +-
 .../egiz/bku/slcommands/InfoboxUpdateCommand.java  |  23 +
 .../egiz/bku/slcommands/InfoboxUpdateResult.java   |  21 +
 .../slcommands/impl/AbstractAssocArrayInfobox.java | 284 ++++++++++
 .../slcommands/impl/AbstractBinaryFileInfobox.java |  68 +++
 .../impl/AbstractInfoboxCommandImpl.java           |  55 ++
 .../bku/slcommands/impl/AbstractInfoboxImpl.java   |  26 +
 .../bku/slcommands/impl/AssocArrayInfobox.java     |  27 +
 .../bku/slcommands/impl/BinaryFileInfobox.java     |  27 +
 .../slcommands/impl/CertificatesInfoboxImpl.java   | 112 ++++
 .../impl/CreateXMLSignatureCommandImpl.java        |  37 +-
 .../slcommands/impl/IdentityLinkInfoboxImpl.java   | 291 +++++++++++
 .../at/gv/egiz/bku/slcommands/impl/Infobox.java    |  53 ++
 .../egiz/bku/slcommands/impl/InfoboxFactory.java   | 151 ++++++
 .../slcommands/impl/InfoboxReadCommandImpl.java    | 569 ++-------------------
 .../bku/slcommands/impl/InfoboxReadResultImpl.java |   3 +-
 .../slcommands/impl/InfoboxUpdateCommandImpl.java  | 158 ++++++
 .../slcommands/impl/InfoboxUpdateResultImpl.java   |  43 ++
 .../gv/egiz/bku/slcommands/impl/SLCommandImpl.java | 107 +---
 .../at/gv/egiz/bku/slcommands/impl/STALHelper.java | 218 ++++++++
 .../egiz/bku/slcommands/testApplicationContext.xml |  36 --
 .../egiz/bku/slcommands/testApplicationContext.xml |  53 ++
 26 files changed, 1968 insertions(+), 717 deletions(-)
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/binding/LegacyDataUrlConnectionImpl.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxUpdateCommand.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxUpdateResult.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractAssocArrayInfobox.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractBinaryFileInfobox.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxCommandImpl.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxImpl.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AssocArrayInfobox.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/BinaryFileInfobox.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CertificatesInfoboxImpl.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/IdentityLinkInfoboxImpl.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/Infobox.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxUpdateCommandImpl.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxUpdateResultImpl.java
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/STALHelper.java
 delete mode 100644 bkucommon/src/main/resources/at/gv/egiz/bku/slcommands/testApplicationContext.xml
 create mode 100644 bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/testApplicationContext.xml

(limited to 'bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index 1d09aa7e..5ac12ece 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -48,6 +48,40 @@
   <bean id="commandInvoker" class="at.gv.egiz.bku.binding.SLCommandInvokerImpl">
     <property name="securityManager" ref="accessController" />
   </bean>
+
+  <bean id="slCommandFactory" class="at.gv.egiz.bku.slcommands.SLCommandFactory"
+    factory-method="getInstance">
+    <property name="commandImpl">
+      <map>
+        <entry
+          key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:NullOperationRequest"
+          value="at.gv.egiz.bku.slcommands.impl.NullOperationCommandImpl" />
+        <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#:CreateXMLSignatureRequest"
+          value="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandImpl" />
+      </map>
+    </property>
+  </bean>
+
+  <bean id="infoboxFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxFactory"
+    factory-method="getInstance">
+    <property name="infoboxImpl">
+      <map>
+        <entry
+          key="Certificates"
+          value="at.gv.egiz.bku.slcommands.impl.CertificatesInfoboxImpl" />
+        <entry
+          key="IdentityLink"
+          value="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxImpl" />
+<!--        <entry-->
+<!--          key="CardChannel"-->
+<!--          value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />-->
+      </map>
+    </property>
+  </bean>
   
   <!-- Configure Configuration -->
   <bean id="certValidator" class="at.gv.egiz.bku.conf.CertValidatorImpl"></bean>
diff --git a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
index 9c7194dd..321e1e98 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
@@ -45,6 +45,23 @@
 		</property>
 	</bean>
 
+  <bean id="infoboxFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxFactory"
+    factory-method="getInstance">
+    <property name="infoboxImpl">
+      <map>
+        <entry
+          key="Certificates"
+          value="at.gv.egiz.bku.slcommands.impl.CertificatesInfoboxImpl" />
+        <entry
+          key="IdentityLink"
+          value="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxImpl" />
+<!--        <entry-->
+<!--          key="CardChannel"-->
+<!--          value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />-->
+      </map>
+    </property>
+  </bean>
+
 	<bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"
 		scope="singleton">
 		<constructor-arg ref="STALFactory"></constructor-arg>
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrl.java
index d462ac60..531772cf 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrl.java
@@ -65,5 +65,6 @@ public class DataUrl {
   
   public static void setConfiguration(Properties props) {
     configuration = props;
+    defaultDataUrlConnection.setConfiguration(configuration);
   }
 }
\ No newline at end of file
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/LegacyDataUrlConnectionImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/LegacyDataUrlConnectionImpl.java
new file mode 100644
index 00000000..5339d689
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/LegacyDataUrlConnectionImpl.java
@@ -0,0 +1,230 @@
+package at.gv.egiz.bku.binding;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.slcommands.SLResult;
+import at.gv.egiz.bku.slcommands.SLResult.SLResultType;
+import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.bku.utils.binding.Protocol;
+
+/**
+ * not thread-safe thus newInsance always returns a new object
+ * 
+ */
+public class LegacyDataUrlConnectionImpl implements DataUrlConnectionSPI {
+  
+  private final static Log log = LogFactory.getLog(DataUrlConnectionImpl.class);
+
+  public final static Protocol[] SUPPORTED_PROTOCOLS = { Protocol.HTTP,
+      Protocol.HTTPS };
+  protected X509Certificate serverCertificate;
+  protected Protocol protocol;
+  protected URL url;
+  private HttpURLConnection connection;
+  protected Map<String, String> requestHttpHeaders;
+  protected Map<String, String> formParams;
+  protected String boundary;
+  protected Properties config = null;
+
+  protected DataUrlResponse result;
+
+  public String getProtocol() {
+    if (protocol == null) {
+      return null;
+    }
+    return protocol.toString();
+  }
+
+  /**
+   * opens a connection sets the headers gets the server certificate
+   * 
+   * @throws java.net.SocketTimeoutException
+   * @throws java.io.IOException
+   * @pre url != null
+   * @pre httpHeaders != null
+   */
+  public void connect() throws SocketTimeoutException, IOException {
+    connection = (HttpURLConnection) url.openConnection();
+    connection.setDoOutput(true);
+    Set<String> headers = requestHttpHeaders.keySet();
+    Iterator<String> headerIt = headers.iterator();
+    while (headerIt.hasNext()) {
+      String name = headerIt.next();
+      connection.setRequestProperty(name, requestHttpHeaders.get(name));
+    }
+    log.trace("Connecting to: "+url);
+    connection.connect();
+    if (connection instanceof HttpsURLConnection) {
+      HttpsURLConnection ssl = (HttpsURLConnection) connection;
+      X509Certificate[] certs = (X509Certificate[]) ssl.getServerCertificates();
+      if ((certs != null) && (certs.length >= 1)) {
+        log.trace("Server certificate: "+certs[0]);
+        serverCertificate = certs[0];
+      }
+    }
+  }
+
+  public X509Certificate getServerCertificate() {
+    return serverCertificate;
+  }
+
+  public void setHTTPHeader(String name, String value) {
+    if (name != null && value != null) {
+      requestHttpHeaders.put(name, value);
+    }
+  }
+
+  public void setHTTPFormParameter(String name, InputStream data,
+      String contentType, String charSet, String transferEncoding) {
+    StringBuilder sb = new StringBuilder();
+    try {
+      InputStreamReader reader = new InputStreamReader(data, (charSet != null) ? charSet : "UTF-8");
+      char[] c = new char[512];
+      for (int l; (l = reader.read(c)) != -1;) {
+        sb.append(c, 0, l);
+      }
+    } catch (IOException e) {
+      throw new SLRuntimeException("Failed to set HTTP form parameter.", e);
+    }
+    formParams.put(name, sb.toString());
+  }
+
+  /**
+   * send all formParameters
+   * 
+   * @throws java.io.IOException
+   */
+  public void transmit(SLResult slResult) throws IOException {
+    StringWriter writer = new StringWriter();
+    slResult.writeTo(new StreamResult(writer));
+    formParams.put(
+        (slResult.getResultType() == SLResultType.XML) 
+            ? DataUrlConnection.FORMPARAM_XMLRESPONSE
+            : DataUrlConnection.FORMPARAM_BINARYRESPONSE, 
+        writer.toString());
+
+    OutputStream os = connection.getOutputStream();
+    OutputStreamWriter streamWriter = new OutputStreamWriter(os, HttpUtil.DEFAULT_CHARSET);
+
+    log.trace("Sending data");
+    Iterator<String> keys = formParams.keySet().iterator();
+    while(keys.hasNext()) {
+      String key = keys.next();
+      streamWriter.write(URLEncoder.encode(key, "UTF-8"));
+      streamWriter.write("=");
+      streamWriter.write(URLEncoder.encode(formParams.get(key), "UTF-8"));
+      if (keys.hasNext()) {
+        streamWriter.write("&");
+      }
+    }
+    streamWriter.flush();
+    os.close();
+    
+    // MultipartRequestEntity PostMethod
+    InputStream is = null;
+    try {
+      is = connection.getInputStream();
+    } catch (IOException iox) {
+      log.info(iox);
+    }
+    log.trace("Reading response");
+    result = new DataUrlResponse(url.toString(), connection.getResponseCode(),  is);
+    Map<String, String> responseHttpHeaders = new HashMap<String, String>();
+    Map<String, List<String>> httpHeaders = connection.getHeaderFields();
+    for (Iterator<String> keyIt = httpHeaders.keySet().iterator(); keyIt
+        .hasNext();) {
+      String key = keyIt.next();
+      StringBuffer value = new StringBuffer();
+      for (String val : httpHeaders.get(key)) {
+        value.append(val);
+        value.append(HttpUtil.SEPERATOR[0]);
+      }
+      String valString = value.substring(0, value.length() - 1);
+      if ((key != null) && (value.length() > 0)) {
+        responseHttpHeaders.put(key, valString);
+      }
+    }
+    result.setResponseHttpHeaders(responseHttpHeaders);
+  }
+
+  @Override
+  public DataUrlResponse getResponse() throws IOException {
+    return result;
+  }
+
+  /**
+   * inits protocol, url, httpHeaders, formParams
+   * 
+   * @param url
+   *          must not be null
+   */
+  @Override
+  public void init(URL url) {
+
+    for (int i = 0; i < SUPPORTED_PROTOCOLS.length; i++) {
+      if (SUPPORTED_PROTOCOLS[i].toString().equalsIgnoreCase(url.getProtocol())) {
+        protocol = SUPPORTED_PROTOCOLS[i];
+        break;
+      }
+    }
+    if (protocol == null) {
+      throw new SLRuntimeException("Protocol " + url.getProtocol()
+          + " not supported for data url");
+    }
+    this.url = url;
+    requestHttpHeaders = new HashMap<String, String>();
+    if ((config != null)
+        && (config.getProperty(USER_AGENT_PROPERTY_KEY) != null)) {
+      requestHttpHeaders.put(HttpUtil.HTTP_HEADER_USER_AGENT, config
+          .getProperty(USER_AGENT_PROPERTY_KEY));
+    } else {
+      requestHttpHeaders
+          .put(HttpUtil.HTTP_HEADER_USER_AGENT, DEFAULT_USERAGENT);
+
+    }
+    requestHttpHeaders.put(HttpUtil.HTTP_HEADER_CONTENT_TYPE,
+        HttpUtil.APPLICATION_URL_ENCODED);
+    
+    formParams = new HashMap<String, String>();
+  }
+
+  @Override
+  public DataUrlConnectionSPI newInstance() {
+    DataUrlConnectionSPI uc = new LegacyDataUrlConnectionImpl();
+    uc.setConfiguration(config);
+    return uc;
+  }
+
+  @Override
+  public URL getUrl() {
+    return url;
+  }
+
+  @Override
+  public void setConfiguration(Properties config) {
+    this.config = config;
+  }
+}
\ No newline at end of file
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
index 9ed99190..6078de36 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
@@ -187,28 +187,29 @@ public abstract class Configurator {
   }
 
   public void configureVersion() {
-    Properties p = new Properties();
-    try {
-      InputStream is = getManifest();
-      if (is != null) {
-        p.load(getManifest());
-        String version = p.getProperty("Implementation-Build");
-        properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
-            "citizen-card-environment/1.2 MOCCA " + version);
-        DataUrl.setConfiguration(properties);
-        log
-            .debug("Setting user agent to: "
-                + properties
-                    .getProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY));
-      } else {
-        log.warn("Cannot read manifest");
-        properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
-            "citizen-card-environment/1.2 MOCCA UNKNOWN");
-        DataUrl.setConfiguration(properties);
+    if (properties.getProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY) == null) {
+      Properties p = new Properties();
+      try {
+        InputStream is = getManifest();
+        if (is != null) {
+          p.load(getManifest());
+          String version = p.getProperty("Implementation-Build");
+          properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
+              "citizen-card-environment/1.2 MOCCA " + version);
+          log
+              .debug("Setting user agent to: "
+                  + properties
+                      .getProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY));
+        } else {
+          log.warn("Cannot read manifest");
+          properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
+              "citizen-card-environment/1.2 MOCCA UNKNOWN");
+        }
+      } catch (IOException e) {
+        log.error(e);
       }
-    } catch (IOException e) {
-      log.error(e);
     }
+    DataUrl.setConfiguration(properties);
   }
 
   public void configure() {
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxUpdateCommand.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxUpdateCommand.java
new file mode 100644
index 00000000..c2974785
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxUpdateCommand.java
@@ -0,0 +1,23 @@
+/*
+* 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;
+
+public interface InfoboxUpdateCommand extends SLCommand {
+
+  public String getInfoboxIdentifier();
+  
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxUpdateResult.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxUpdateResult.java
new file mode 100644
index 00000000..d180facf
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxUpdateResult.java
@@ -0,0 +1,21 @@
+/*
+* 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;
+
+public interface InfoboxUpdateResult extends SLResult {
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractAssocArrayInfobox.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractAssocArrayInfobox.java
new file mode 100644
index 00000000..e49ed6c0
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractAssocArrayInfobox.java
@@ -0,0 +1,284 @@
+/*
+ * 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.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxAssocArrayPairType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadDataAssocArrayType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadRequestType;
+import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
+import at.buergerkarte.namespaces.securitylayer._1.XMLContentType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType.ReadKeys;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType.ReadPairs;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType.ReadValue;
+import at.gv.egiz.bku.slcommands.InfoboxReadResult;
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+
+/**
+ * An abstract base class for {@link Infobox} implementations of type associative array.
+ * 
+ * @author mcentner
+ */
+public abstract class AbstractAssocArrayInfobox extends AbstractInfoboxImpl
+    implements AssocArrayInfobox {
+  
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(AbstractAssocArrayInfobox.class);
+
+  /**
+   * The search string pattern.
+   */
+  public static final String SEARCH_STRING_PATTERN = ".&&[^/](/.&&[^/])*";
+  
+  /**
+   * @return the keys available in this infobox.
+   */
+  public abstract String[] getKeys();
+  
+  /**
+   * @return <code>true</code> if the values are XML entities, or <code>false</code> otherwise.
+   */
+  public abstract boolean isValuesAreXMLEntities();
+  
+  /**
+   * Returns a key to value mapping for the given <code>keys</code>.
+   * 
+   * @param keys a list of keys
+   * @param cmdCtx the command context
+   * 
+   * @return a key to value mapping for the given <code>keys</code>.
+   * 
+   * @throws SLCommandException if obtaining the values fails
+   */
+  public abstract Map<String, Object> getValues(List<String> keys, SLCommandContext cmdCtx) throws SLCommandException;
+
+  /**
+   * Returns all keys that match the given <code>searchString</code>.
+   * 
+   * @param searchString the search string 
+   * 
+   * @return all keys that match the given <code>searchString</code>
+   * 
+   * @throws SLCommandException if the given search string is invalid
+   */
+  protected List<String> selectKeys(String searchString) throws SLCommandException {
+    
+    if ("*".equals(searchString) || "**".equals(searchString)) {
+      return Arrays.asList(getKeys());
+    }
+    
+    if (Pattern.matches(SEARCH_STRING_PATTERN, searchString)) {
+      
+//      for (int i = 0; i < searchString.length(); i++) {
+//        int codePoint = searchString.codePointAt(i);
+//        
+//      }
+      
+      // TODO : build pattern
+      return Collections.emptyList();
+    } else {
+      log.info("Got invalid search string '" + searchString + "'");
+      throw new SLCommandException(4010);
+    }
+    
+  }
+
+  /**
+   * Read all keys specified by <code>readKeys</code>.
+   * 
+   * @param readKeys
+   *          the ReadKeys element
+   * @param cmdCtx
+   *          the command context
+   * @return a corresponding InfoboxReadResult
+   * 
+   * @throws SLCommandException
+   *           if the ReadKeys element is invalid or obtaining the corresponding
+   *           values fails
+   */
+  protected InfoboxReadResult readKeys(ReadKeys readKeys, SLCommandContext cmdCtx) throws SLCommandException {
+    
+    List<String> selectedKeys = selectKeys(readKeys.getSearchString());
+    
+    if (readKeys.isUserMakesUnique() && selectedKeys.size() > 1) {
+      log.info("UserMakesUnique not supported");
+      // TODO: give more specific error message
+      throw new SLCommandException(4010);
+    }
+    
+    ObjectFactory objectFactory = new ObjectFactory();
+    
+    InfoboxReadDataAssocArrayType infoboxReadDataAssocArrayType = objectFactory
+        .createInfoboxReadDataAssocArrayType();
+
+    List<String> keys = infoboxReadDataAssocArrayType.getKey();
+    keys.addAll(selectedKeys);
+
+    return new InfoboxReadResultImpl(infoboxReadDataAssocArrayType);
+    
+  }
+  
+  /**
+   * Read all pairs specified by <code>readPairs</code>.
+   * 
+   * @param readPairs
+   *          the readPairs element
+   * @param cmdCtx
+   *          the command context
+   * @return a corresponding InfoboxReadResult
+   * 
+   * @throws SLCommandException
+   *           if the ReadPairs element is invalid or obtaining the corresponding
+   *           values fails
+   */
+  protected InfoboxReadResult readPairs(ReadPairs readPairs, SLCommandContext cmdCtx) throws SLCommandException {
+    
+    if (readPairs.isValuesAreXMLEntities() && !isValuesAreXMLEntities()) {
+      log.info("Got valuesAreXMLEntities=" + readPairs + " but infobox type is binary.");
+      throw new SLCommandException(4010);
+    }
+    
+    if (!readPairs.isValuesAreXMLEntities() && isValuesAreXMLEntities()) {
+      log.info("Got valuesAreXMLEntities=" + readPairs + " but infobox type is XML.");
+      throw new SLCommandException(4010);
+    }
+
+    List<String> selectedKeys = selectKeys(readPairs.getSearchString());
+    
+    if (readPairs.isUserMakesUnique() && selectedKeys.size() > 1) {
+      log.info("UserMakesUnique not supported");
+      // TODO: give more specific error message
+      throw new SLCommandException(4010);
+    }
+    
+    ObjectFactory objectFactory = new ObjectFactory();
+
+    InfoboxReadDataAssocArrayType infoboxReadDataAssocArrayType = objectFactory.createInfoboxReadDataAssocArrayType();
+
+    Map<String, Object> values = getValues(selectedKeys, cmdCtx);
+    for (String key : selectedKeys) {
+      InfoboxAssocArrayPairType infoboxAssocArrayPairType = objectFactory.createInfoboxAssocArrayPairType();
+      infoboxAssocArrayPairType.setKey(key);
+      Object value = values.get(key);
+      if (value instanceof byte[]) {
+        infoboxAssocArrayPairType.setBase64Content((byte[]) value);
+      } else {
+        infoboxAssocArrayPairType.setXMLContent((XMLContentType) value);
+      }
+      infoboxReadDataAssocArrayType.getPair().add(infoboxAssocArrayPairType);
+    }
+    
+    return new InfoboxReadResultImpl(infoboxReadDataAssocArrayType);
+  }
+
+  /**
+   * Read the value specified by <code>readPairs</code>.
+   * 
+   * @param readValue
+   *          the readValue element
+   * @param cmdCtx
+   *          the command context
+   * @return a corresponding InfoboxReadResult
+   * 
+   * @throws SLCommandException
+   *           if the ReadValue element is invalid or obtaining the corresponding
+   *           values fails
+   */
+  protected InfoboxReadResult readValue(ReadValue readValue, SLCommandContext cmdCtx) throws SLCommandException {
+    
+    if (readValue.isValueIsXMLEntity() && !isValuesAreXMLEntities()) {
+      log.info("Got valuesAreXMLEntities=" + readValue + " but infobox type is binary.");
+      throw new SLCommandException(4010);
+    }
+    
+    if (!readValue.isValueIsXMLEntity() && isValuesAreXMLEntities()) {
+      log.info("Got valuesAreXMLEntities=" + readValue + " but infobox type is XML.");
+      throw new SLCommandException(4010);
+    }
+    
+    List<String> selectedKeys;
+
+    if (Arrays.asList(getKeys()).contains(readValue.getKey())) {
+      selectedKeys = Collections.singletonList(readValue.getKey());
+    } else {
+      selectedKeys = Collections.emptyList();
+    }
+    
+    ObjectFactory objectFactory = new ObjectFactory();
+
+    InfoboxReadDataAssocArrayType infoboxReadDataAssocArrayType = objectFactory.createInfoboxReadDataAssocArrayType();
+    
+    Map<String, Object> values = getValues(selectedKeys, cmdCtx);
+    for (String key : selectedKeys) {
+      InfoboxAssocArrayPairType infoboxAssocArrayPairType = objectFactory.createInfoboxAssocArrayPairType();
+      infoboxAssocArrayPairType.setKey(key);
+      Object value = values.get(key);
+      if (value instanceof byte[]) {
+        infoboxAssocArrayPairType.setBase64Content((byte[]) value);
+      } else {
+        infoboxAssocArrayPairType.setXMLContent((XMLContentType) value);
+      }
+      infoboxReadDataAssocArrayType.getPair().add(infoboxAssocArrayPairType);
+    }
+    
+    return new InfoboxReadResultImpl(infoboxReadDataAssocArrayType);
+  }
+
+  @Override
+  public InfoboxReadResult read(InfoboxReadRequestType req,
+      SLCommandContext cmdCtx) throws SLCommandException {
+
+    InfoboxReadParamsAssocArrayType assocArrayParameters = req
+        .getAssocArrayParameters();
+
+    if (assocArrayParameters == null) {
+      log.info("Infobox type is AssocArray but got no AssocArrayParameters.");
+      throw new SLCommandException(4010);
+    }
+
+    if (assocArrayParameters.getReadKeys() != null) {
+      return readKeys(assocArrayParameters.getReadKeys(), cmdCtx);
+    }
+
+    if (assocArrayParameters.getReadPairs() != null) {
+      return readPairs(assocArrayParameters.getReadPairs(), cmdCtx);
+    }
+
+    // ReadValue
+    if (assocArrayParameters.getReadValue() != null) {
+      return readValue(assocArrayParameters.getReadValue(), cmdCtx);
+    }
+
+    log
+        .info("Infobox type is AssocArray but got invalid AssocArrayParameters.");
+    throw new SLCommandException(4010);
+    
+  }
+
+}
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
new file mode 100644
index 00000000..07ca639c
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractBinaryFileInfobox.java
@@ -0,0 +1,68 @@
+/*
+* 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 org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsBinaryFileType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadRequestType;
+
+/**
+ * An abstract base class for {@link Infobox} implementations of type binary file.
+ * 
+ * @author mcentner
+ */
+public abstract class AbstractBinaryFileInfobox extends AbstractInfoboxImpl implements BinaryFileInfobox {
+
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(AbstractBinaryFileInfobox.class);
+  
+  /**
+   * Is this infobox' content an XML entity?
+   */
+  private boolean isXMLEntity = false;
+  
+  /**
+   * @return <code>true</code> if this infobox' content is an XML entity or <code>false</code> otherwise.
+   */
+  public boolean isXMLEntity() {
+    return isXMLEntity;
+  }
+
+  /**
+   * Sets the value returned by {@link #isXMLEntity()} according to the given
+   * <code>request</code>.
+   * 
+   * @param request the InfoboxReadRequest
+   */
+  public void setIsXMLEntity(InfoboxReadRequestType request) {
+    
+    InfoboxReadParamsBinaryFileType binaryFileParameters = request.getBinaryFileParameters();
+    if (binaryFileParameters != null) {
+      isXMLEntity = binaryFileParameters.isContentIsXMLEntity();
+      log.debug("Got ContentIsXMLEntity=" + isXMLEntity + ".");
+    }
+    
+  }
+
+  
+  
+
+}
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
new file mode 100644
index 00000000..305769a8
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxCommandImpl.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.slcommands.impl;
+
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+
+/**
+ * An abstract base class for implementations of security layer infobox requests.
+ * 
+ * @author mcentner
+ *
+ * @param <T>
+ */
+public abstract class AbstractInfoboxCommandImpl<T> extends SLCommandImpl<T> {
+
+  /**
+   * The infobox implementation.
+   */
+  protected Infobox infobox;
+  
+  @Override
+  public void init(SLCommandContext ctx, Object request)
+      throws SLCommandException {
+    super.init(ctx, request);
+    
+    String infoboxIdentifier = getInfoboxIdentifier(getRequestValue());
+    
+    infobox = InfoboxFactory.getInstance().createInfobox(infoboxIdentifier);
+  }
+  
+  /**
+   * Returns the infobox identifier given in <code>request</code>.
+   * 
+   * @param request the request value
+   * 
+   * @return the infobox identifier givne in <code>request</code>
+   */
+  protected abstract String getInfoboxIdentifier(T request);
+
+}
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
new file mode 100644
index 00000000..e5c7afcc
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AbstractInfoboxImpl.java
@@ -0,0 +1,26 @@
+/*
+ * 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;
+
+/**
+ * An abstract base class for {@link Infobox} implementations.
+ * 
+ * @author mcentner
+ */
+public abstract class AbstractInfoboxImpl implements Infobox {
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AssocArrayInfobox.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AssocArrayInfobox.java
new file mode 100644
index 00000000..908d95da
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/AssocArrayInfobox.java
@@ -0,0 +1,27 @@
+/*
+ * 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;
+
+/**
+ * An {@link Infobox} of type associative array as defined in Security Layer
+ * 1.2.
+ * 
+ * @author mcentner
+ */
+public interface AssocArrayInfobox extends Infobox {
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/BinaryFileInfobox.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/BinaryFileInfobox.java
new file mode 100644
index 00000000..c27f9446
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/BinaryFileInfobox.java
@@ -0,0 +1,27 @@
+/*
+* 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;
+
+/**
+ * An {@link Infobox} of type binary file as defined in Security Layer
+ * 1.2.
+ * 
+ * @author mcentner
+ */
+public interface BinaryFileInfobox extends Infobox {
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CertificatesInfoboxImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CertificatesInfoboxImpl.java
new file mode 100644
index 00000000..0208f137
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CertificatesInfoboxImpl.java
@@ -0,0 +1,112 @@
+/*
+* 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.security.cert.CertificateEncodingException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+import at.gv.egiz.stal.InfoboxReadRequest;
+import at.gv.egiz.stal.STALRequest;
+
+/**
+ * An implementation of the {@link Infobox} <em>Certificates</em> as 
+ * specified in Security Layer 1.2. 
+ * 
+ * @author mcentner
+ */
+public class CertificatesInfoboxImpl extends AbstractAssocArrayInfobox {
+  
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(CertificatesInfoboxImpl.class);
+
+  /**
+   * The valid keys.
+   */
+  public static final String[] CERTIFICATES_KEYS = new String[] {
+    "SecureSignatureKeypair", 
+    "CertifiedKeypair" };
+  
+  @Override
+  public String getIdentifier() {
+    return "Certificates";
+  }
+
+  @Override
+  public String[] getKeys() {
+    return CERTIFICATES_KEYS;
+  }
+
+  @Override
+  public boolean isValuesAreXMLEntities() {
+    return false;
+  }
+
+  @Override
+  public Map<String, Object> getValues(List<String> certificates, SLCommandContext cmdCtx) throws SLCommandException {
+    
+    STALHelper stalHelper = new STALHelper(cmdCtx.getSTAL());
+    
+    if (certificates != null && !certificates.isEmpty()) {
+      
+      List<STALRequest> stalRequests = new ArrayList<STALRequest>();
+
+      // get certificates
+      InfoboxReadRequest infoboxReadRequest;
+      for (int i = 0; i < certificates.size(); i++) {
+        infoboxReadRequest = new InfoboxReadRequest();
+        infoboxReadRequest.setInfoboxIdentifier(certificates.get(i));
+        stalRequests.add(infoboxReadRequest);
+      }
+
+      stalHelper.transmitSTALRequest(stalRequests);
+
+      List<X509Certificate> x509Certs = stalHelper.getCertificatesFromResponses();
+      
+      Map<String, Object> values = new HashMap<String, Object>();
+
+      for (int i = 0; i < certificates.size(); i++) {
+        try {
+          values.put(certificates.get(i), x509Certs.get(i).getEncoded());
+        } catch (CertificateEncodingException e) {
+          log.error("Failed to encode certificate.", e);
+          throw new SLCommandException(4000);
+        }
+      }
+      
+      return values;
+      
+    } else {
+      
+      return new HashMap<String, Object>();
+      
+    }
+    
+    
+  }
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
index b2e3b303..01686641 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
@@ -16,13 +16,11 @@
  */
 package at.gv.egiz.bku.slcommands.impl;
 
-import java.io.ByteArrayInputStream;
 import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 
 import javax.xml.crypto.MarshalException;
 import javax.xml.crypto.URIReferenceException;
@@ -48,11 +46,8 @@ import at.gv.egiz.bku.slexceptions.SLException;
 import at.gv.egiz.bku.slexceptions.SLRequestException;
 import at.gv.egiz.bku.slexceptions.SLViewerException;
 import at.gv.egiz.dom.DOMUtils;
-import at.gv.egiz.stal.ErrorResponse;
 import at.gv.egiz.stal.InfoboxReadRequest;
-import at.gv.egiz.stal.InfoboxReadResponse;
 import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
 
 /**
  * This class implements the security layer command
@@ -147,33 +142,13 @@ public class CreateXMLSignatureCommandImpl extends
     InfoboxReadRequest stalRequest = new InfoboxReadRequest();
     stalRequest.setInfoboxIdentifier(keyboxIdentifier);
 
-    requestSTAL(Collections.singletonList((STALRequest) stalRequest));
-
-    STALResponse stalResponse = stalResponses.next();
-
-    if (stalResponse instanceof InfoboxReadResponse) {
-      byte[] infobox = ((InfoboxReadResponse) stalResponse).getInfoboxValue();
-
-      try {
-        CertificateFactory certFactory = CertificateFactory.getInstance("X509");
-        signingCertificate = (X509Certificate) certFactory
-            .generateCertificate(new ByteArrayInputStream(infobox));
-      } catch (CertificateException e) {
-        log.info("Failed to decode signing certificate.", e);
-        // TODO: issue appropriate error
-        throw new SLCommandException(4000);
-      }
-
-    } else if (stalResponse instanceof ErrorResponse) {
-      ErrorResponse err = (ErrorResponse) stalResponse;
-      log.info("Received an error response from STAL with code: "
-          + err.getErrorCode());
-      throw new SLCommandException(err.getErrorCode());
-
-    } else {
-      log.info("Failed to get signing certificate.");
+    stalHelper.transmitSTALRequest(Collections.singletonList((STALRequest) stalRequest));
+    List<X509Certificate> certificates = stalHelper.getCertificatesFromResponses();
+    if (certificates == null || certificates.size() != 1) {
+      log.info("Got an unexpected number of certificates from STAL.");
       throw new SLCommandException(4000);
     }
+    signingCertificate = certificates.get(0);
 
   }
 
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/IdentityLinkInfoboxImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/IdentityLinkInfoboxImpl.java
new file mode 100644
index 00000000..20d20c9d
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/IdentityLinkInfoboxImpl.java
@@ -0,0 +1,291 @@
+/*
+* 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.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+import at.buergerkarte.namespaces.personenbindung._20020506_.CompressedIdentityLinkType;
+import at.buergerkarte.namespaces.securitylayer._1.AnyChildrenType;
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadRequestType;
+import at.gv.egiz.bku.slcommands.InfoboxReadResult;
+import at.gv.egiz.bku.slcommands.SLCommand;
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+import at.gv.egiz.bku.slexceptions.SLExceptionMessages;
+import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.idlink.CompressedIdentityLinkFactory;
+import at.gv.egiz.idlink.IdentityLinkTransformer;
+import at.gv.egiz.idlink.ans1.IdentityLink;
+import at.gv.egiz.stal.InfoboxReadRequest;
+import at.gv.egiz.stal.STALRequest;
+
+/**
+ * An implementation of the {@link Infobox} <em>IdentityLink</em> as
+ * specified in Security Layer 1.2
+ * 
+ * @author mcentner
+ */
+public class IdentityLinkInfoboxImpl extends AbstractBinaryFileInfobox {
+
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(IdentityLinkInfoboxImpl.class);
+
+  /**
+   * The box specific parameter <code>IdentityLinkDomainIdentifier</code>.
+   */
+  public static final String BOX_SPECIFIC_PARAMETER_IDENTITY_LINK_DOMAIN_IDENTIFIER = "IdentityLinkDomainIdentifier";
+  
+  /**
+   * The value of the box specific parameter <code>IdentityLinkDomainIdentifier</code>.
+   */
+  private String domainIdentifier;
+  
+  @Override
+  public String getIdentifier() {
+    return "IdentityLink";
+  }
+
+  /**
+   * @return the value of the box specific parameter <code>IdentityLinkDomainIdentifier</code>
+   */
+  public String getDomainIdentifier() {
+    return domainIdentifier;
+  }
+
+  @Override
+  public InfoboxReadResult read(InfoboxReadRequestType req, SLCommandContext cmdCtx) throws SLCommandException {
+    
+    AnyChildrenType boxSpecificParameters = req.getBoxSpecificParameters();
+
+    if (boxSpecificParameters != null) {
+      // check BoxSpecificParameters
+      List<Object> parameter = boxSpecificParameters.getAny();
+      JAXBElement<?> element;
+      if (parameter != null 
+          && parameter.size() == 1 
+          && parameter.get(0) instanceof JAXBElement<?>
+          && SLCommand.NAMESPACE_URI.equals((element = (JAXBElement<?>) parameter.get(0)).getName().getNamespaceURI())
+          && BOX_SPECIFIC_PARAMETER_IDENTITY_LINK_DOMAIN_IDENTIFIER.equals(element.getName().getLocalPart())
+          && element.getValue() instanceof String) {
+        domainIdentifier = (String) element.getValue();
+        log.debug("Got sl:IdentityLinkDomainIdentifier: " + domainIdentifier);
+      } else {
+        log.info("Got invalid BoxSpecificParameters.");
+        throw new SLCommandException(4010);
+      }
+    }
+    
+    setIsXMLEntity(req);
+    
+    STALHelper stalHelper = new STALHelper(cmdCtx.getSTAL());
+    
+    List<STALRequest> stalRequests = new ArrayList<STALRequest>();
+
+    InfoboxReadRequest infoboxReadRequest;
+    // get raw identity link
+    infoboxReadRequest = new InfoboxReadRequest();
+    infoboxReadRequest.setInfoboxIdentifier(getIdentifier());
+    infoboxReadRequest.setDomainIdentifier(domainIdentifier);
+    stalRequests.add(infoboxReadRequest);
+    
+    // get certificates
+    infoboxReadRequest = new InfoboxReadRequest();
+    infoboxReadRequest.setInfoboxIdentifier("SecureSignatureKeypair");
+    stalRequests.add(infoboxReadRequest);
+    infoboxReadRequest = new InfoboxReadRequest();
+    infoboxReadRequest.setInfoboxIdentifier("CertifiedKeypair");
+    stalRequests.add(infoboxReadRequest);
+
+    stalHelper.transmitSTALRequest(stalRequests);
+    log.trace("Got STAL response");
+
+    IdentityLink identityLink = stalHelper.getIdentityLinkFromResponses();
+    List<X509Certificate> certificates = stalHelper.getCertificatesFromResponses();
+    
+    
+    CompressedIdentityLinkFactory idLinkFactory = CompressedIdentityLinkFactory.getInstance();
+    JAXBElement<CompressedIdentityLinkType> compressedIdentityLink = idLinkFactory
+        .createCompressedIdentityLink(identityLink, certificates, getDomainIdentifier());
+
+    IdentityLinkTransformer identityLinkTransformer = IdentityLinkTransformer.getInstance();
+    String issuerTemplate = identityLink.getIssuerTemplate();
+    
+    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+    DocumentBuilder db;
+    try {
+      db = dbf.newDocumentBuilder();
+    } catch (ParserConfigurationException e) {
+      log.error("Failed to create XML document.", e);
+      throw new SLRuntimeException(e);
+    }
+    
+    Document document = db.newDocument();
+    try {
+      idLinkFactory.marshallCompressedIdentityLink(compressedIdentityLink, document, null, true);
+    } catch (JAXBException e) {
+      log.info("Failed to marshall CompressedIdentityLink.", e);
+      throw new SLCommandException(4000,
+          SLExceptionMessages.EC4000_UNCLASSIFIED_INFOBOX_INVALID,
+          new Object[] { getIdentifier() });
+    }
+    
+    InfoboxReadResultFileImpl result = new InfoboxReadResultFileImpl();
+    ByteArrayOutputStream resultBytes = null;
+    Result xmlResult = (isXMLEntity() || getDomainIdentifier() != null) 
+          ? result.getXmlResult(true) 
+          : new StreamResult((resultBytes = new ByteArrayOutputStream()));
+    try {
+      log.trace("Trying to transform identitylink");
+      identityLinkTransformer.transformIdLink(issuerTemplate, new DOMSource(document), xmlResult);
+    } catch (MalformedURLException e) {
+      log.warn("Malformed issuer template URL '" + issuerTemplate + "'.");
+      throw new SLCommandException(4000,
+          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
+          new Object[] { issuerTemplate });
+    } catch (IOException e) {
+      log.warn("Failed to dereferene issuer template URL '" + issuerTemplate + "'." ,e);
+      throw new SLCommandException(4000,
+          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
+          new Object[] { issuerTemplate });
+    } catch (TransformerConfigurationException e) {
+      log.warn("Failed to create transformation template from issuer template URL '" + issuerTemplate + "'", e);
+      throw new SLCommandException(4000,
+          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
+          new Object[] { issuerTemplate });
+    } catch (TransformerException e) {
+      log.info("Faild to transform CompressedIdentityLink.", e);
+      throw new SLCommandException(4000,
+          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
+          new Object[] { issuerTemplate });
+    }
+    
+    // TODO: Report BUG in IssuerTemplates
+    // Some IssuerTemplate stylesheets do not consider the pr:Type-Element of the CompressedIdentityLink ...
+    if (getDomainIdentifier() != null) {
+      if (xmlResult instanceof DOMResult) {
+        Node node = ((DOMResult) xmlResult).getNode();
+        Node nextSibling = ((DOMResult) xmlResult).getNextSibling();
+        Node idLinkNode;
+        if (nextSibling != null) {
+          idLinkNode = nextSibling.getPreviousSibling();
+        } else if (node != null) {
+          idLinkNode = node.getFirstChild();
+        } else {
+          log
+              .error("An IdentityLinkDomainIdentifier of '"
+                  + getDomainIdentifier()
+                  + "' has been given. However, it cannot be set, as the transformation result does not contain a node.");
+          throw new SLCommandException(4000,
+              SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
+              new Object[] { issuerTemplate });
+        }
+        IdentityLinkTransformer.setDomainIdentifier(idLinkNode, getDomainIdentifier());
+      } else {
+        log
+            .error("An IdentityLinkDomainIdentifier of '"
+                + getDomainIdentifier()
+                + "' has been given. However, it cannot be set, as the transformation result is not of type DOM.");
+        throw new SLCommandException(4000,
+            SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
+            new Object[] { issuerTemplate });
+      }
+    }
+    
+    if (!isXMLEntity()) {
+      if (resultBytes == null) {
+        resultBytes = new ByteArrayOutputStream();
+
+        if (xmlResult instanceof DOMResult) {
+          Node node = ((DOMResult) xmlResult).getNode();
+          Node nextSibling = ((DOMResult) xmlResult).getNextSibling();
+          
+          DOMSource xmlSource;
+          if (nextSibling != null) {
+            xmlSource = new DOMSource(nextSibling.getPreviousSibling());
+          } else if (node != null) {
+            xmlSource = new DOMSource(node.getFirstChild());
+          } else {
+            log
+                .error("IssuerTemplate transformation returned no node.");
+            throw new SLCommandException(4000,
+                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
+                new Object[] { issuerTemplate });
+          }
+          TransformerFactory transformerFactory = TransformerFactory.newInstance();
+          try {
+            Transformer transformer = transformerFactory.newTransformer();
+            transformer.transform(xmlSource, new StreamResult(resultBytes));
+          } catch (TransformerConfigurationException e) {
+            log.error(e);
+            throw new SLCommandException(4000,
+                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
+                new Object[] { issuerTemplate });
+          } catch (TransformerException e) {
+            log.error(e);
+            throw new SLCommandException(4000,
+                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
+                new Object[] { issuerTemplate });
+          }
+        } else if (xmlResult instanceof StreamResult) {
+          OutputStream outputStream = ((StreamResult) xmlResult).getOutputStream();
+          if (outputStream instanceof ByteArrayOutputStream) {
+            result.setResultBytes(((ByteArrayOutputStream) outputStream).toByteArray());
+          } else {
+            log.error("ContentIsXMLEntity is set to 'false'. However, an XMLResult has already been set.");
+            throw new SLCommandException(4000,
+                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
+                new Object[] { issuerTemplate });
+          }
+        }
+      } else {
+        result.setResultBytes(resultBytes.toByteArray());
+      }
+    }
+    
+    return result;
+
+  }
+  
+
+}
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
new file mode 100644
index 00000000..a6f8cbb2
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/Infobox.java
@@ -0,0 +1,53 @@
+/*
+ * 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 at.buergerkarte.namespaces.securitylayer._1.InfoboxReadRequestType;
+import at.gv.egiz.bku.slcommands.InfoboxReadResult;
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+
+/**
+ * An implementation of this interface represents a infobox as defined in
+ * Security-Layer 1.2.
+ * 
+ * @author mcentner
+ */
+public interface Infobox {
+
+  /**
+   * @return the identifier of this infobox
+   */
+  public String getIdentifier();
+
+  /**
+   * Read data from this infobox.
+   * 
+   * @param request
+   *          the InfoboxReadRequest
+   * @param cmdCtx
+   *          the command context
+   * 
+   * @return the data read from this infobox as InfoboxReadResult
+   * 
+   * @throws SLCommandException
+   *           if reading from this infobox fails
+   */
+  public InfoboxReadResult read(InfoboxReadRequestType request,
+      SLCommandContext cmdCtx) throws SLCommandException;
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java
new file mode 100644
index 00000000..4a03fe74
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java
@@ -0,0 +1,151 @@
+/*
+* 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.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+import at.gv.egiz.bku.slexceptions.SLExceptionMessages;
+import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+
+/**
+ * A factory for creating {@link Infobox}es.
+ * 
+ * @author mcentner
+ */
+public class InfoboxFactory {
+  
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(InfoboxFactory.class);
+  
+  /**
+   * The singleton instance of this InfoboxFactory.
+   */
+  private static InfoboxFactory instance;
+
+  /**
+   * @return an instance of this InfoboxFactory
+   */
+  public synchronized static InfoboxFactory getInstance() {
+    if (instance == null) {
+      instance = new InfoboxFactory();
+    }
+    return instance;
+  }
+ 
+  /**
+   * The mapping of infobox identifier to implementation class.
+   */
+  private HashMap<String, Class<? extends Infobox>> implementations;
+
+  /**
+   * Private constructor.
+   */
+  private InfoboxFactory() {
+  }
+
+  /**
+   * Sets the mapping of infobox identifier to implementation class name.
+   * 
+   * @param infoboxImplMap
+   *          a mapping of infobox identifiers to implementation class names
+   * 
+   * @throws ClassNotFoundException
+   *           if implementation class is not an instance of {@link Infobox}
+   */
+  @SuppressWarnings("unchecked")
+  public void setInfoboxImpl(Map<String, String> infoboxImplMap) throws ClassNotFoundException {
+    HashMap<String, Class<? extends Infobox>> implMap = new HashMap<String, Class<? extends Infobox>>();
+    ClassLoader cl = getClass().getClassLoader();
+    for (String key : infoboxImplMap.keySet()) {
+      Class<? extends Infobox> impl = (Class<? extends Infobox>) cl.loadClass(infoboxImplMap.get(key));
+      log.debug("Registering infobox '" + key + "' implementation '" + impl.getCanonicalName() + "'.");
+      implementations.put(key, impl);
+    }
+    implementations = implMap;
+  }
+
+  /**
+   * Returns the configured implementation class for the given
+   * <code>infoboxIdentifier</code>.
+   * 
+   * @param infoboxIdentifier
+   *          the infobox identifier
+   * 
+   * @return the implementation class for the given infobox identifier or
+   *         <code>null</code> if there is no implementation class configured
+   */
+  public Class<? extends Infobox> getImplClass(String infoboxIdentifier) {
+    if (implementations != null) {
+      return implementations.get(infoboxIdentifier);
+    } else {
+      return null;
+    }
+  }
+
+  /**
+   * Create a new {@link Infobox} instance for the given
+   * <code>infoboxIdentifier</code>.
+   * 
+   * @param infoboxIdentifier
+   *          the infobox identifier
+   * 
+   * @return an {@link Infobox} implementation for the given infobox identifier
+   * 
+   * @throws SLCommandException
+   *           if there is no implementation for the given infobox identifier
+   * @throws SLRuntimeException
+   *           if creating an {@link Infobox} instance fails
+   */
+  public Infobox createInfobox(String infoboxIdentifier) throws SLCommandException, SLRuntimeException {
+    
+    Class<? extends Infobox> implClass = getImplClass(infoboxIdentifier);
+    if (implClass == null) {
+      // infobox not supported
+      log.info("Unsupported infobox '" + infoboxIdentifier + ".");
+      throw new SLCommandException(4002,
+          SLExceptionMessages.EC4002_INFOBOX_UNKNOWN,
+          new Object[] { infoboxIdentifier });
+    }
+    
+    // try to instantiate
+    Infobox infobox;
+    try {
+      infobox = implClass.newInstance();
+      log.debug("Infobox '" + infobox.getIdentifier() + "' created.");
+    } catch (InstantiationException e) {
+      // unexpected error
+      log.error("Failed to instantiate infobox implementation.", e);
+      throw new SLRuntimeException(e);
+    } catch (IllegalAccessException e) {
+      // unexpected error
+      log.error("Failed to instantiate infobox implementation.", e);
+      throw new SLRuntimeException(e);
+    }
+    
+    return infobox;
+    
+  }
+  
+
+}
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 c7bb5205..aaa786a6 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
@@ -16,67 +16,14 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
-import iaik.asn1.CodingException;
-import iaik.asn1.DerCoder;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Result;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
 
-import at.buergerkarte.namespaces.personenbindung._20020506_.CompressedIdentityLinkType;
-import at.buergerkarte.namespaces.securitylayer._1.AnyChildrenType;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxAssocArrayPairType;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadDataAssocArrayType;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsBinaryFileType;
 import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadRequestType;
-import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType.ReadKeys;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType.ReadPairs;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType.ReadValue;
 import at.gv.egiz.bku.slcommands.InfoboxReadCommand;
-import at.gv.egiz.bku.slcommands.SLCommand;
 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;
-import at.gv.egiz.bku.slexceptions.SLRuntimeException;
-import at.gv.egiz.idlink.CompressedIdentityLinkFactory;
-import at.gv.egiz.idlink.IdentityLinkTransformer;
-import at.gv.egiz.idlink.ans1.IdentityLink;
-import at.gv.egiz.stal.InfoboxReadRequest;
-import at.gv.egiz.stal.InfoboxReadResponse;
-import at.gv.egiz.stal.STALRequest;
 
 /**
  * This class implements the security layer command
@@ -88,7 +35,7 @@ import at.gv.egiz.stal.STALRequest;
  * 
  * @author mcentner
  */
-public class InfoboxReadCommandImpl extends SLCommandImpl<InfoboxReadRequestType> implements
+public class InfoboxReadCommandImpl extends AbstractInfoboxCommandImpl<InfoboxReadRequestType> implements
     InfoboxReadCommand {
   
   /**
@@ -96,511 +43,63 @@ public class InfoboxReadCommandImpl extends SLCommandImpl<InfoboxReadRequestType
    */
   protected static Log log = LogFactory.getLog(InfoboxReadCommandImpl.class);
   
-  public static final String SEARCH_STRING_PATTERN = ".&&[^/](/.&&[^/])*";
-
-  public static final String INFOBOX_IDENTIFIER_CERTIFICATES = "Certificates";
-  
-  public static final String BOX_SPECIFIC_PARAMETER_IDENTITY_LINK_DOMAIN_IDENTIFIER = "IdentityLinkDomainIdentifier";
-  
-  public static final String INFOBOX_IDENTIFIER_IDENTITY_LINK = "IdentityLink";
-
-  public static final String[] INFOXBOX_CERTIFICATES_KEYS = new String[] {
-      "SecureSignatureKeypair", 
-      "CertifiedKeypair" };
-  
-  private static final int ASSOC_ARRAY_READ_KEYS = 1;
-  
-  private static final int ASSOC_ARRAY_READ_PAIRS = 2;
-  
-  private static final int ASSOC_ARRAY_READ_VALUE = 3;
-  
-  /**
-   * The <code>InfoboxIdentifier</code>
-   */
-  protected String infoboxIdentifier;
-  
-  /**
-   * The <code>IdentityLinkDomainIdentifier</code> value of an <code>IdentyLink</code> infobox.
-   */
-  protected String identityLinkDomainIdentifier;
-  
-  /**
-   * The list of certificates to be read from an <code>Certificates</code> infobox.
-   */
-  protected List<String> certificates;
-  
-  /**
-   * The result type.
-   */
-  protected int assocArrayResult;
-
-  /**
-   * Is content XML entity?
-   */
-  protected boolean isXMLEntity;
-  
   @Override
   public String getName() {
     return "InfoboxReadRequest";
   }
 
-  /**
-   * @return the infoboxIdentifier
-   */
-  public String getInfoboxIdentifier() {
-    return infoboxIdentifier;
-  }
-
+  @Override
+  protected String getInfoboxIdentifier(InfoboxReadRequestType request) {
+    return request.getInfoboxIdentifier();
+  }
+
   @Override
   public void init(SLCommandContext ctx, Object request) throws SLCommandException {
     super.init(ctx, request);
     
     InfoboxReadRequestType req = getRequestValue();
-    
-    infoboxIdentifier = req.getInfoboxIdentifier();
-    
-    if (INFOBOX_IDENTIFIER_IDENTITY_LINK.equals(infoboxIdentifier)) {
-      
-      if (req.getAssocArrayParameters() != null) {
-        log.info("Got AssocArrayParameters but Infobox type is BinaryFile.");
-        throw new SLCommandException(4010);
-      }
-      
-      InfoboxReadParamsBinaryFileType binaryFileParameters = req.getBinaryFileParameters();
-      if (binaryFileParameters != null) {
-        isXMLEntity = binaryFileParameters.isContentIsXMLEntity();
-        log.debug("Got ContentIsXMLEntity=" + isXMLEntity + ".");
-      }
-      
-      AnyChildrenType boxSpecificParameters = req.getBoxSpecificParameters();
-
-      if (boxSpecificParameters != null) {
-        // check BoxSpecificParameters
-        List<Object> parameter = boxSpecificParameters.getAny();
-        JAXBElement<?> element;
-        if (parameter != null 
-            && parameter.size() == 1 
-            && parameter.get(0) instanceof JAXBElement<?>
-            && SLCommand.NAMESPACE_URI.equals((element = (JAXBElement<?>) parameter.get(0)).getName().getNamespaceURI())
-            && BOX_SPECIFIC_PARAMETER_IDENTITY_LINK_DOMAIN_IDENTIFIER.equals(element.getName().getLocalPart())
-            && element.getValue() instanceof String) {
-          identityLinkDomainIdentifier = (String) element.getValue();
-          log.debug("Got sl:IdentityLinkDomainIdentifier: " + identityLinkDomainIdentifier);
-        } else {
-          log.info("Got invalid BoxSpecificParameters.");
-          throw new SLCommandException(4010);
-        }
-      }
     
-    } else if (INFOBOX_IDENTIFIER_CERTIFICATES.equals(infoboxIdentifier)) {
-      
-      if (req.getBinaryFileParameters() != null) {
-        log.info("Got BinaryFileParameters but Infobox type is AssocArray.");
-        throw new SLCommandException(4010);
-      }
-      
-      if (req.getBoxSpecificParameters() != null) {
-        log.info("Got invalid BoxSpecificParameters.");
-        throw new SLCommandException(4010);
-      }
-      
-      InfoboxReadParamsAssocArrayType assocArrayParameters = req
-          .getAssocArrayParameters();
-      if (assocArrayParameters == null) {
-        log.info("Infobox type is AssocArray but got no AssocArrayParameters.");
-        throw new SLCommandException(4010);
-      }
-      
-      // RreadKeys?
-      if (assocArrayParameters.getReadKeys() != null) {
-        assocArrayResult = ASSOC_ARRAY_READ_KEYS;
-        ReadKeys readKeys = assocArrayParameters.getReadKeys();
-        certificates = findCertificates(readKeys.getSearchString());
-        if (readKeys.isUserMakesUnique() && certificates.size() > 1) {
-          log.info("UserMakesUnique not supported");
-          // TODO: give more specific error message
-          throw new SLCommandException(4010);
-        }
-      }
-
-      // ReadPairs?
-      if (assocArrayParameters.getReadPairs() != null) {
-        assocArrayResult = ASSOC_ARRAY_READ_PAIRS;
-        ReadPairs readPairs = assocArrayParameters.getReadPairs();
-        if (readPairs.isValuesAreXMLEntities()) {
-          log.info("Got valuesAreXMLEntities but infobox type is binary.");
-          throw new SLCommandException(4010);
-        }
-        certificates = findCertificates(readPairs.getSearchString());
-        if (readPairs.isUserMakesUnique() && certificates.size() > 1) {
-          log.info("UserMakesUnique not supported");
-          // TODO: give more specific error message
-          throw new SLCommandException(4010);
-        }
-      }
-
-      // ReadValue
-      if (assocArrayParameters.getReadValue() != null) {
-        assocArrayResult = ASSOC_ARRAY_READ_VALUE;
-        ReadValue readValue = assocArrayParameters.getReadValue();
-        if (readValue.isValueIsXMLEntity()) {
-          log.info("Got valuesAreXMLEntities but infobox type is binary.");
-          throw new SLCommandException(4010);
-        }
-        String key = readValue.getKey();
-        if (Arrays.asList(INFOXBOX_CERTIFICATES_KEYS).contains(key)) {
-          certificates = Collections.singletonList(key);
-        } else {
-          certificates = Collections.emptyList();
-        }
-      }
-
-      if (assocArrayResult == 0) {
-        log.info("Infobox type is AssocArray but got invalid AssocArrayParameters.");
-        throw new SLCommandException(4010);
-      }
-      
-    } else {
-      throw new SLCommandException(4002,
-          SLExceptionMessages.EC4002_INFOBOX_UNKNOWN,
-          new Object[] { infoboxIdentifier });
-    }
+    if (req.getAssocArrayParameters() != null && 
+        !(infobox instanceof AssocArrayInfobox)) {
+      log.info("Got AssocArrayParameters but Infobox type is not AssocArray.");
+      throw new SLCommandException(4010);
+    }
+    
+    if (req.getBinaryFileParameters() != null &&
+        !(infobox instanceof BinaryFileInfobox)) {
+      log.info("Got BinaryFileParameters but Infobox type is not BinaryFile.");
+      throw new SLCommandException(4010);
+    }
     
   }
 
   @Override
   public SLResult execute() {
-    try {
-      if (INFOBOX_IDENTIFIER_IDENTITY_LINK.equals(infoboxIdentifier)) {
-        return readIdentityLink();
-      } else if (INFOBOX_IDENTIFIER_CERTIFICATES.equals(infoboxIdentifier)) {
-        return readCertificates();
-      } else {
-        throw new SLCommandException(4000);
-      }
-    } catch (SLCommandException e) {
-      return new ErrorResultImpl(e, cmdCtx.getLocale());
-    }
-  }
- 
-  /**
-   * Gets the IdentitiyLink form the next STAL response.
-   * 
-   * @return the IdentityLink
-   * 
-   * @throws SLCommandException if getting the IdentitiyLink fails
-   */
-  private IdentityLink getIdentityLinkFromResponses() throws SLCommandException {
-
-    // IdentityLink
-    InfoboxReadResponse response;
-    if (hasNextResponse()) {
-      response = (InfoboxReadResponse) nextResponse(InfoboxReadResponse.class);
-      byte[] idLink = response.getInfoboxValue();
-      try {
-        return new IdentityLink(DerCoder.decode(idLink));
-      } catch (CodingException e) {
-        log.info("Failed to decode infobox '" + INFOBOX_IDENTIFIER_IDENTITY_LINK + "'.", e);
-        throw new SLCommandException(4000,
-            SLExceptionMessages.EC4000_UNCLASSIFIED_INFOBOX_INVALID,
-            new Object[] { INFOBOX_IDENTIFIER_IDENTITY_LINK });
-      }
-    } else {
-      log.info("No infobox '" + INFOBOX_IDENTIFIER_IDENTITY_LINK + "' returned from STAL.");
-      throw new SLCommandException(4000);
-    }
-    
-  }
-  
-  /**
-   * Gets the list of certificates from the next STAL responses.
-   * 
-   * @return the list of certificates
-   * 
-   * @throws SLCommandException if getting the list of certificates fails
-   */
-  private List<X509Certificate> getCertificatesFromResponses() throws SLCommandException {
-    
-    List<X509Certificate> certificates = new ArrayList<X509Certificate>();
-
-    CertificateFactory certFactory;
-    try {
-      certFactory = CertificateFactory.getInstance("X509");
-    } catch (CertificateException e) {
-      // we should always be able to get an X509 certificate factory
-      log.error("CertificateFactory.getInstance(\"X509\") failed.", e);
-      throw new SLRuntimeException(e);
-    }
-    
-    InfoboxReadResponse response;
-    while(hasNextResponse()) {
-      response = (InfoboxReadResponse) nextResponse(InfoboxReadResponse.class);
-      byte[] cert = response.getInfoboxValue();
-      try {
-        certificates.add((X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(cert)));
-      } catch (CertificateException e) {
-        log.info("Failed to decode certificate.", e);
-        throw new SLCommandException(4000,
-            SLExceptionMessages.EC4000_UNCLASSIFIED_INFOBOX_INVALID,
-            new Object[] { INFOBOX_IDENTIFIER_CERTIFICATES });
-      }
-    }
-    
-    return certificates;
-
-  }
-
-  /**
-   * Uses STAL to read the IdentityLink.
-   * 
-   * @return the corresponding security layer result
-   * 
-   * @throws SLCommandException if reading the IdentityLink fails
-   */
-  private SLResult readIdentityLink() throws SLCommandException {
-    
-    List<STALRequest> stalRequests = new ArrayList<STALRequest>();
-
-    InfoboxReadRequest infoboxReadRequest;
-    // get raw identity link
-    infoboxReadRequest = new InfoboxReadRequest();
-    infoboxReadRequest.setInfoboxIdentifier(INFOBOX_IDENTIFIER_IDENTITY_LINK);
-    infoboxReadRequest.setDomainIdentifier(identityLinkDomainIdentifier);
-    stalRequests.add(infoboxReadRequest);
-    
-    // get certificates
-    infoboxReadRequest = new InfoboxReadRequest();
-    infoboxReadRequest.setInfoboxIdentifier("SecureSignatureKeypair");
-    stalRequests.add(infoboxReadRequest);
-    infoboxReadRequest = new InfoboxReadRequest();
-    infoboxReadRequest.setInfoboxIdentifier("CertifiedKeypair");
-    stalRequests.add(infoboxReadRequest);
-
-    requestSTAL(stalRequests);
-    log.trace("Got STAL response");
-
-    IdentityLink identityLink = getIdentityLinkFromResponses();
-    List<X509Certificate> certificates = getCertificatesFromResponses();
-    
-    
-    CompressedIdentityLinkFactory idLinkFactory = CompressedIdentityLinkFactory.getInstance();
-    JAXBElement<CompressedIdentityLinkType> compressedIdentityLink = idLinkFactory
-        .createCompressedIdentityLink(identityLink, certificates, identityLinkDomainIdentifier);
-
-    IdentityLinkTransformer identityLinkTransformer = IdentityLinkTransformer.getInstance();
-    String issuerTemplate = identityLink.getIssuerTemplate();
-    
-    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-    DocumentBuilder db;
-    try {
-      db = dbf.newDocumentBuilder();
-    } catch (ParserConfigurationException e) {
-      log.error("Failed to create XML document.", e);
-      throw new SLRuntimeException(e);
-    }
-    
-    Document document = db.newDocument();
-    try {
-      idLinkFactory.marshallCompressedIdentityLink(compressedIdentityLink, document, null, true);
-    } catch (JAXBException e) {
-      log.info("Failed to marshall CompressedIdentityLink.", e);
-      throw new SLCommandException(4000,
-          SLExceptionMessages.EC4000_UNCLASSIFIED_INFOBOX_INVALID,
-          new Object[] { INFOBOX_IDENTIFIER_IDENTITY_LINK });
-    }
-    
-    InfoboxReadResultFileImpl result = new InfoboxReadResultFileImpl();
-    ByteArrayOutputStream resultBytes = null;
-    Result xmlResult = (isXMLEntity || identityLinkDomainIdentifier != null) 
-          ? result.getXmlResult(true) 
-          : new StreamResult((resultBytes = new ByteArrayOutputStream()));
+    
     try {
-      log.trace("Trying to transform identitylink");
-      identityLinkTransformer.transformIdLink(issuerTemplate, new DOMSource(document), xmlResult);
-    } catch (MalformedURLException e) {
-      log.warn("Malformed issuer template URL '" + issuerTemplate + "'.");
-      throw new SLCommandException(4000,
-          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-          new Object[] { issuerTemplate });
-    } catch (IOException e) {
-      log.warn("Failed to dereferene issuer template URL '" + issuerTemplate + "'." ,e);
-      throw new SLCommandException(4000,
-          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-          new Object[] { issuerTemplate });
-    } catch (TransformerConfigurationException e) {
-      log.warn("Failed to create transformation template from issuer template URL '" + issuerTemplate + "'", e);
-      throw new SLCommandException(4000,
-          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-          new Object[] { issuerTemplate });
-    } catch (TransformerException e) {
-      log.info("Faild to transform CompressedIdentityLink.", e);
-      throw new SLCommandException(4000,
-          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-          new Object[] { issuerTemplate });
-    }
-    
-    // TODO: Report BUG in IssuerTemplates
-    // Some IssuerTemplate stylesheets do not consider the pr:Type-Element of the CompressedIdentityLink ...
-    if (identityLinkDomainIdentifier != null) {
-      if (xmlResult instanceof DOMResult) {
-        Node node = ((DOMResult) xmlResult).getNode();
-        Node nextSibling = ((DOMResult) xmlResult).getNextSibling();
-        Node idLinkNode;
-        if (nextSibling != null) {
-          idLinkNode = nextSibling.getPreviousSibling();
-        } else if (node != null) {
-          idLinkNode = node.getFirstChild();
-        } else {
-          log
-              .error("An IdentityLinkDomainIdentifier of '"
-                  + identityLinkDomainIdentifier
-                  + "' has been given. However, it cannot be set, as the transformation result does not contain a node.");
-          throw new SLCommandException(4000,
-              SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-              new Object[] { issuerTemplate });
-        }
-        IdentityLinkTransformer.setDomainIdentifier(idLinkNode, identityLinkDomainIdentifier);
-      } else {
-        log
-            .error("An IdentityLinkDomainIdentifier of '"
-                + identityLinkDomainIdentifier
-                + "' has been given. However, it cannot be set, as the transformation result is not of type DOM.");
-        throw new SLCommandException(4000,
-            SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-            new Object[] { issuerTemplate });
-      }
-    }
-    
-    if (!isXMLEntity) {
-      if (resultBytes == null) {
-        resultBytes = new ByteArrayOutputStream();
-
-        if (xmlResult instanceof DOMResult) {
-          Node node = ((DOMResult) xmlResult).getNode();
-          Node nextSibling = ((DOMResult) xmlResult).getNextSibling();
-          
-          DOMSource xmlSource;
-          if (nextSibling != null) {
-            xmlSource = new DOMSource(nextSibling.getPreviousSibling());
-          } else if (node != null) {
-            xmlSource = new DOMSource(node.getFirstChild());
-          } else {
-            log
-                .error("IssuerTemplate transformation returned no node.");
-            throw new SLCommandException(4000,
-                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-                new Object[] { issuerTemplate });
-          }
-          TransformerFactory transformerFactory = TransformerFactory.newInstance();
-          try {
-            Transformer transformer = transformerFactory.newTransformer();
-            transformer.transform(xmlSource, new StreamResult(resultBytes));
-          } catch (TransformerConfigurationException e) {
-            log.error(e);
-            throw new SLCommandException(4000,
-                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-                new Object[] { issuerTemplate });
-          } catch (TransformerException e) {
-            log.error(e);
-            throw new SLCommandException(4000,
-                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-                new Object[] { issuerTemplate });
-          }
-        } else if (xmlResult instanceof StreamResult) {
-          OutputStream outputStream = ((StreamResult) xmlResult).getOutputStream();
-          if (outputStream instanceof ByteArrayOutputStream) {
-            result.setResultBytes(((ByteArrayOutputStream) outputStream).toByteArray());
-          } else {
-            log.error("ContentIsXMLEntity is set to 'false'. However, an XMLResult has already been set.");
-            throw new SLCommandException(4000,
-                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-                new Object[] { issuerTemplate });
-          }
-        }
-      } else {
-        result.setResultBytes(resultBytes.toByteArray());
-      }
-    }
-    
-    
-    return result;
-    
-  }
-  
-  protected List<String> findCertificates(String searchString) throws SLCommandException {
-
-    if ("*".equals(searchString) || "**".equals(searchString)) {
-      return Arrays.asList(INFOXBOX_CERTIFICATES_KEYS);
+      return infobox.read(getRequestValue(), getCmdCtx());
+    } catch (SLCommandException e) {
+      return new ErrorResultImpl(e, getCmdCtx().getLocale());
     }
     
-    if (Pattern.matches(SEARCH_STRING_PATTERN, searchString)) {
-      
-//      for (int i = 0; i < searchString.length(); i++) {
-//        int codePoint = searchString.codePointAt(i);
-//        
-//      }
-      
-      // TODO : build pattern
-      return Collections.emptyList();
+  }
+ 
+
+  @Override
+  public String getIdentityLinkDomainId() {
+    if (infobox instanceof IdentityLinkInfoboxImpl) {
+      return ((IdentityLinkInfoboxImpl) infobox).getDomainIdentifier();
     } else {
-      log.info("Got invalid search string '" + searchString + "'");
-      throw new SLCommandException(4010);
+      return null;
     }
-    
   }
 
-  private SLResult readCertificates() throws SLCommandException {
-    
-    ObjectFactory objectFactory = new ObjectFactory();
-    
-    InfoboxReadDataAssocArrayType infoboxReadDataAssocArrayType = objectFactory
-        .createInfoboxReadDataAssocArrayType();
-
-    if (assocArrayResult == ASSOC_ARRAY_READ_KEYS) {
-
-      List<String> keys = infoboxReadDataAssocArrayType.getKey();
-      keys.addAll(certificates);
-      
+  @Override
+  public String getInfoboxIdentifier() {
+    if (infobox != null) {
+      return infobox.getIdentifier();
     } else {
-
-      if (certificates != null && !certificates.isEmpty()) {
-        
-        List<STALRequest> stalRequests = new ArrayList<STALRequest>();
-
-        // get certificates
-        InfoboxReadRequest infoboxReadRequest;
-        for (int i = 0; i < certificates.size(); i++) {
-          infoboxReadRequest = new InfoboxReadRequest();
-          infoboxReadRequest.setInfoboxIdentifier(certificates.get(i));
-          stalRequests.add(infoboxReadRequest);
-        }
-
-        requestSTAL(stalRequests);
-
-        List<X509Certificate> x509Certs = getCertificatesFromResponses();
-
-        for (int i = 0; i < certificates.size(); i++) {
-          InfoboxAssocArrayPairType infoboxAssocArrayPairType = objectFactory.createInfoboxAssocArrayPairType();
-          infoboxAssocArrayPairType.setKey(certificates.get(i));
-          try {
-            infoboxAssocArrayPairType.setBase64Content(x509Certs.get(i).getEncoded());
-          } catch (CertificateEncodingException e) {
-            log.error("Failed to encode certificate.", e);
-            throw new SLCommandException(4000);
-          }
-          infoboxReadDataAssocArrayType.getPair().add(infoboxAssocArrayPairType);
-        }
-        
-      }
-      
+      return null;
     }
-    
-    return new InfoboxReadResultImpl(infoboxReadDataAssocArrayType);
-    
-  }
-  
-  @Override
-  public String getIdentityLinkDomainId() {
-    return identityLinkDomainIdentifier;
   }
 }
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 8904eac6..a2b8ac9f 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
@@ -23,8 +23,9 @@ import javax.xml.transform.Templates;
 import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadDataAssocArrayType;
 import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadResponseType;
 import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
+import at.gv.egiz.bku.slcommands.InfoboxReadResult;
 
-public class InfoboxReadResultImpl extends SLResultImpl {
+public class InfoboxReadResultImpl extends SLResultImpl implements InfoboxReadResult {
 
   /**
    * The <code>InfoboxReadResponse</code>
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
new file mode 100644
index 00000000..6d281686
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxUpdateCommandImpl.java
@@ -0,0 +1,158 @@
+/*
+* 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.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 {
+  
+  private static Log log = LogFactory.getLog(InfoboxUpdateCommandImpl.class);
+
+  public static final String INFOBOX_IDENTIFIER_CARD_CHANNEL = "CardChannel";
+
+  protected String infoboxIdentifier;
+  
+  protected List<Object> cardChannelScript;
+  
+  @Override
+  public String getInfoboxIdentifier() {
+    return infoboxIdentifier;
+  }
+  
+  @Override
+  public void init(SLCommandContext ctx, Object request)
+      throws SLCommandException {
+    super.init(ctx, request);
+    
+    InfoboxUpdateRequestType req = getRequestValue();
+    
+    infoboxIdentifier = req.getInfoboxIdentifier();
+    
+    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 });
+    }
+    
+  }
+
+  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 });
+      }
+    } catch (SLCommandException e) {
+      return new ErrorResultImpl(e, cmdCtx.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/InfoboxUpdateResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxUpdateResultImpl.java
new file mode 100644
index 00000000..15064756
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxUpdateResultImpl.java
@@ -0,0 +1,43 @@
+/*
+* 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 javax.xml.bind.JAXBElement;
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+
+import at.buergerkarte.namespaces.securitylayer._1.InfoboxUpdateResponseType;
+import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
+import at.gv.egiz.bku.slcommands.InfoboxUpdateResult;
+
+public class InfoboxUpdateResultImpl extends SLResultImpl implements
+    InfoboxUpdateResult {
+  
+  protected static JAXBElement<InfoboxUpdateResponseType> RESPONSE;
+
+  static {
+    ObjectFactory factory = new ObjectFactory();
+    InfoboxUpdateResponseType type = factory.createInfoboxUpdateResponseType();
+    RESPONSE = factory.createInfoboxUpdateResponse(type);
+  }
+  
+  @Override
+  public void writeTo(Result result, Templates templates) {
+    writeTo(RESPONSE, result, templates);
+  }
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLCommandImpl.java
index 9a3a2984..ed055b69 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLCommandImpl.java
@@ -16,22 +16,11 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import javax.xml.bind.JAXBElement;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.slcommands.SLCommand;
-import at.gv.egiz.bku.slcommands.SLCommandContext;
-import at.gv.egiz.bku.slexceptions.SLCommandException;
-import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.STAL;
-import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
+import javax.xml.bind.JAXBElement;
+
+import at.gv.egiz.bku.slcommands.SLCommand;
+import at.gv.egiz.bku.slcommands.SLCommandContext;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
 
 /**
  * This class serves as abstract base class for the implementation of a security
@@ -47,19 +36,18 @@ public abstract class SLCommandImpl<T> implements SLCommand {
   /**
    * The <code>SLCommandContext</code> for this <code>SLCommand</code>.
    */
-  protected SLCommandContext cmdCtx;
+  protected SLCommandContext cmdCtx;
+  
+  /**
+   * The STAL helper.
+   */
+  protected STALHelper stalHelper;
 
   /**
    * The request element of this command.
    */
   protected JAXBElement<T> request;
 
-  /**
-   * An iterator over the <code>STALResponse</code>s received in
-   * {@link SLCommandImpl#requestSTAL(List)}.
-   */
-  protected Iterator<STALResponse> stalResponses;
-
   @SuppressWarnings("unchecked")
   @Override
   public void init(SLCommandContext ctx, Object request)
@@ -67,8 +55,8 @@ public abstract class SLCommandImpl<T> implements SLCommand {
 
     this.request = (JAXBElement<T>) request;
 
-    this.cmdCtx = ctx;
-    assert this.cmdCtx != null;
+    this.cmdCtx = ctx;
+    stalHelper = new STALHelper(cmdCtx.getSTAL());
 
   }
 
@@ -90,73 +78,4 @@ public abstract class SLCommandImpl<T> implements SLCommand {
   protected SLCommandContext getCmdCtx() {
     return cmdCtx;
   }
-
-  /**
-   * Calls {@link STAL#handleRequest(List)} with the given
-   * <code>stalRequests</code>.
-   * 
-   * @param stalRequests
-   * @throws SLCommandException
-   */
-     protected void requestSTAL(List<STALRequest> stalRequests) throws SLCommandException {
-    List<STALResponse> responses = cmdCtx.getSTAL().handleRequest(stalRequests);
-    if (responses == null) {
-      Log log = LogFactory.getLog(this.getClass());
-      log.info("Received no responses from STAL.");
-      throw new SLCommandException(4000);
-    } else if (responses.size() != stalRequests.size()) {
-      Log log = LogFactory.getLog(this.getClass());
-      log.info("Received invalid count of responses from STAL. Expected "
-          + stalRequests.size() + ", but got " + responses.size() + ".");
-      // throw new SLCommandException(4000);
-    }
-    stalResponses = responses.iterator();
-  }
-
-  /**
-   * @return <code>true</code> if there are more {@link STALResponse}s to be
-   *         fetched with {@link #nextResponse(Class)}, or <code>false</code>
-   *         otherwise.
-   */
-  protected boolean hasNextResponse() {
-    return (stalResponses != null) ? stalResponses.hasNext() : false;
-  }
-
-  /**
-   * Returns the next response of type <code>responseClass</code> that has been
-   * received by {@link #requestSTAL(List)}.
-   * 
-   * @param responseClass
-   *          the response must be an instance of
-   * @return the next response of type <code>responseClass</code>
-   * 
-   * @throws NoSuchElementException
-   *           if there is no more response
-   * @throws SLCommandException
-   *           if the next response is of type {@link ErrorResponse} or not of
-   *           type <code>responseClass</code>
-   */
-  protected STALResponse nextResponse(
-      Class<? extends STALResponse> responseClass) throws SLCommandException {
-
-    if (stalResponses == null) {
-      throw new NoSuchElementException();
-    }
-
-    STALResponse response = stalResponses.next();
-
-    if (response instanceof ErrorResponse) {
-      throw new SLCommandException(((ErrorResponse) response).getErrorCode());
-    }
-
-    if (!(responseClass.isAssignableFrom(response.getClass()))) {
-      Log log = LogFactory.getLog(this.getClass());
-      log.info("Received " + response.getClass() + " from STAL but expected "
-          + responseClass);
-      throw new SLCommandException(4000);
-    }
-
-    return response;
-
-  }
 }
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
new file mode 100644
index 00000000..969288c1
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/STALHelper.java
@@ -0,0 +1,218 @@
+/*
+* 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 iaik.asn1.CodingException;
+import iaik.asn1.DerCoder;
+
+import java.io.ByteArrayInputStream;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+import at.gv.egiz.bku.slexceptions.SLExceptionMessages;
+import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.idlink.ans1.IdentityLink;
+import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.InfoboxReadResponse;
+import at.gv.egiz.stal.STAL;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+
+/**
+ * A helper class for transmitting {@link STALRequest}s and obtaining their
+ * respective {@link STALResponse}s.
+ * 
+ * @author mcentner
+ */
+public class STALHelper {
+
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(STALHelper.class);
+  
+  /**
+   * The STAL implementation.
+   */
+  private STAL stal;
+  
+  /**
+   * An iterator over the <code>STALResponse</code>s received in
+   * {@link SLCommandImpl#transmitSTALRequest(List)}.
+   */
+  protected Iterator<STALResponse> stalResponses;
+  
+  /**
+   * Creates a new instance of this STALHelper with the given
+   * <code>stal</code>. 
+   * 
+   * @param stal the STAL to be used
+   */
+  public STALHelper(STAL stal) {
+    if (stal == null) {
+      throw new NullPointerException("Argument 'stal' must not be null.");
+    }
+    this.stal = stal;
+  }
+
+  /**
+   * Calls {@link STAL#handleRequest(List)} with the given
+   * <code>stalRequests</code>.
+   * 
+   * @param stalRequests
+   * @throws SLCommandException
+   */
+   public void transmitSTALRequest(List<STALRequest> stalRequests) throws SLCommandException {
+    List<STALResponse> responses = stal.handleRequest(stalRequests);
+    if (responses == null) {
+      Log log = LogFactory.getLog(this.getClass());
+      log.info("Received no responses from STAL.");
+      throw new SLCommandException(4000);
+    } else if (responses.size() != stalRequests.size()) {
+      Log log = LogFactory.getLog(this.getClass());
+      log.info("Received invalid count of responses from STAL. Expected "
+          + stalRequests.size() + ", but got " + responses.size() + ".");
+      // throw new SLCommandException(4000);
+    }
+    stalResponses = responses.iterator();
+  }
+
+  /**
+   * @return <code>true</code> if there are more {@link STALResponse}s to be
+   *         fetched with {@link #nextResponse(Class)}, or <code>false</code>
+   *         otherwise.
+   */
+  public boolean hasNextResponse() {
+    return (stalResponses != null) ? stalResponses.hasNext() : false;
+  }
+
+  /**
+   * Returns the next response of type <code>responseClass</code> that has been
+   * received by {@link #transmitSTALRequest(List)}.
+   * 
+   * @param responseClass
+   *          the response must be an instance of
+   * @return the next response of type <code>responseClass</code>
+   * 
+   * @throws NoSuchElementException
+   *           if there is no more response
+   * @throws SLCommandException
+   *           if the next response is of type {@link ErrorResponse} or not of
+   *           type <code>responseClass</code>
+   */
+  public STALResponse nextResponse(
+      Class<? extends STALResponse> responseClass) throws SLCommandException {
+
+    if (stalResponses == null) {
+      throw new NoSuchElementException();
+    }
+
+    STALResponse response = stalResponses.next();
+
+    if (response instanceof ErrorResponse) {
+      throw new SLCommandException(((ErrorResponse) response).getErrorCode());
+    }
+
+    if (!(responseClass.isAssignableFrom(response.getClass()))) {
+      Log log = LogFactory.getLog(this.getClass());
+      log.info("Received " + response.getClass() + " from STAL but expected "
+          + responseClass);
+      throw new SLCommandException(4000);
+    }
+
+    return response;
+
+  }
+
+  /**
+   * Gets the list of certificates from the next STAL responses.
+   * 
+   * @return the list of certificates
+   * 
+   * @throws SLCommandException if getting the list of certificates fails
+   */
+  public List<X509Certificate> getCertificatesFromResponses() throws SLCommandException {
+    
+    List<X509Certificate> certificates = new ArrayList<X509Certificate>();
+
+    CertificateFactory certFactory;
+    try {
+      certFactory = CertificateFactory.getInstance("X509");
+    } catch (CertificateException e) {
+      // we should always be able to get an X509 certificate factory
+      log.error("CertificateFactory.getInstance(\"X509\") failed.", e);
+      throw new SLRuntimeException(e);
+    }
+    
+    InfoboxReadResponse response;
+    while(hasNextResponse()) {
+      response = (InfoboxReadResponse) nextResponse(InfoboxReadResponse.class);
+      byte[] cert = response.getInfoboxValue();
+      try {
+        certificates.add((X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(cert)));
+      } catch (CertificateException e) {
+        log.info("Failed to decode certificate.", e);
+        throw new SLCommandException(4000,
+            SLExceptionMessages.EC4000_UNCLASSIFIED_INFOBOX_INVALID,
+            new Object[] { "Certificates" });
+      }
+    }
+    
+    return certificates;
+
+  }
+  
+  /**
+   * Gets the IdentitiyLink form the next STAL response.
+   * 
+   * @return the IdentityLink
+   * 
+   * @throws SLCommandException if getting the IdentitiyLink fails
+   */
+  public IdentityLink getIdentityLinkFromResponses() throws SLCommandException {
+
+    // IdentityLink
+    InfoboxReadResponse response;
+    if (hasNextResponse()) {
+      response = (InfoboxReadResponse) nextResponse(InfoboxReadResponse.class);
+      byte[] idLink = response.getInfoboxValue();
+      try {
+        return new IdentityLink(DerCoder.decode(idLink));
+      } catch (CodingException e) {
+        log.info("Failed to decode infobox 'IdentityLink'.", e);
+        throw new SLCommandException(4000,
+            SLExceptionMessages.EC4000_UNCLASSIFIED_INFOBOX_INVALID,
+            new Object[] { "IdentityLink" });
+      }
+    } else {
+      log.info("No infobox 'IdentityLink' returned from STAL.");
+      throw new SLCommandException(4000);
+    }
+    
+  }
+  
+
+}
diff --git a/bkucommon/src/main/resources/at/gv/egiz/bku/slcommands/testApplicationContext.xml b/bkucommon/src/main/resources/at/gv/egiz/bku/slcommands/testApplicationContext.xml
deleted file mode 100644
index 885e35f3..00000000
--- a/bkucommon/src/main/resources/at/gv/egiz/bku/slcommands/testApplicationContext.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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.
-	-->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
-
-	
-	<bean id="slCommandFactory" class="at.gv.egiz.bku.slcommands.SLCommandFactory"
-		factory-method="getInstance">
-		<property name="commandImpl">
-			<map>
-				<entry
-					key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:NullOperationRequest"
-					value="at.gv.egiz.bku.slcommands.impl.NullOperationCommandImpl" />
-				<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#:CreateXMLSignatureRequest"
-					value="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandImpl" />
-			</map>
-		</property>
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/testApplicationContext.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/testApplicationContext.xml
new file mode 100644
index 00000000..13365931
--- /dev/null
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/testApplicationContext.xml
@@ -0,0 +1,53 @@
+<?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.
+	-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+
+	
+	<bean id="slCommandFactory" class="at.gv.egiz.bku.slcommands.SLCommandFactory"
+		factory-method="getInstance">
+		<property name="commandImpl">
+			<map>
+				<entry
+					key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:NullOperationRequest"
+					value="at.gv.egiz.bku.slcommands.impl.NullOperationCommandImpl" />
+				<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#:CreateXMLSignatureRequest"
+					value="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandImpl" />
+			</map>
+		</property>
+	</bean>
+	
+	<bean id="infoboxFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxFactory"
+    factory-method="getInstance">
+    <property name="infoboxImpl">
+      <map>
+        <entry
+          key="Certificates"
+          value="at.gv.egiz.bku.slcommands.impl.InfoboxCertificatesImpl" />
+        <entry
+          key="IdentityLink"
+          value="at.gv.egiz.bku.slcommands.impl.InfoboxIdentityLink" />
+        <entry
+          key="CardChannel"
+          value="at.gv.egiz.bku.slcommands.impl.CardChannel" />
+      </map>
+    </property>
+  </bean>
+
+</beans>
\ No newline at end of file
-- 
cgit v1.2.3