Logging issues fixed:

 - Added possibility to configure logging of BKUWebstart. Logging is now configured from log4j configuration deployed with BKUWebstart in a first step. In a second step the webstart launcher looks for a log4j configuration file in the user's mooca configuration directory and updates the log4j configuration.
 - Logging of IAIK PKI properly initialized. IAIK PKI does not mess with the log4j configuration any longer.
 - Changed log4j accordingly (an appender is now needed as IAIK PKI does not reconfigure log4j any longer).

Added css-stylesheet to ErrorResponses issued by the BKU to improve the presentation to the user.

Changed dependencies of BKUWebStart (see Issue#469 https://egovlabs.gv.at/tracker/index.php?func=detail&aid=469&group_id=13&atid=134).

DataURLConnection now uses the request encoding of SL < 1.2. application/x-www-form-urlencoded is now used as default encoding method. multipart/form-data is used only if transfer parameters are present in the request that require a Content-Type parameter. This can only be set with multipart/form-data. This is not in conformance with SL 1.2, however it should improve compatibility with applications. 

Therefore, removed the ability to configure the DataURLConnection implementation class.

DataURLConnection now uses a streaming implementation for encoding of application/x-www-form-urlencoded requests. 

XWWWFormUrlImputDecoder now uses a streaming implementation for decoding of application/x-www-form-urlencoded requests.

Fixed Bug in SLResultPart that caused a binary response to be provided as parameter "XMLResponse" in a multipart/form-data encoded request to DataURL.

SLCommandFactory now supports unmarshalling of SL < 1.2 requests in order issue meaningful error messages. Therefore, the marshaling context for response marshaling had to be separated from the marshaling context for requests in order to avoid the marshaling of SL < 1.2 namespace prefixes in SL 1.2 responses.

Target attribute in QualifiedProperties is now marshaled. (see Issue#470 https://egovlabs.gv.at/tracker/index.php?func=detail&aid=470&group_id=13&atid=134)

Reporting of XML validation errors improved.

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

16 files changed, 292 insertions, 120 deletions

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
index fe27bc54..8e3f6ece 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
@@ -28,6 +28,7 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.UnmarshalException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.ValidationEvent;
+import javax.xml.bind.ValidationEventLocator;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
@@ -46,11 +47,11 @@ import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLExceptionMessages;
 import at.gv.egiz.bku.slexceptions.SLRequestException;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.bku.slexceptions.SLVersionException;
 import at.gv.egiz.bku.utils.DebugReader;
 import at.gv.egiz.slbinding.RedirectEventFilter;
 import at.gv.egiz.slbinding.RedirectUnmarshallerListener;
-import at.gv.egiz.validation.ValidationEventLogger;
-import javax.xml.bind.ValidationEventHandler;
+import at.gv.egiz.validation.ReportingValidationEventHandler;
 
 public class SLCommandFactory {
 
@@ -60,7 +61,9 @@ public class SLCommandFactory {
     public static final String[] SCHEMA_FILES = new String[]{
         "at/gv/egiz/bku/slcommands/schema/xml.xsd",
         "at/gv/egiz/bku/slcommands/schema/xmldsig-core-schema.xsd",
-        "at/gv/egiz/bku/slcommands/schema/Core-1.2.xsd"
+        "at/gv/egiz/bku/slcommands/schema/Core-1.2.xsd",
+        "at/gv/egiz/bku/slcommands/schema/Core.20020225.xsd",
+        "at/gv/egiz/bku/slcommands/schema/Core.20020831.xsd"
     };
     /**
      * Logging facility.
@@ -169,7 +172,10 @@ public class SLCommandFactory {
                 String slPkg = at.buergerkarte.namespaces.securitylayer._1.ObjectFactory.class.getPackage().getName();
                 String xmldsigPkg = org.w3._2000._09.xmldsig_.ObjectFactory.class.getPackage().getName();
                 String cardChannelPkg = at.buergerkarte.namespaces.cardchannel.ObjectFactory.class.getPackage().getName();
-                setJaxbContext(JAXBContext.newInstance(slPkg + ":" + xmldsigPkg + ":" + cardChannelPkg));
+                String slPkgLegacy1_0 = at.buergerkarte.namespaces.securitylayer._20020225_.ObjectFactory.class.getPackage().getName();
+                String slPkgLegacy1_1 = at.buergerkarte.namespaces.securitylayer._20020831_.ObjectFactory.class.getPackage().getName();
+                setJaxbContext(JAXBContext.newInstance(slPkg + ":" + xmldsigPkg + ":" + cardChannelPkg 
+                    + ":" + slPkgLegacy1_0 + ":" + slPkgLegacy1_1));
             } catch (JAXBException e) {
                 log.error("Failed to setup JAXBContext security layer request.", e);
                 throw new SLRuntimeException(e);
@@ -248,26 +254,9 @@ public class SLCommandFactory {
       SLRequestException {
 
         Object object;
+        ReportingValidationEventHandler validationEventHandler = new ReportingValidationEventHandler();
         try {
             
-//            ValidatorHandler validator = slSchema.newValidatorHandler();
-//            validator.getContentHandler();
-//            
-//            SAXParserFactory spf = SAXParserFactory.newInstance();
-//            spf.setNamespaceAware(true);
-//            XMLReader saxReader = spf.newSAXParser().getXMLReader();
-//            //TODO extend validator to implement redirectContentHandler (validate+redirect)
-//            saxReader.setContentHandler(validator);
-//            //TODO get a InputSource
-//            SAXSource saxSource = new SAXSource(saxReader, source);
-//            
-//            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-//            //turn off duplicate jaxb validation 
-//            unmarshaller.setSchema(null);
-//            unmarshaller.setListener(listener);
-//            unmarshaller.unmarshal(saxSource);
-            
-
             XMLInputFactory inputFactory = XMLInputFactory.newInstance();
             XMLEventReader eventReader = inputFactory.createXMLEventReader(source);
             RedirectEventFilter redirectEventFilter = new RedirectEventFilter();
@@ -279,7 +268,7 @@ public class SLCommandFactory {
                 unmarshaller.setSchema(slSchema);
             }
             log.trace("Before unmarshal().");
-            unmarshaller.setEventHandler(new ValidationEventLogger());
+            unmarshaller.setEventHandler(validationEventHandler);
             object = unmarshaller.unmarshal(filteredReader);
             log.trace("After unmarshal().");
         } catch (UnmarshalException e) {
@@ -288,6 +277,13 @@ public class SLCommandFactory {
             } else {
                 log.info("Failed to unmarshall security layer request." + e.getMessage());
             }
+            if (validationEventHandler.getErrorEvent() != null) {
+            	// Validation Error
+            	ValidationEvent errorEvent = validationEventHandler.getErrorEvent();
+            	ValidationEventLocator locator = errorEvent.getLocator();
+                throw new SLRequestException(3002,
+                        SLExceptionMessages.EC3002_INVALID, new Object[]{errorEvent.getMessage()});
+            }
             Throwable cause = e.getCause();
             if (cause instanceof SAXParseException) {
                 throw new SLRequestException(3000,
@@ -328,10 +324,11 @@ public class SLCommandFactory {
      *           if an unexpected error occurs configuring the unmarshaller, if
      *           unmarshalling fails with an unexpected error or if the
      *           corresponding <code>SLCommand</code> could not be instantiated
+     * @throws SLVersionException 
      */
     @SuppressWarnings("unchecked")
     public SLCommand createSLCommand(Source source, SLCommandContext context)
-      throws SLCommandException, SLRuntimeException, SLRequestException {
+      throws SLCommandException, SLRuntimeException, SLRequestException, SLVersionException {
       
         DebugReader dr = null;
         if (log.isTraceEnabled() && source instanceof StreamSource) {
@@ -361,6 +358,12 @@ public class SLCommandFactory {
         }
 
         QName qName = ((JAXBElement) object).getName();
+        if (!SLCommand.NAMESPACE_URI.equals(qName.getNamespaceURI())) {
+          // security layer request version not supported
+          log.info("Unsupported security layer request version : " + qName.getNamespaceURI());
+          throw new SLVersionException(qName.getNamespaceURI());
+        }
+        
         Class<? extends SLCommand> implClass = getImplClass(qName);
         if (implClass == null) {
             // command not supported
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLMarshallerFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLMarshallerFactory.java
new file mode 100644
index 00000000..e0a375cf
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLMarshallerFactory.java
@@ -0,0 +1,172 @@
+/*
+* Copyright 2009 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;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.marshal.MarshallerFactory;
+
+public class SLMarshallerFactory {
+  
+  static Log log = LogFactory.getLog(SLMarshallerFactory.class);
+
+  /**
+   * The JAXBContext used for result marshaling.
+   * <p>
+   * Note: Different contexts are used for marshaling and unmarshaling of
+   * security layer requests and responses to avoid propagation of namespace
+   * declarations of legacy namespaces into marshaled results.
+   * </p>
+   * @see #jaxbContextLegacy
+   */
+  protected static JAXBContext context;
+
+  /**
+   * The JAXBContext used for marshaling of of results in the legacy namespace.
+   */
+  protected static JAXBContext legacyContext;
+
+  // ------------------- initialization on demand idiom -------------------
+  // see http://en.wikipedia.org/wiki/Initialization_on_demand_holder_idiom
+  // ----------------------------------------------------------------------
+  
+  /**
+   * Private constructor called by {@link SLMarshallerFactoryInstanceHolder}.
+   */
+  private SLMarshallerFactory() {
+    // context is initialized immediately while the legacy context is initialized only on demand
+    try {
+      String slPkg = at.buergerkarte.namespaces.securitylayer._1.ObjectFactory.class.getPackage().getName();
+      String xmldsigPkg = org.w3._2000._09.xmldsig_.ObjectFactory.class.getPackage().getName();
+      String cardChannelPkg = at.buergerkarte.namespaces.cardchannel.ObjectFactory.class.getPackage().getName();
+      context = JAXBContext.newInstance(slPkg + ":" + xmldsigPkg + ":" + cardChannelPkg);
+    } catch (JAXBException e) {
+      log.error("Failed to setup JAXBContext security layer request.", e);
+      throw new SLRuntimeException(e);
+    }
+  }
+ 
+  /**
+   * The lazy instance holder for this SLMarshallerFactory.
+   */
+  private static class SLMarshallerFactoryInstanceHolder {
+    /**
+     * The instance returned by {@link SLMarshallerFactory#getInstance()}
+     */
+    private static final SLMarshallerFactory instance = new SLMarshallerFactory();
+  }
+
+  /**
+   * Get an instance of the <code>SLMarshallerFactory</code>. 
+   */
+  public static SLMarshallerFactory getInstance() {
+    return SLMarshallerFactoryInstanceHolder.instance;
+  }
+
+  // ----------------------------------------------------------------------
+  
+  /**
+   * Initialize the JAXBContext for the legacy namespace.
+   */
+  private static synchronized void ensureLegacyContext() {
+    // legacy marshaller is initialized only on demand
+    if (legacyContext == null) {
+      try {
+        String slPkgLegacy1_0 = at.buergerkarte.namespaces.securitylayer._20020225_.ObjectFactory.class.getPackage().getName();
+        String slPkgLegacy1_1 = at.buergerkarte.namespaces.securitylayer._20020831_.ObjectFactory.class.getPackage().getName();
+        String xmldsigPkg = org.w3._2000._09.xmldsig_.ObjectFactory.class.getPackage().getName();
+        String cardChannelPkg = at.buergerkarte.namespaces.cardchannel.ObjectFactory.class.getPackage().getName();
+        legacyContext = JAXBContext.newInstance(slPkgLegacy1_0 + ":" + slPkgLegacy1_1 + ":" + xmldsigPkg + ":" + cardChannelPkg);
+      } catch (JAXBException e) {
+        log.error("Failed to setup JAXBContext security layer request.", e);
+        throw new SLRuntimeException(e);
+      }
+    }
+  }
+
+  /**
+   * Creates an SL marshaller.
+   * 
+   * @param formattedOutput
+   *          <code>true</code> if the marshaller should produce formated
+   *          output, <code>false</code> otherwise
+   * @return an SL marshaller
+   */
+  public Marshaller createMarshaller(boolean formattedOutput) {
+    return createMarshaller(formattedOutput, false);
+  }
+
+  /**
+   * Creates an SL marshaller.
+   * 
+   * @param formattedOutput
+   *          <code>true</code> if the marshaller should produce formated
+   *          output, <code>false</code> otherwise
+   * @param fragment
+   *          <code>true</code> if the marshaller should produce a XML fragment
+   *          (omit XML declaration), <code>false</code> otherwise
+   * @return an SL marshaller
+   */
+  public Marshaller createMarshaller(boolean formattedOutput, boolean fragment) {
+    try {
+      return MarshallerFactory.createMarshaller(context, formattedOutput, fragment);
+    } catch (JAXBException e) {
+      log.fatal("Failed to marshall error response.", e);
+      throw new SLRuntimeException("Failed to marshall error response.", e);
+    }
+  }
+
+  /**
+   * Creates a legacy SL marshaller.
+   * 
+   * @param formattedOutput
+   *          <code>true</code> if the marshaller should produce formated
+   *          output, <code>false</code> otherwise
+   * @return a legacy SL marshaller
+   */
+  public Marshaller createLegacyMarshaller(boolean formattedOutput) {
+    return createLegacyMarshaller(formattedOutput, false);
+  }
+  
+  /**
+   * Creates a legacy SL marshaller.
+   * 
+   * @param formattedOutput
+   *          <code>true</code> if the marshaller should produce formated
+   *          output, <code>false</code> otherwise
+   * @param fragment
+   *          <code>true</code> if the marshaller should produce a XML fragment
+   *          (omit XML declaration), <code>false</code> otherwise
+   * @return a legacy SL marshaller
+   */
+  public Marshaller createLegacyMarshaller(boolean formattedOutput, boolean fragment) {
+    try {
+      ensureLegacyContext();
+      return MarshallerFactory.createMarshaller(legacyContext, formattedOutput, fragment);
+    } catch (JAXBException e) {
+      log.fatal("Failed to marshall error response.", e);
+      throw new SLRuntimeException("Failed to marshall error response.", e);
+    }
+  }
+  
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLResult.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLResult.java
index 7989a771..e9e483c5 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLResult.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLResult.java
@@ -32,12 +32,14 @@ public interface SLResult {
    */

   public String getMimeType();

 

-  public void writeTo(Result aResult);

+  public void writeTo(Result aResult, boolean fragment);

   

   /**

    * 

-   * @param result

+   * @param result
+   * @param fragment TODO
    * @param transformer may be null.

    */

-  public void writeTo(Result result, Templates templates);

+  public void writeTo(Result result, Templates templates, boolean fragment);
+  
 }
\ No newline at end of file
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
index ce03dcf9..9a4536e6 100644
--- 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
@@ -16,7 +16,6 @@
  */
 package at.gv.egiz.bku.slcommands.impl;
 
-import at.gv.egiz.marshal.NamespacePrefixMapperImpl;
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
 import java.util.Collections;
@@ -24,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 
@@ -42,10 +40,8 @@ import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayTy
 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.slcommands.SLCommandFactory;
+import at.gv.egiz.bku.slcommands.SLMarshallerFactory;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
-import at.gv.egiz.marshal.MarshallerFactory;
-import javax.xml.bind.PropertyException;
 
 /**
  * An abstract base class for {@link Infobox} implementations of type associative array.
@@ -255,13 +251,10 @@ public abstract class AbstractAssocArrayInfobox extends AbstractInfoboxImpl
   }
 
   protected byte[] marshallValue(Object jaxbElement) throws SLCommandException {
-    SLCommandFactory commandFactory = SLCommandFactory.getInstance();
-    JAXBContext jaxbContext = commandFactory.getJaxbContext();
     
-    ByteArrayOutputStream result;
+    Marshaller marshaller = SLMarshallerFactory.getInstance().createMarshaller(false);
+    ByteArrayOutputStream result = new ByteArrayOutputStream();
     try {
-      Marshaller marshaller = MarshallerFactory.createMarshaller(jaxbContext);
-      result = new ByteArrayOutputStream();
       marshaller.marshal(jaxbElement, result);
     } catch (JAXBException e) {
       log.info("Failed to marshall infobox content.", e);
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureResultImpl.java
index b352a51e..19df4334 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureResultImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureResultImpl.java
@@ -16,8 +16,6 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
-import at.gv.egiz.marshal.NamespacePrefixMapperImpl;
-import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
@@ -33,10 +31,8 @@ import org.w3c.dom.Node;
 
 import at.buergerkarte.namespaces.securitylayer._1.CreateXMLSignatureResponseType;
 import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
-import at.gv.egiz.bku.slcommands.SLCommandFactory;
+import at.gv.egiz.bku.slcommands.SLMarshallerFactory;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
-import at.gv.egiz.marshal.MarshallerFactory;
-import javax.xml.bind.PropertyException;
 
 /**
  * This calls implements the result of the security layer command <code>CreateXMLSignature</code>.
@@ -86,10 +82,9 @@ public class CreateXMLSignatureResultImpl extends SLResultImpl {
     JAXBElement<CreateXMLSignatureResponseType> createCreateXMLSignatureResponse = factory.createCreateXMLSignatureResponse(createCreateXMLSignatureResponseType);
 
     DocumentFragment fragment = doc.createDocumentFragment();
-    
-    JAXBContext jaxbContext = SLCommandFactory.getInstance().getJaxbContext();
+
+    Marshaller marshaller = SLMarshallerFactory.getInstance().createMarshaller(false);
     try {
-      Marshaller marshaller = MarshallerFactory.createMarshaller(jaxbContext);
       marshaller.marshal(createCreateXMLSignatureResponse, fragment);
     } catch (JAXBException e) {
       log.error("Failed to marshall 'CreateXMLSignatureResponse'", e);
@@ -105,8 +100,8 @@ public class CreateXMLSignatureResultImpl extends SLResultImpl {
   }
 
   @Override
-  public void writeTo(Result result, Templates templates) {
-    writeTo(doc, result, templates);
+  public void writeTo(Result result, Templates templates, boolean fragment) {
+    writeTo(doc, result, templates, fragment);
   }
 
 }
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 5d0f0de0..aedde238 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
@@ -56,11 +56,11 @@ public class ErrorResultImpl extends SLResultImpl implements ErrorResult {
   }
 
   @Override
-  public void writeTo(Result result, Templates templates) {
+  public void writeTo(Result result, Templates templates, boolean fragment) {
     if (locale == null) {
-      writeErrorTo(slException, result, templates);
+      writeErrorTo(slException, result, templates, fragment);
     } else {
-      writeErrorTo(slException, result, templates, locale);
+      writeErrorTo(slException, result, templates, locale, fragment);
     }
   }
   

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java
index 46bfe18b..0c2b96f9 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java
@@ -19,10 +19,8 @@ package at.gv.egiz.bku.slcommands.impl;
 
 import at.buergerkarte.namespaces.securitylayer._1.GetStatusRequestType;
 import at.gv.egiz.bku.slcommands.GetStatusCommand;
-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.SLException;
 import at.gv.egiz.stal.ErrorResponse;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALResponse;
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java
index fddd3b0b..fb1f627f 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java
@@ -45,8 +45,8 @@ public class GetStatusResultImpl extends SLResultImpl implements GetStatusResult
   }
 
   @Override
-  public void writeTo(Result result, Templates templates) {
+  public void writeTo(Result result, Templates templates, boolean fragment) {
     JAXBElement<GetStatusResponseType> response = of.createGetStatusResponse(responseType);
-    writeTo(response, result, templates);
+    writeTo(response, result, templates, fragment);
   }
 }
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
index 7a82e43f..160e9589 100644
--- 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
@@ -18,7 +18,6 @@ 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;
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultFileImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultFileImpl.java
index 75e44afa..422b424f 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultFileImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadResultFileImpl.java
@@ -16,8 +16,6 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
-import at.gv.egiz.marshal.NamespacePrefixMapperImpl;
-import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
@@ -39,10 +37,8 @@ import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
 import at.buergerkarte.namespaces.securitylayer._1.XMLContentType;
 import at.gv.egiz.bku.slcommands.InfoboxReadResult;
 import at.gv.egiz.bku.slcommands.SLCommand;
-import at.gv.egiz.bku.slcommands.SLCommandFactory;
+import at.gv.egiz.bku.slcommands.SLMarshallerFactory;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
-import at.gv.egiz.marshal.MarshallerFactory;
-import javax.xml.bind.PropertyException;
 
 /**
  * This class implements the result of the security layer command <code>InfoboxReadRequest</code>.
@@ -98,10 +94,9 @@ public class InfoboxReadResultFileImpl extends SLResultImpl implements
     infoboxReadResponseType.setBinaryFileData(base64XMLContentType);
     
     JAXBElement<InfoboxReadResponseType> infoboxReadResponse = factory.createInfoboxReadResponse(infoboxReadResponseType);
-    
-    JAXBContext context = SLCommandFactory.getInstance().getJaxbContext();
+
+    Marshaller marshaller = SLMarshallerFactory.getInstance().createMarshaller(false);
     try {
-      Marshaller marshaller = MarshallerFactory.createMarshaller(context);
       marshaller.marshal(infoboxReadResponse, doc);
     } catch (JAXBException e) {
       log.error("Failed to marshal 'InfoboxReadResponse' document.", e);
@@ -158,8 +153,8 @@ public class InfoboxReadResultFileImpl extends SLResultImpl implements
   }
   
   @Override
-  public void writeTo(Result result, Templates templates) {
-    writeTo(xmlDocument, result, templates);
+  public void writeTo(Result result, Templates templates, boolean fragment) {
+    writeTo(xmlDocument, result, templates, fragment);
   }
 
 }
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 e508941d..271ec955 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
@@ -55,10 +55,10 @@ public class InfoboxReadResultImpl extends SLResultImpl implements InfoboxReadRe
   }
 
   @Override
-  public void writeTo(Result result, Templates templates) {
+  public void writeTo(Result result, Templates templates, boolean fragment) {
     ObjectFactory objectFactory = new ObjectFactory();
     JAXBElement<InfoboxReadResponseType> response = objectFactory.createInfoboxReadResponse(infoboxReadResponse);
-    writeTo(response, result, templates);
+    writeTo(response, result, templates, fragment);
   }
 
 }
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
index 15064756..e12536ba 100644
--- 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
@@ -36,8 +36,8 @@ public class InfoboxUpdateResultImpl extends SLResultImpl implements
   }
   
   @Override
-  public void writeTo(Result result, Templates templates) {
-    writeTo(RESPONSE, result, templates);
+  public void writeTo(Result result, Templates templates, boolean fragment) {
+    writeTo(RESPONSE, result, templates, fragment);
   }
 
 }
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/NullOperationResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/NullOperationResultImpl.java
index 05986f85..87733e39 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/NullOperationResultImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/NullOperationResultImpl.java
@@ -41,8 +41,8 @@ public class NullOperationResultImpl extends SLResultImpl implements NullOperati
   }
   
   @Override
-  public void writeTo(Result result, Templates templates) {
-    writeTo(RESPONSE, result, templates);
+  public void writeTo(Result result, Templates templates, boolean fragment) {
+    super.writeTo(RESPONSE, result, templates, fragment);
   }
 
 }
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 0452bddf..0077b7b2 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
@@ -17,12 +17,14 @@
 package at.gv.egiz.bku.slcommands.impl;
 
 import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
 import java.util.Locale;
 
-import javax.xml.bind.JAXBContext;
+import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
+import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Result;
 import javax.xml.transform.Templates;
 import javax.xml.transform.Transformer;
@@ -41,17 +43,15 @@ import org.w3c.dom.Node;
 
 import at.buergerkarte.namespaces.securitylayer._1.ErrorResponseType;
 import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
-import at.gv.egiz.marshal.NamespacePrefixMapperImpl;
-import at.gv.egiz.bku.slcommands.SLCommandFactory;
+import at.gv.egiz.bku.slcommands.SLMarshallerFactory;
 import at.gv.egiz.bku.slcommands.SLResult;
 import at.gv.egiz.bku.slexceptions.SLBindingException;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLException;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.bku.slexceptions.SLVersionException;
 import at.gv.egiz.bku.utils.DebugOutputStream;
 import at.gv.egiz.bku.utils.DebugWriter;
-import at.gv.egiz.marshal.MarshallerFactory;
-import javax.xml.bind.PropertyException;
 
 /**
  * This class serves as an abstract base class for the implementation of a
@@ -90,20 +90,18 @@ public abstract class SLResultImpl implements SLResult {
     return resultingMimeType;
   }
 
-  private Marshaller getMarshaller() {
-    try {
-      JAXBContext context  = SLCommandFactory.getInstance().getJaxbContext();
-      Marshaller marshaller = MarshallerFactory.createMarshaller(context, true);
-      return marshaller;
-    } catch (JAXBException e) {
-      log.fatal("Failed to marshall error response.", e);
-      throw new SLRuntimeException("Failed to marshall error response.", e);
-    }
+  @Override
+  public void writeTo(Result result, boolean fragment) {
+    writeTo(result, null, false);
   }
 
+  @Override
+  public abstract void writeTo(Result result, Templates templates, boolean fragment);
+
   private TransformerHandler getTransformerHandler(Templates templates, Result result) throws SLException {
     try {
       SAXTransformerFactory transformerFactory = (SAXTransformerFactory) SAXTransformerFactory.newInstance();
+      transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
       TransformerHandler transformerHandler = transformerFactory.newTransformerHandler(templates);
       transformerHandler.setResult(result);
       return transformerHandler;
@@ -119,12 +117,6 @@ public abstract class SLResultImpl implements SLResult {
     }
   }
 
-  @Override
-  public void writeTo(Result result) {
-    writeTo(result, null);
-  }
-
-
   /**
    * Writes the given <code>response</code> to the SAX <code>result</code> using
    * the given transform <code>templates</code>.
@@ -133,7 +125,7 @@ public abstract class SLResultImpl implements SLResult {
    * @param result
    * @param templates
    */
-  protected void writeTo(JAXBElement<?> response, Result result, Templates templates) {
+  protected void writeTo(JAXBElement<?> response, Result result, Templates templates, boolean fragment) {
     
     DebugWriter dw = null;
     DebugOutputStream ds = null;
@@ -154,11 +146,11 @@ public abstract class SLResultImpl implements SLResult {
       try {
         transformerHandler = getTransformerHandler(templates, result);
       } catch (SLException e) {
-        writeErrorTo(e, result, templates);
+        writeErrorTo(e, result, templates, fragment);
       }
     }
     
-    Marshaller marshaller = getMarshaller();
+    Marshaller marshaller = SLMarshallerFactory.getInstance().createMarshaller(true);
     try {
       if (transformerHandler != null) {
         marshaller.marshal(response, transformerHandler);
@@ -168,7 +160,7 @@ public abstract class SLResultImpl implements SLResult {
     } catch (JAXBException e) {
       log.info("Failed to marshall " + response.getName() + " result." , e);
       SLCommandException commandException = new SLCommandException(4000);
-      writeErrorTo(commandException, result, templates);
+      writeErrorTo(commandException, result, templates, fragment);
     }
     
     if (ds != null) {
@@ -185,7 +177,7 @@ public abstract class SLResultImpl implements SLResult {
     
   }
   
-  protected void writeTo(Node node, Result result, Templates templates) {
+  protected void writeTo(Node node, Result result, Templates templates, boolean fragment) {
 
     DebugWriter dw = null;
     DebugOutputStream ds = null;
@@ -205,24 +197,30 @@ public abstract class SLResultImpl implements SLResult {
       try {
         TransformerFactory transformerFactory = TransformerFactory.newInstance();
         Transformer transformer = transformerFactory.newTransformer();
+        if (fragment) {
+          transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+        }
         transformer.transform(new DOMSource(node), result);
       } catch (TransformerConfigurationException e) {
         log.error("Failed to create Transformer.", e);
-        writeErrorTo(new SLException(4000), result, null);
+        writeErrorTo(new SLException(4000), result, null, fragment);
       } catch (TransformerException e) {
         log.error("Failed to transform result.", e);
-        writeErrorTo(new SLException(4000), result, null);
+        writeErrorTo(new SLException(4000), result, null, fragment);
       }
     } else {
       try {
         Transformer transformer = templates.newTransformer();
+        if (fragment) {
+          transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+        }
         transformer.transform(new DOMSource(node), result);
       } catch (TransformerConfigurationException e) {
         log.info("Failed to create transformer.", e);
-        writeErrorTo(new SLException(2008), result, templates);
+        writeErrorTo(new SLException(2008), result, templates, fragment);
       } catch (TransformerException e) {
         log.error("Failed to transform result.", e);
-        writeErrorTo(new SLException(2008), result, templates);
+        writeErrorTo(new SLException(2008), result, templates, fragment);
       }
     }
 
@@ -240,11 +238,11 @@ 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, boolean fragment) {
+    writeErrorTo(slException, result, templates, Locale.getDefault(), fragment);
   }
   
-  protected void writeErrorTo(SLException slException, Result result, Templates templates, Locale locale) {
+  protected void writeErrorTo(SLException slException, Result result, Templates templates, Locale locale, boolean fragment) {
     
     TransformerHandler transformerHandler = null;
     if (templates != null) {
@@ -256,13 +254,33 @@ public abstract class SLResultImpl implements SLResult {
       }
     }
 
-    ObjectFactory factory = new ObjectFactory();
-    ErrorResponseType responseType = factory.createErrorResponseType();
-    responseType.setErrorCode(slException.getErrorCode());
-    responseType.setInfo(slException.getLocalizedMessage(locale));
-    JAXBElement<ErrorResponseType> response = factory.createErrorResponse(responseType);
+    Object response;
+    
+    Marshaller marshaller;
+    if (slException instanceof SLVersionException
+        && ("http://www.buergerkarte.at/namespaces/securitylayer/20020225#"
+            .equals(((SLVersionException) slException).getNamespaceURI()) || 
+            "http://www.buergerkarte.at/namespaces/securitylayer/20020831#"
+            .equals(((SLVersionException) slException).getNamespaceURI()))) {
+      // issue ErrorResponse in the legacy namespace
+      at.buergerkarte.namespaces.securitylayer._20020225_.ObjectFactory factory 
+          = new at.buergerkarte.namespaces.securitylayer._20020225_.ObjectFactory();
+      at.buergerkarte.namespaces.securitylayer._20020225_.ErrorResponseType errorResponseType = factory
+          .createErrorResponseType();
+      errorResponseType.setErrorCode(BigInteger.valueOf(slException
+          .getErrorCode()));
+      errorResponseType.setInfo(slException.getLocalizedMessage(locale));
+      response = factory.createErrorResponse(errorResponseType);
+      marshaller = SLMarshallerFactory.getInstance().createLegacyMarshaller(true, fragment);
+    } else {
+      ObjectFactory factory = new ObjectFactory();
+      ErrorResponseType responseType = factory.createErrorResponseType();
+      responseType.setErrorCode(slException.getErrorCode());
+      responseType.setInfo(slException.getLocalizedMessage(locale));
+      response = factory.createErrorResponse(responseType);
+      marshaller = SLMarshallerFactory.getInstance().createMarshaller(true, fragment);
+    }
     
-    Marshaller marshaller = getMarshaller();
     try {
       if (transformerHandler != null) {
         marshaller.marshal(response, transformerHandler);
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 b64306aa..2088a684 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
@@ -81,7 +81,6 @@ 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.marshal.NamespacePrefix;
 import at.gv.egiz.marshal.NamespacePrefixMapperImpl;
 import at.gv.egiz.slbinding.impl.XMLContentType;
 import javax.xml.namespace.NamespaceContext;
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 9182e824..26ddb153 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
@@ -16,7 +16,6 @@
 */
 package at.gv.egiz.bku.slcommands.impl.xsect;
 
-import at.gv.egiz.stal.HashDataInput;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -31,9 +30,7 @@ import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
@@ -87,8 +84,6 @@ import at.gv.egiz.bku.utils.urldereferencer.StreamData;
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencerContext;
 import at.gv.egiz.dom.DOMUtils;
-import at.gv.egiz.marshal.NamespacePrefix;
-import at.gv.egiz.marshal.NamespacePrefixMapperImpl;
 import at.gv.egiz.slbinding.impl.XMLContentType;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.xades.QualifyingPropertiesException;
@@ -327,6 +322,8 @@ public class Signature {
    */
   public void buildXMLSignature() throws SLCommandException {
     
+    String signatureId = ctx.getIdValueFactory().createIdValue("Signature");
+
     List<XMLObject> objects = new ArrayList<XMLObject>();
     List<Reference> references = new ArrayList<Reference>();
     
@@ -340,7 +337,7 @@ public class Signature {
       }
     }
 
-    addXAdESObjectAndReference(objects, references);
+    addXAdESObjectAndReference(objects, references, signatureId);
     
     XMLSignatureFactory signatureFactory = ctx.getSignatureFactory();
     AlgorithmMethodFactory algorithmMethodFactory = ctx.getAlgorithmMethodFactory();
@@ -369,7 +366,6 @@ public class Signature {
       ki = kif.newKeyInfo(Collections.singletonList(x509Data));
     }
     
-    String signatureId = ctx.getIdValueFactory().createIdValue("Signature");
     String signatureValueId = ctx.getIdValueFactory().createIdValue("SignatureValue");
     
     xmlSignature = signatureFactory.newXMLSignature(si, ki, objects, signatureId, signatureValueId);
@@ -588,7 +584,7 @@ public class Signature {
    * @param references
    *          the list of <code>ds:References</code> to add the created
    *          <code>ds:Reference</code> to
-   * 
+   * @param signatureId TODO
    * @throws SLCommandException
    *           if creating and adding the XAdES
    *           <code>QualifyingProperties</code> fails
@@ -596,7 +592,7 @@ public class Signature {
    *           if <code>objects</code> or <code>references</code> is
    *           <code>null</code>
    */
-  private void addXAdESObjectAndReference(List<XMLObject> objects, List<Reference> references) throws SLCommandException {
+  private void addXAdESObjectAndReference(List<XMLObject> objects, List<Reference> references, String signatureId) throws SLCommandException {
     
     QualifyingPropertiesFactory factory = QualifyingPropertiesFactory.getInstance();
     
@@ -630,9 +626,11 @@ public class Signature {
       }
     }
     
+    String target = "#" + signatureId;
+    
     JAXBElement<QualifyingPropertiesType> qualifyingProperties;
     try {
-      qualifyingProperties = factory.createQualifyingProperties111(date, signingCertificates, idValue, dataObjectFormats);
+      qualifyingProperties = factory.createQualifyingProperties111(target, date, signingCertificates, idValue, dataObjectFormats);
     } catch (QualifyingPropertiesException e) {
       log.error("Failed to create QualifyingProperties.", e);
       throw new SLCommandException(4000);